[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420 CC2420ActiveMessageP.nc, 1.14, 1.15

[John Regehr]

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

Modified Files:
	CC2420ActiveMessageP.nc 
Log Message:
safe tinyos annotations

Index: CC2420ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420ActiveMessageP.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CC2420ActiveMessageP.nc	14 May 2008 21:33:07 -0000	1.14
--- CC2420ActiveMessageP.nc	3 Jun 2008 04:43:02 -0000	1.15
***************
*** 200,215 ****
  
    async event void SubBackoff.requestInitialBackoff(message_t *msg) {
!     signal RadioBackoff.requestInitialBackoff[((cc2420_header_t*)(msg->data - 
!                                         sizeof(cc2420_header_t)))->type](msg);
    }
  
    async event void SubBackoff.requestCongestionBackoff(message_t *msg) {
!     signal RadioBackoff.requestCongestionBackoff[((cc2420_header_t*)(msg->data - 
!         sizeof(cc2420_header_t)))->type](msg);
    }
    async event void SubBackoff.requestCca(message_t *msg) {
      // Lower layers than this do not configure the CCA settings
!     signal RadioBackoff.requestCca[((cc2420_header_t*)(msg->data - 
!         sizeof(cc2420_header_t)))->type](msg);
    }
  
--- 200,215 ----
  
    async event void SubBackoff.requestInitialBackoff(message_t *msg) {
!     signal RadioBackoff.requestInitialBackoff[(TCAST(cc2420_header_t* ONE,
!         (uint8_t*)msg + offsetof(message_t, data) - sizeof(cc2420_header_t)))->type](msg);
    }
  
    async event void SubBackoff.requestCongestionBackoff(message_t *msg) {
!     signal RadioBackoff.requestCongestionBackoff[(TCAST(cc2420_header_t* ONE,
!         (uint8_t*)msg + offsetof(message_t, data) - sizeof(cc2420_header_t)))->type](msg);
    }
    async event void SubBackoff.requestCca(message_t *msg) {
      // Lower layers than this do not configure the CCA settings
!     signal RadioBackoff.requestCca[(TCAST(cc2420_header_t* ONE,
!         (uint8_t*)msg + offsetof(message_t, data) - sizeof(cc2420_header_t)))->type](msg);
    }