[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc1000 ByteRadio.nc, 1.4, 1.5 CC1000ActiveMessageP.nc, 1.9, 1.10 CC1000CsmaP.nc, 1.5, 1.6 CC1000SendReceiveP.nc, 1.7, 1.8

[John Regehr]

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

Modified Files:
	ByteRadio.nc CC1000ActiveMessageP.nc CC1000CsmaP.nc 
	CC1000SendReceiveP.nc 
Log Message:
safe tinyos annotations

Index: ByteRadio.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/ByteRadio.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ByteRadio.nc	12 Dec 2006 18:23:05 -0000	1.4
--- ByteRadio.nc	3 Jun 2008 04:08:34 -0000	1.5
***************
*** 23,27 ****
     * @param msg Message to be sent.
     */
!   event void rts(message_t *msg);
  
    /**
--- 23,27 ----
     * @param msg Message to be sent.
     */
!   event void rts(message_t * ONE msg);
  
    /**

Index: CC1000ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000ActiveMessageP.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CC1000ActiveMessageP.nc	14 Dec 2007 04:35:56 -0000	1.9
--- CC1000ActiveMessageP.nc	3 Jun 2008 04:08:34 -0000	1.10
***************
*** 52,57 ****
  implementation {
  
!   cc1000_header_t* getHeader(message_t* amsg) {
!     return (cc1000_header_t*)(amsg->data - sizeof(cc1000_header_t));
    }
  
--- 52,57 ----
  implementation {
  
!   cc1000_header_t* ONE getHeader(message_t* ONE amsg) {
!     return TCAST(cc1000_header_t* ONE, (uint8_t*)amsg + offsetof(message_t, data) - sizeof(cc1000_header_t));
    }
  

Index: CC1000CsmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000CsmaP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CC1000CsmaP.nc	12 Dec 2006 18:23:05 -0000	1.5
--- CC1000CsmaP.nc	3 Jun 2008 04:08:34 -0000	1.6
***************
*** 108,113 ****
    task void setWakeupTask();
  
!   cc1000_metadata_t *getMetadata(message_t *amsg) {
!     return (cc1000_metadata_t *)((uint8_t *)amsg->footer + sizeof(cc1000_footer_t));
    }
    
--- 108,113 ----
    task void setWakeupTask();
  
!   cc1000_metadata_t * ONE getMetadata(message_t * ONE amsg) {
!     return TCAST(cc1000_metadata_t * ONE, (uint8_t*)amsg + offsetof(message_t, footer) + sizeof(cc1000_footer_t));
    }
    
***************
*** 161,165 ****
    }
  
!   void setPreambleLength(message_t *msg);
  
    /* Initialisation, startup and stopping */
--- 161,165 ----
    }
  
!   void setPreambleLength(message_t * ONE msg);
  
    /* Initialisation, startup and stopping */
***************
*** 356,360 ****
    /*------*/
  
!   event void ByteRadio.rts(message_t *msg) {
      atomic
        {
--- 356,360 ----
    /*------*/
  
!   event void ByteRadio.rts(message_t * ONE msg) {
      atomic
        {
***************
*** 555,559 ****
    }
  
!   void setPreambleLength(message_t *msg) {
      cc1000_metadata_t *meta = getMetadata(msg);
      uint16_t s;
--- 555,559 ----
    }
  
!   void setPreambleLength(message_t * ONE msg) {
      cc1000_metadata_t *meta = getMetadata(msg);
      uint16_t s;

Index: CC1000SendReceiveP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000SendReceiveP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CC1000SendReceiveP.nc	14 Sep 2007 00:15:57 -0000	1.7
--- CC1000SendReceiveP.nc	3 Jun 2008 04:08:34 -0000	1.8
***************
*** 123,130 ****
    uint16_t rxShiftBuf;
    message_t rxBuf;
!   message_t *rxBufPtr = &rxBuf;
  
    uint16_t preambleLength;
!   message_t *txBufPtr;
    uint8_t nextTxByte;
  
--- 123,130 ----
    uint16_t rxShiftBuf;
    message_t rxBuf;
!   message_t * ONE rxBufPtr = &rxBuf;
  
    uint16_t preambleLength;
!   message_t * ONE_NOK txBufPtr;
    uint8_t nextTxByte;
  
***************
*** 133,146 ****
    /* Packet structure accessor functions. Note that everything is
     * relative to the data field. */
!   cc1000_header_t *getHeader(message_t *amsg) {
!     return (cc1000_header_t *)(amsg->data - sizeof(cc1000_header_t));
    }
  
!   cc1000_footer_t *getFooter(message_t *amsg) {
      return (cc1000_footer_t *)(amsg->footer);
    }
    
!   cc1000_metadata_t *getMetadata(message_t *amsg) {
!     return (cc1000_metadata_t *)((uint8_t *)amsg->footer + sizeof(cc1000_footer_t));
    }
    
--- 133,146 ----
    /* Packet structure accessor functions. Note that everything is
     * relative to the data field. */
!   cc1000_header_t * ONE getHeader(message_t * ONE amsg) {
!     return TCAST(cc1000_header_t * ONE, (uint8_t *)amsg + offsetof(message_t, data) - sizeof(cc1000_header_t));
    }
  
!   cc1000_footer_t *getFooter(message_t * ONE amsg) {
      return (cc1000_footer_t *)(amsg->footer);
    }
    
!   cc1000_metadata_t * ONE getMetadata(message_t * ONE amsg) {
!     return TCAST(cc1000_metadata_t * ONE, (uint8_t *)amsg + offsetof(message_t, footer) + sizeof(cc1000_footer_t));
    }
    
***************
*** 499,503 ****
      rxShiftBuf = rxShiftBuf << 8 | in;
      nextByte = rxShiftBuf >> f.rxBitOffset;
!     ((uint8_t *)rxBufPtr)[count++] = nextByte;
  
      // Adjust rxLength to correspond to the corresponding offset in message_t
--- 499,503 ----
      rxShiftBuf = rxShiftBuf << 8 | in;
      nextByte = rxShiftBuf >> f.rxBitOffset;
!     ((uint8_t *COUNT(sizeof(message_t)))rxBufPtr)[count++] = nextByte;
  
      // Adjust rxLength to correspond to the corresponding offset in message_t
***************
*** 654,658 ****
    command void* Packet.getPayload(message_t *msg, uint8_t len) {
      if (len <= TOSH_DATA_LENGTH) {
!       return (void*)msg->data;
      }
      else {
--- 654,658 ----
    command void* Packet.getPayload(message_t *msg, uint8_t len) {
      if (len <= TOSH_DATA_LENGTH) {
!       return (void* COUNT_NOK(len))msg->data;
      }
      else {