From: konradlorincz <konradlorincz>
Date: Wed, 25 Jun 2008 01:29:44 +0000 (+0000)
Subject: Minor updates to comply wit TEP3 and TEP4
X-Git-Tag: release_tinyos_2_1_0_0~164
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=b2f6921eb24d60d291c0dd7a7ee17ce1c6f2c0fa

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 6b1ac0ff..c2a53de9 100644
--- 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 d3afad7f..874c5ca7 100644
--- 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 008bc0bd..d55b6232 100644
--- 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 db69deab..64c6425d 100644
--- 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 7a41aa08..7a1d1868 100644
--- 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 a13763a1..f9810c3b 100644
--- 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 8f8a21fe..41934b1e 100644
--- 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 0420ac2e..0c7ee628 100644
--- 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 4c3df970..c8f4812a 100644
--- 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 a8b7eb17..5332eb97 100644
--- 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;
 }