Fix a brake statement in a switch in FlashVolumeManagerP and update the README.txt...

diff --git a/apps/tests/deluge/Blink/README.txt b/apps/tests/deluge/Blink/README.txt
index 4be92bc6618227098fa589a216c39fabb9bf4ce5..01a1be3ae4f0c8efa5499da2c950cef17010ab0f 100644 (file)
--- a/apps/tests/deluge/Blink/README.txt
+++ b/apps/tests/deluge/Blink/README.txt
@@ -1,38 +1,54 @@
-README for apps/tests/deluge/Blink\r
-Author/Contact:\r
-\r
-Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>\r
-Razvan Musaloiu-E. <razvanm@cs.jhu.edu>\r
-\r
-Description:\r
-\r
-This is a sample application referenced in the Deluge T2 manual to show \r
-some of the basics in reprogramming.\r
-\r
-The burn script performs the following tasks on the basestation:\r
-   1) Compile and load the program normally.\r
-   2) Compile another version of blink that blinks differently.\r
-   3) Upload the new blink to flash volume 0.\r
-   4) Instruct the mote to reprogram with the new blink.\r
-\r
-Alternatively, you can reprogram the whole network (non-basestation \r
-motes) by first uploading the image to the base station. Then, tell the \r
-base station to disseminate the image. For example,\r
-\r
-   tos-deluge /dev/ttyUSB0 telosb -d 0\r
-   \r
-Finally, after the image has been disseminated, instruct the base \r
-station to disseminate the command to reprogram. For example,\r
-\r
-   tos-deluge /dev/ttyUSB0 telosb -r 0\r
-\r
-For a more detailed discussion on Deluge T2, please refer to the Deluge \r
-T2 manual.\r
-\r
-Prerequisites:\r
-\r
-Python 2.4 with pySerial\r
-\r
-References:\r
-\r
-The Deluge T2 manual is available under $TOS_DIR/doc/html/.\r
+README for apps/tests/deluge/Blink
+Author/Contact:
+
+Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+
+Description:
+
+This application serves two purposes. First, it contains two test cases 
+for Deluge T2: testing base station functionality and network-wide 
+reprogramming. Second, it is a sample application referenced in the 
+Deluge T2 manual to illustrate some of the basics in reprogramming. 
+These are done with the two burn scripts in the directory.
+
+The "burn" script performs the following tasks (on the basestation 
+only):
+   1) Compile and load the program normally.
+   2) Compile another version of blink that blinks differently.
+   3) Upload the new blink to flash volume 0.
+   4) Instruct the mote to reprogram with the new blink.
+
+The "burn-net" script performs the following tasks:
+   1) Compile and load the program normally on multiple motes. The last 
+      mote is designated to be the basestation.
+   2) Compile another version of blink that blinks differently.
+   3) Upload the new blink to flash volume 0 on the base station.
+   4) Instruct the base station to disseminate the new blink.
+   5) Instruct the base station to reprogram the network with the new 
+      image.
+
+To help testing, "burn-net" script describes what the user should expect 
+in each step.
+
+Alternatively, you can reprogram the whole network (non-basestation 
+motes) by first uploading the image to the base station. Then, tell the 
+base station to disseminate the image. For example,
+
+   tos-deluge /dev/ttyUSB0 telosb -d 0
+
+Finally, after the image has been disseminated, instruct the base 
+station to disseminate the command to reprogram. For example,
+
+   tos-deluge /dev/ttyUSB0 telosb -r 0
+
+For a more detailed discussion on Deluge T2, please refer to the Deluge 
+T2 manual.
+
+Prerequisites:
+
+Python 2.4 with pySerial
+
+References:
+
+The Deluge T2 manual is available under $TOS_DIR/doc/html/.

diff --git a/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc
index 2021f2e0a6ca549b01b1fa6e4b7d796b183677b3..110833bba5affd0a752a33fca19bcd000fd9bdf4 100644 (file)
--- a/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc
+++ b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc
@@ -184,6 +184,7 @@ implementation
         case SERIALMSG_SYNC:     // === Sync the flash ===
           state = S_SYNC;
           error = call BlockWrite.sync[img_num]();
+         break;
   #ifdef DELUGE
         case SERIALMSG_ADDR:     // === Gets the physical starting address of a volume ===
           *(nx_uint32_t*)(&serialMsg_payload->data) =