[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/xe1205 XE1205ActiveMessageP.nc, 1.4, 1.5 XE1205SendReceiveP.nc, 1.4, 1.5

[Phil Levis]

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

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


Index: XE1205ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/xe1205/XE1205ActiveMessageP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XE1205ActiveMessageP.nc	20 Jun 2007 23:49:02 -0000	1.4
--- XE1205ActiveMessageP.nc	13 Sep 2007 23:10:16 -0000	1.5
***************
*** 111,116 ****
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m) {
!     return call Packet.getPayload(m, NULL);
    }
  
--- 111,116 ----
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
!     return call Packet.getPayload(m, len);
    }
  
***************
*** 154,172 ****
    }
  
-   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);
-   }
    
  }
--- 154,157 ----

Index: XE1205SendReceiveP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/xe1205/XE1205SendReceiveP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XE1205SendReceiveP.nc	13 Jul 2007 15:54:08 -0000	1.4
--- XE1205SendReceiveP.nc	13 Sep 2007 23:10:16 -0000	1.5
***************
*** 134,149 ****
      }
  
!     command void* Send.getPayload(message_t* m) {
! 	return call Packet.getPayload(m, NULL);
!     }
! 
!     command void* Receive.getPayload(message_t* m, uint8_t* len) {
  	return call Packet.getPayload(m, len);
      }
  
-     command uint8_t Receive.payloadLength(message_t* m) {
- 	return call Packet.payloadLength(m);
-     }
- 
     task void sendDoneTask() {
  	txMsgSendDonePtr = txMsgPtr;
--- 134,141 ----
      }
  
!     command void* Send.getPayload(message_t* m, uint8_t len) {
  	return call Packet.getPayload(m, len);
      }
  
     task void sendDoneTask() {
  	txMsgSendDonePtr = txMsgPtr;
***************
*** 387,395 ****
      }
  
!     command void* Packet.getPayload(message_t* msg, uint8_t* len) {
! 	if (len != NULL) {
! 	    *len = getMetadata(msg)->length;
! 	}
  	return (void*)msg->data;
      }
  
--- 379,389 ----
      }
  
!     command void* Packet.getPayload(message_t* msg, uint8_t len) {
!       if (len <= TOSH_DATA_LENGTH) {
  	return (void*)msg->data;
+       }
+       else {
+ 	return NULL;
+       }
      }