Update to meet tep 3 standards for naming messages

diff --git a/apps/tests/TestPrintf/Makefile b/apps/tests/TestPrintf/Makefile
index 9f2960ffe0b62419b049afab989048fdc06c2b2e..eb460329a4c38c2536a70c9a576be0ced8f8f5b1 100644 (file)
--- a/apps/tests/TestPrintf/Makefile
+++ b/apps/tests/TestPrintf/Makefile
@@ -7,7 +7,7 @@ BUILD_EXTRA_DEPS += PrintfMsg.class PrintfClient.class
        javac $<
 
 PrintfMsg.java: $(TOSDIR)/lib/printf/printf.h
-       mig java -target=$(PLATFORM) $(CFLAGS) -java-classname=PrintfMsg $(TOSDIR)/lib/printf/printf.h PrintfMsg -o $@
+       mig java -target=$(PLATFORM) $(CFLAGS) -java-classname=PrintfMsg $(TOSDIR)/lib/printf/printf.h printf_msg -o $@
 
 include $(MAKERULES)
 

diff --git a/tos/lib/printf/PrintfC.nc b/tos/lib/printf/PrintfC.nc
index ec89b2d94c53b46a4d968d7f51e4e97a65437ec1..bd1ec635b890fce1ea16ce201b9ea82d35b386fd 100644 (file)
--- a/tos/lib/printf/PrintfC.nc
+++ b/tos/lib/printf/PrintfC.nc
@@ -49,7 +49,7 @@ configuration PrintfC {
 }
 implementation {
   components SerialActiveMessageC;
-  components new SerialAMSenderC(AM_PRINTFMSG);
+  components new SerialAMSenderC(AM_PRINTF_MSG);
   components PrintfP;
   components LedsC;
 

diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc
index 0382f9b84f5b7bc580a6f11ba233c70c61bc6d32..0065b0abc38aae8ed411e3d77516618b7f1cb130 100644 (file)
--- a/tos/lib/printf/PrintfP.nc
+++ b/tos/lib/printf/PrintfP.nc
@@ -79,16 +79,16 @@ implementation {
   uint8_t length_to_send;
   
   task void retrySend() {
-    if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg)) != SUCCESS)
+    if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg_t)) != SUCCESS)
       post retrySend();
   }
   
   void sendNext() {
-       printf_msg* m = (printf_msg*)call Packet.getPayload(&printfMsg, NULL);
-       length_to_send = (bytes_left_to_flush < sizeof(printf_msg)) ? bytes_left_to_flush : sizeof(printf_msg);
+       printf_msg_t* m = (printf_msg_t*)call Packet.getPayload(&printfMsg, NULL);
+       length_to_send = (bytes_left_to_flush < sizeof(printf_msg_t)) ? bytes_left_to_flush : sizeof(printf_msg_t);
        memset(m->buffer, 0, sizeof(printfMsg));
        memcpy(m->buffer, (uint8_t*)next_byte, length_to_send);
-    if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg)) != SUCCESS)
+    if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg_t)) != SUCCESS)
       post retrySend();  
     else {
       bytes_left_to_flush -= length_to_send;

diff --git a/tos/lib/printf/printf.h b/tos/lib/printf/printf.h
index 370f8f8949e63b4ce39675a6f2c8b91cda49ef21..e25b28e4ec6b5129c9ec7a7237ba4b25a9e66357 100644 (file)
--- a/tos/lib/printf/printf.h
+++ b/tos/lib/printf/printf.h
@@ -37,10 +37,10 @@
 
 typedef nx_struct printf_msg {
   nx_uint8_t buffer[TOSH_DATA_LENGTH];
-} printf_msg;
+} printf_msg_t;
 
 enum {
-  AM_PRINTFMSG = 100,
+  AM_PRINTF_MSG = 100,
 };
 
 #endif //PRINTF_H