Minor updates to comply wit TEP3 and TEP4

diff --git a/apps/tests/storage/Block/RandRWAppC.nc b/apps/tests/storage/Block/RandRWAppC.nc
index 6b1ac0ff4d0a719a2565c08537b35dab3cd68ffe..c2a53de930ce8f034cb1aea923fbedaeebf43e55 100644 (file)
--- a/apps/tests/storage/Block/RandRWAppC.nc
+++ b/apps/tests/storage/Block/RandRWAppC.nc
@@ -24,7 +24,7 @@ implementation {
   MainC.Boot <- RandRWC;
 
   RandRWC.SerialControl -> SerialActiveMessageC;
-  RandRWC.AMSend -> SerialActiveMessageC.AMSend[1];
+  RandRWC.AMSend -> SerialActiveMessageC.AMSend[139];
   RandRWC.BlockRead -> BlockStorageC.BlockRead;
   RandRWC.BlockWrite -> BlockStorageC.BlockWrite;
   RandRWC.Leds -> LedsC;

diff --git a/apps/tests/storage/Block/RandRWC.nc b/apps/tests/storage/Block/RandRWC.nc
index d3afad7f87a3697ab4c132f5031e52e3011c3352..874c5ca70dc513747ea2e4279704bcbf69b7cce5 100644 (file)
--- a/apps/tests/storage/Block/RandRWC.nc
+++ b/apps/tests/storage/Block/RandRWC.nc
@@ -60,15 +60,15 @@ implementation {
   int count, testCount;
   uint32_t addr, len;
   uint16_t offset;
-  message_t reportmsg;
+  message_t reportMsg;
 
   void done();
 
   void report(error_t e) {
-    uint8_t *msg = call AMSend.getPayload(&reportmsg, 1);
+    uint8_t *msg = call AMSend.getPayload(&reportMsg, 1);
 
     msg[0] = e;
-    if (call AMSend.send(AM_BROADCAST_ADDR, &reportmsg, 1) != SUCCESS)
+    if (call AMSend.send(AM_BROADCAST_ADDR, &reportMsg, 1) != SUCCESS)
       call Leds.led0On();
   }
 

diff --git a/apps/tests/storage/CircularLog/RandRWAppC.nc b/apps/tests/storage/CircularLog/RandRWAppC.nc
index 008bc0bd8979f0745923397a19373c40408424ff..d55b6232cf41a53d950aa3ea50535bd961375833 100644 (file)
--- a/apps/tests/storage/CircularLog/RandRWAppC.nc
+++ b/apps/tests/storage/CircularLog/RandRWAppC.nc
@@ -24,7 +24,7 @@ implementation {
   MainC.Boot <- RandRWC;
 
   RandRWC.SerialControl -> SerialActiveMessageC;
-  RandRWC.AMSend -> SerialActiveMessageC.AMSend[1];
+  RandRWC.AMSend -> SerialActiveMessageC.AMSend[139];
   RandRWC.LogRead -> LogStorageC.LogRead;
   RandRWC.LogWrite -> LogStorageC.LogWrite;
   RandRWC.Leds -> LedsC;

diff --git a/apps/tests/storage/CircularLog/RandRWC.nc b/apps/tests/storage/CircularLog/RandRWC.nc
index db69deab546d652256a2eef5e6b84b068983fecf..64c6425df44b767a098b0e0c7cf5929c95cb22d9 100644 (file)
--- a/apps/tests/storage/CircularLog/RandRWC.nc
+++ b/apps/tests/storage/CircularLog/RandRWC.nc
@@ -62,13 +62,13 @@ implementation {
   
   uint8_t data[NRECS * RECSIZE], rdata[RECSIZE];
   int count, testCount;
-  message_t reportmsg;
+  message_t reportMsg;
 
   void report(error_t e) {
-    uint8_t *msg = call AMSend.getPayload(&reportmsg, 1);
+    uint8_t *msg = call AMSend.getPayload(&reportMsg, 1);
 
     msg[0] = e;
-    if (call AMSend.send(AM_BROADCAST_ADDR, &reportmsg, 1) != SUCCESS)
+    if (call AMSend.send(AM_BROADCAST_ADDR, &reportMsg, 1) != SUCCESS)
       call Leds.led0On();
   }
 

diff --git a/apps/tests/storage/Config/RandRWAppC.nc b/apps/tests/storage/Config/RandRWAppC.nc
index 7a41aa08ae8b79bd2cbfa90cd181e9bda801008f..7a1d186898294bdcdf11084d6aada254fbfc9024 100644 (file)
--- a/apps/tests/storage/Config/RandRWAppC.nc
+++ b/apps/tests/storage/Config/RandRWAppC.nc
@@ -24,7 +24,7 @@ implementation {
   MainC.Boot <- RandRWC;
 
   RandRWC.SerialControl -> SerialActiveMessageC;
-  RandRWC.AMSend -> SerialActiveMessageC.AMSend[1];
+  RandRWC.AMSend -> SerialActiveMessageC.AMSend[139];
   RandRWC.ConfigStorage -> ConfigStorageC.ConfigStorage;
   RandRWC.ConfigMount -> ConfigStorageC.Mount;
   RandRWC.Leds -> LedsC;

diff --git a/apps/tests/storage/Config/RandRWC.nc b/apps/tests/storage/Config/RandRWC.nc
index a13763a194d3f696ae3f54d712f7e4059f5ff1de..f9810c3b66c146c1ca1b2a32238df642e0d502a4 100644 (file)
--- a/apps/tests/storage/Config/RandRWC.nc
+++ b/apps/tests/storage/Config/RandRWC.nc
@@ -41,7 +41,7 @@ implementation {
     uint16_t len;
   } ops[NWRITES];
 
-  message_t reportmsg;
+  message_t reportMsg;
 
 
   void done();
@@ -70,10 +70,10 @@ implementation {
   }
   
   void report(error_t e) {
-    uint8_t *msg = call AMSend.getPayload(&reportmsg, 1);
+    uint8_t *msg = call AMSend.getPayload(&reportMsg, 1);
 
     msg[0] = e;
-    if (call AMSend.send(AM_BROADCAST_ADDR, &reportmsg, 1) != SUCCESS)
+    if (call AMSend.send(AM_BROADCAST_ADDR, &reportMsg, 1) != SUCCESS)
       call Leds.led0On();
   }
 

diff --git a/apps/tests/storage/Log/RandRWAppC.nc b/apps/tests/storage/Log/RandRWAppC.nc
index 8f8a21fe11454cfea2575af0227f6be4823b0de7..41934b1e5206d87453f5d810188c688c906a513d 100644 (file)
--- a/apps/tests/storage/Log/RandRWAppC.nc
+++ b/apps/tests/storage/Log/RandRWAppC.nc
@@ -24,7 +24,7 @@ implementation {
   MainC.Boot <- RandRWC;
 
   RandRWC.SerialControl -> SerialActiveMessageC;
-  RandRWC.AMSend -> SerialActiveMessageC.AMSend[1];
+  RandRWC.AMSend -> SerialActiveMessageC.AMSend[139];
   RandRWC.LogRead -> LogStorageC.LogRead;
   RandRWC.LogWrite -> LogStorageC.LogWrite;
   RandRWC.Leds -> LedsC;

diff --git a/apps/tests/storage/Log/RandRWC.nc b/apps/tests/storage/Log/RandRWC.nc
index 0420ac2ea4785d29d41c6d786a0baea897c9080c..0c7ee628a86165df2ccb0c2f7a4ace69e4403d49 100644 (file)
--- a/apps/tests/storage/Log/RandRWC.nc
+++ b/apps/tests/storage/Log/RandRWC.nc
@@ -62,15 +62,15 @@ implementation {
   int count, testCount;
   uint32_t len;
   uint16_t offset;
-  message_t reportmsg;
+  message_t reportMsg;
 
   void report(error_t e) {
-    uint8_t *msg = call AMSend.getPayload(&reportmsg, 1);
+    uint8_t *msg = call AMSend.getPayload(&reportMsg, 1);
 
     if (msg)
       {
        msg[0] = e;
-       if (call AMSend.send(AM_BROADCAST_ADDR, &reportmsg, 1) == SUCCESS)
+       if (call AMSend.send(AM_BROADCAST_ADDR, &reportMsg, 1) == SUCCESS)
          return;
       }
     call Leds.led0On();

diff --git a/apps/tests/storage/SyncLog/README.txt b/apps/tests/storage/SyncLog/README.txt
index 4c3df970a19946a5ecb616e6da9d1a4dfc7e3f37..c8f4812a76dd95f6a5ffe2181e8e948f8a870c27 100644 (file)
--- a/apps/tests/storage/SyncLog/README.txt
+++ b/apps/tests/storage/SyncLog/README.txt
@@ -8,7 +8,7 @@ abstraction, using the log in linear mode. There must be a
 volumes-<chip>.xml file in this directory describing a 64kB volume
 named SYNCLOG for your flash chip.
 
-A successful test will send serial messages (id 11) with increasing
+A successful test will send serial messages (id 139) with increasing
 sequence numbers (approximately 2 messages every 5 seconds) - the
 easiest way to see these messages is to connect the mote with the
 SyncLog code to your PC and run the java Listen tool:

diff --git a/apps/tests/storage/SyncLog/SyncLogAppC.nc b/apps/tests/storage/SyncLog/SyncLogAppC.nc
index a8b7eb1773ba2f0651c74231e8d816cc50461411..5332eb970e10cc9d75b18cc88d3141e469e043c8 100644 (file)
--- a/apps/tests/storage/SyncLog/SyncLogAppC.nc
+++ b/apps/tests/storage/SyncLog/SyncLogAppC.nc
@@ -21,6 +21,6 @@ implementation {
   SyncLogC.Timer1 -> Timer1;
   SyncLogC.LogWrite -> LogStorageC;
   SyncLogC.LogRead -> LogStorageC;
-  SyncLogC.AMSend -> SerialActiveMessageC.AMSend[11];
+  SyncLogC.AMSend -> SerialActiveMessageC.AMSend[139];
   SyncLogC.AMControl -> SerialActiveMessageC;
 }