The big interface switchover for Packet, Send, Receive, and AMSend.

[tinyos-2.x.git] / apps / tests / TestSerial / TestSerialC.nc

diff --git a/apps/tests/TestSerial/TestSerialC.nc b/apps/tests/TestSerial/TestSerialC.nc
index 4f3f351e1c4413dd6f7afe6ae224921d15df8a9a..8278c5894250a34d1cf2ef3140913b636fb5af7b 100644 (file)
--- a/apps/tests/TestSerial/TestSerialC.nc
+++ b/apps/tests/TestSerial/TestSerialC.nc
@@ -71,13 +71,14 @@ implementation {
       return;
     }
     else {
-      TestSerialMsg* rcm = (TestSerialMsg*)call Packet.getPayload(&packet, NULL);
-      if (call Packet.maxPayloadLength() < sizeof(TestSerialMsg)) {
+      test_serial_msg_t* rcm = (test_serial_msg_t*)call Packet.getPayload(&packet, sizeof(test_serial_msg_t));
+      if (rcm == NULL) {return;}
+      if (call Packet.maxPayloadLength() < sizeof(test_serial_msg_t)) {
        return;
       }
 
       rcm->counter = counter;
-      if (call AMSend.send(AM_BROADCAST_ADDR, &packet, sizeof(TestSerialMsg)) == SUCCESS) {
+      if (call AMSend.send(AM_BROADCAST_ADDR, &packet, sizeof(test_serial_msg_t)) == SUCCESS) {
        locked = TRUE;
       }
     }
@@ -85,9 +86,9 @@ implementation {
 
   event message_t* Receive.receive(message_t* bufPtr, 
                                   void* payload, uint8_t len) {
-    if (len != sizeof(TestSerialMsg)) {return bufPtr;}
+    if (len != sizeof(test_serial_msg_t)) {return bufPtr;}
     else {
-      TestSerialMsg* rcm = (TestSerialMsg*)payload;
+      test_serial_msg_t* rcm = (test_serial_msg_t*)payload;
       if (rcm->counter & 0x1) {
        call Leds.led0On();
       }