[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge DelugePageTransferP.nc, 1.2, 1.3 ObjectTransferP.nc, 1.5, 1.6

[Phil Levis]

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

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


Index: DelugePageTransferP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/DelugePageTransferP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelugePageTransferP.nc	19 Jul 2007 02:19:38 -0000	1.2
--- DelugePageTransferP.nc	13 Sep 2007 23:10:18 -0000	1.3
***************
*** 102,107 ****
    void setupReqMsg()
    {
!     DelugeReqMsg *pReqMsg = (DelugeReqMsg *)(call SendReqMsg.getPayload(&pMsgBuf));
!     
      if (state == S_RX_LOCKING) {
        if (isBusy_pMsgBuf) {
--- 102,109 ----
    void setupReqMsg()
    {
!     DelugeReqMsg *pReqMsg = (DelugeReqMsg *)(call SendReqMsg.getPayload(&pMsgBuf, sizeof(DelugeReqMsg)));
!     if (pReqMsg == NULL) {
!       return;
!     }
      if (state == S_RX_LOCKING) {
        if (isBusy_pMsgBuf) {
***************
*** 152,156 ****
    void setupDataMsg()
    {
!     DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf));
      uint16_t nextPkt;
      
--- 154,158 ----
    void setupDataMsg()
    {
!     DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf, sizeof(DelugeDataMsg)));
      uint16_t nextPkt;
      
***************
*** 364,368 ****
    event void SendDataMsg.sendDone(message_t* msg, error_t error)
    {
!     DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf));
      BITVEC_CLEAR(pktsToSend, pDataMsg->pktNum);
      call Timer.startOneShot(2);
--- 366,373 ----
    event void SendDataMsg.sendDone(message_t* msg, error_t error)
    {
!     DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf, sizeof (DelugeDataMsg)));
!     if (pDataMsg == NULL) {
!       return;
!     }
      BITVEC_CLEAR(pktsToSend, pDataMsg->pktNum);
      call Timer.startOneShot(2);
***************
*** 418,422 ****
    event void BlockRead.readDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error)
    {
!     DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf));
      // make sure this event for us
      if (buf != pDataMsg->data) {
--- 423,427 ----
    event void BlockRead.readDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error)
    {
!     DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf, sizeof(DelugeDataMsg)));
      // make sure this event for us
      if (buf != pDataMsg->data) {

Index: ObjectTransferP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/ObjectTransferP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ObjectTransferP.nc	25 Jul 2007 23:14:13 -0000	1.5
--- ObjectTransferP.nc	13 Sep 2007 23:10:18 -0000	1.6
***************
*** 131,136 ****
    void sendAdvMsg(uint16_t addr)
    {
!     DelugeAdvMsg *pMsg = (DelugeAdvMsg *)(call SendAdvMsg.getPayload(&pMsgBuf));
!     
      if (isBusy_pMsgBuf == FALSE) {
        pMsg->sourceAddr = TOS_NODE_ID;
--- 131,138 ----
    void sendAdvMsg(uint16_t addr)
    {
!     DelugeAdvMsg *pMsg = (DelugeAdvMsg *)(call SendAdvMsg.getPayload(&pMsgBuf, sizeof(DelugeAdvMsg)));
!     if (pMsg == NULL) {
!       return;
!     }
      if (isBusy_pMsgBuf == FALSE) {
        pMsg->sourceAddr = TOS_NODE_ID;