[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/byte_radio LinkLayerP.nc, 1.4, 1.5 PacketSerializerP.nc, 1.6, 1.7

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27056/tos/lib/byte_radio

Modified Files:
	LinkLayerP.nc PacketSerializerP.nc 
Log Message:
The big interface switchover for Packet, Send, Receive, and AMSend.


Index: LinkLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/LinkLayerP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LinkLayerP.nc	5 Apr 2007 06:38:45 -0000	1.4
--- LinkLayerP.nc	13 Sep 2007 23:10:17 -0000	1.5
***************
*** 173,178 ****
      }
  
!     command void* Send.getPayload(message_t* msg) {
!       return call Packet.getPayload(msg, (uint8_t*) (call Packet.payloadLength(msg)) );
      }
      
--- 173,178 ----
      }
  
!     command void* Send.getPayload(message_t* msg, uint8_t len) {
!       return call Packet.getPayload(msg, len);
      }
      
***************
*** 197,201 ****
        atomic {
          len = call Packet.payloadLength(rxBufPtr);
!         payload = call Packet.getPayload(rxBufPtr, &len);
          tmpMsgPtr = rxBufPtr;
        }
--- 197,201 ----
        atomic {
          len = call Packet.payloadLength(rxBufPtr);
!         payload = call Packet.getPayload(rxBufPtr, len);
          tmpMsgPtr = rxBufPtr;
        }
***************
*** 223,233 ****
      }
  
-     command void* Receive.getPayload(message_t* msg, uint8_t* len) {
-       return call Packet.getPayload(msg, len);
-     }
- 
-     command uint8_t Receive.payloadLength(message_t* msg) {
-       return call Packet.payloadLength(msg);
-     }
  
      /*************** default events ***********/
--- 223,226 ----

Index: PacketSerializerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/PacketSerializerP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PacketSerializerP.nc	17 Apr 2007 12:57:59 -0000	1.6
--- PacketSerializerP.nc	13 Sep 2007 23:10:17 -0000	1.7
***************
*** 204,212 ****
    }
  
!   command void* Packet.getPayload(message_t* msg, uint8_t* len) {
!     if (len != NULL) {
!       *len = (getHeader(msg))->length;
      }
-     return (void*)msg->data;
    }
    
--- 204,214 ----
    }
  
!   command void* Packet.getPayload(message_t* msg, uint8_t len) {
!     if (len <= TOSH_DATA_LENGTH) {
!       return (void*)msg->data;
!     }
!     else {
!       return NULL;
      }
    }