commit svn HEAD of blip into core to start merge testing

[tinyos-2.x.git] / tos / lib / net / blip / nwprog / NWProgC.nc

diff --git a/tos/lib/net/blip/nwprog/NWProgC.nc b/tos/lib/net/blip/nwprog/NWProgC.nc
index 3796ec5ea488c33f1cdc5ba24413e6b3f2e0beae..960c538046cf6ebd7db5251c6026e3992a42fd51 100644 (file)
--- a/tos/lib/net/blip/nwprog/NWProgC.nc
+++ b/tos/lib/net/blip/nwprog/NWProgC.nc
@@ -1,4 +1,5 @@
 
+#include <BinaryShell.h>
 #include "StorageVolumes.h"
 #include "Deluge.h"
 
@@ -7,7 +8,7 @@ configuration NWProgC {
 } implementation {
 
   // send and receive pages
-  components MainC, IPDispatchC;
+  components MainC, new UdpSocketC();
   components NetProgC, NWProgP;
 
   BootImage = NWProgP;
@@ -19,10 +20,15 @@ configuration NWProgC {
   components new BlockWriterC(VOLUME_DELUGE2) as BlockWriterDeluge2;
   components new BlockWriterC(VOLUME_DELUGE3) as BlockWriterDeluge3;
 
+  components new BlockReaderC(VOLUME_GOLDENIMAGE) as BlockReaderDeluge0;
+  components new BlockReaderC(VOLUME_DELUGE1) as BlockReaderDeluge1;
+  components new BlockReaderC(VOLUME_DELUGE2) as BlockReaderDeluge2;
+  components new BlockReaderC(VOLUME_DELUGE3) as BlockReaderDeluge3;
+
   NWProgP.Boot -> MainC;
   NWProgP.NetProg -> NetProgC;
   NWProgP.StorageMap -> BlockStorageManagerC;
-  NWProgP.Recv -> IPDispatchC.UDP[5213];
+  NWProgP.Recv -> UdpSocketC; // IPDispatchC.UDP[5213];
   NWProgP.Resource -> BlockStorageLockClientC;
 
   NWProgP.BlockWrite[VOLUME_GOLDENIMAGE] -> BlockWriterDeluge0;
@@ -30,8 +36,19 @@ configuration NWProgC {
   NWProgP.BlockWrite[VOLUME_DELUGE2] -> BlockWriterDeluge2;
   NWProgP.BlockWrite[VOLUME_DELUGE3] -> BlockWriterDeluge3;
 
+  NWProgP.BlockRead[VOLUME_GOLDENIMAGE] -> BlockReaderDeluge0;
+  NWProgP.BlockRead[VOLUME_DELUGE1] -> BlockReaderDeluge1;
+  NWProgP.BlockRead[VOLUME_DELUGE2] -> BlockReaderDeluge2;
+  NWProgP.BlockRead[VOLUME_DELUGE3] -> BlockReaderDeluge3;
+
+#ifdef BINARY_SHELL
+  components BinaryShellC;
+  NWProgP.ShellCommand -> BinaryShellC.BinaryCommand[BSHELL_NWPROG];
+#else
   components new ShellCommandC("nwprog");
   NWProgP.ShellCommand -> ShellCommandC;
+#endif
+
   components new TimerMilliC();
   NWProgP.RebootTimer -> TimerMilliC;
   components new DelugeMetadataClientC();