[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/serial SerialActiveMessageP.nc, 1.5, 1.6 SerialDispatcherP.nc, 1.5, 1.6

[Phil Levis]

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

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


Index: SerialActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/SerialActiveMessageP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SerialActiveMessageP.nc	21 Jun 2007 16:00:04 -0000	1.5
--- SerialActiveMessageP.nc	13 Sep 2007 23:10:19 -0000	1.6
***************
*** 75,80 ****
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m) {
!     return call Packet.getPayload(m, NULL);
    }
    
--- 75,80 ----
    }
  
!   command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
!     return call Packet.getPayload(m, len);
    }
    
***************
*** 91,104 ****
   }
   
!   
!   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);
!   }
!   
!   event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {
      return signal Receive.receive[call AMPacket.type(msg)](msg, msg->data, len);
    }
--- 91,95 ----
   }
   
!  event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {
      return signal Receive.receive[call AMPacket.type(msg)](msg, msg->data, len);
    }
***************
*** 121,129 ****
    }
    
!   command void* Packet.getPayload(message_t* msg, uint8_t* len) {
!     if (len != NULL) { 
!       *len = call Packet.payloadLength(msg);
      }
-     return msg->data;
    }
  
--- 112,122 ----
    }
    
!   command void* Packet.getPayload(message_t* msg, uint8_t len) {
!     if (len > call Packet.maxPayloadLength()) {
!       return NULL;
!     }
!     else {
!       return msg->data;
      }
    }
  

Index: SerialDispatcherP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/SerialDispatcherP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SerialDispatcherP.nc	19 Apr 2007 22:45:47 -0000	1.5
--- SerialDispatcherP.nc	13 Sep 2007 23:10:19 -0000	1.6
***************
*** 135,153 ****
    }
  
!   command void* Send.getPayload[uint8_t id](message_t* m) {
!     return m;
!   }
! 
!   command void* Receive.getPayload[uint8_t id](message_t* m, uint8_t* len) {
!     if (len != NULL) {
!       *len = 0;
      }
-     return m;
-   }
- 
-   command uint8_t Receive.payloadLength[uint8_t id](message_t* m) {
-     return 0;
    }
  
    task void signalSendDone(){
      error_t error;
--- 135,148 ----
    }
  
!   command void* Send.getPayload[uint8_t id](message_t* m, uint8_t len) {
!     if (len > sizeof(message_t)) {
!       return NULL;
!     }
!     else {
!       return m;
      }
    }
  
+     
    task void signalSendDone(){
      error_t error;