[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420 CC2420.h, 1.11, 1.12 CC2420ActiveMessageP.nc, 1.16, 1.17

[David Gay]

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

Modified Files:
	CC2420.h CC2420ActiveMessageP.nc 
Log Message:
fix misuse of interface

Index: CC2420.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CC2420.h	17 Jun 2008 07:28:24 -0000	1.11
--- CC2420.h	23 Jun 2008 23:40:21 -0000	1.12
***************
*** 139,142 ****
--- 139,144 ----
    // MDU
    MAC_PACKET_SIZE = MAC_HEADER_SIZE + TOSH_DATA_LENGTH + MAC_FOOTER_SIZE,
+ 
+   CC2420_SIZE = MAC_HEADER_SIZE + MAC_FOOTER_SIZE,
  };
  

Index: CC2420ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420ActiveMessageP.nc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CC2420ActiveMessageP.nc	11 Jun 2008 00:46:23 -0000	1.16
--- CC2420ActiveMessageP.nc	23 Jun 2008 23:40:21 -0000	1.17
***************
*** 58,65 ****
  implementation {
  
-   enum {
-     CC2420_SIZE = MAC_HEADER_SIZE + MAC_FOOTER_SIZE,
-   };
-   
    /***************** AMSend Commands ****************/
    command error_t AMSend.send[am_id_t id](am_addr_t addr,
--- 58,61 ----
***************
*** 74,78 ****
      signal SendNotifier.aboutToSend[id](addr, msg);
      
!     return call SubSend.send( msg, len + CC2420_SIZE );
    }
  
--- 70,74 ----
      signal SendNotifier.aboutToSend[id](addr, msg);
      
!     return call SubSend.send( msg, len );
    }
  
***************
*** 180,187 ****
      
      if (call AMPacket.isForMe(msg)) {
!       return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len - CC2420_SIZE);
      }
      else {
!       return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len - CC2420_SIZE);
      }
    }
--- 176,183 ----
      
      if (call AMPacket.isForMe(msg)) {
!       return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len);
      }
      else {
!       return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len);
      }
    }