oops....

diff --git a/tos/chips/cc1000/CC1000ActiveMessageP.nc b/tos/chips/cc1000/CC1000ActiveMessageP.nc
index 4fc6bd4dad3b7985e6dff380e60d348b845b2791..086f23a8a722fff90a417fc9ea63564f43791870 100644 (file)
--- a/tos/chips/cc1000/CC1000ActiveMessageP.nc
+++ b/tos/chips/cc1000/CC1000ActiveMessageP.nc
@@ -82,15 +82,15 @@ implementation {
     return call Packet.maxPayloadLength();
   }
 
-  command void* AMSend.getPayload[am_id_t id](message_t* m) {
-    return call Packet.getPayload(m, NULL);
+  command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
+    return call Packet.getPayload(m, len);
   }
 
   /* Receiving a packet */
 
   event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {
     cc1000_footer_t* msg_footer = getFooter(msg);
-    if(msg_footer->crc == 1) {      
+    if(msg_footer->crc == 1) {
       if (call AMPacket.isForMe(msg)) {
         return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len);
       }
@@ -100,22 +100,6 @@ implementation {
     }
   }
   
-  command void* Receive.getPayload[am_id_t id](message_t* m, uint8_t* len) {
-    return call Packet.getPayload(m, len);
-  }
-
-  command uint8_t Receive.payloadLength[am_id_t id](message_t* m) {
-    return call Packet.payloadLength(m);
-  }
-  
-  command void* Snoop.getPayload[am_id_t id](message_t* m, uint8_t* len) {
-    return call Packet.getPayload(m, len);
-  }
-
-  command uint8_t Snoop.payloadLength[am_id_t id](message_t* m) {
-    return call Packet.payloadLength(m);
-  }
-
   command am_addr_t AMPacket.address() {
     return call amAddress();
   }

diff --git a/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc b/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc
index a84fe9cdd1611528183c32f792119d1d63e895b3..5993da7664b9217a72a847a052df3635099446f4 100644 (file)
--- a/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc
+++ b/tos/chips/cc1000_lpl/CC1000ActiveMessageP.nc
@@ -58,7 +58,7 @@ implementation {
   cc1000_footer_t *getFooter(message_t *amsg) {\r
     return (cc1000_footer_t *)(amsg->footer);\r
   }\r
-  \r
+\r
   command error_t AMSend.send[am_id_t id](am_addr_t addr,\r
                                          message_t* amsg,\r
                                          uint8_t len) {\r
@@ -90,7 +90,7 @@ implementation {
 \r
   event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {\r
     cc1000_footer_t* msg_footer = getFooter(msg);\r
-    if(msg_footer->crc == 1) {      \r
+    if(msg_footer->crc == 1) {\r
       if (call AMPacket.isForMe(msg)) {\r
         return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len);\r
       }\r