[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420/interfaces CC2420Fifo.nc, 1.1, 1.2 CC2420PacketBody.nc, 1.1, 1.2 CC2420Ram.nc, 1.1, 1.2 CC2420Receive.nc, 1.2, 1.3 CC2420Transmit.nc, 1.1, 1.2 RadioBackoff.nc, 1.1, 1.2

[John Regehr]

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

Modified Files:
	CC2420Fifo.nc CC2420PacketBody.nc CC2420Ram.nc 
	CC2420Receive.nc CC2420Transmit.nc RadioBackoff.nc 
Log Message:
safe tinyos annotations

Index: CC2420Fifo.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/interfaces/CC2420Fifo.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420Fifo.nc	4 Jul 2007 00:37:14 -0000	1.1
--- CC2420Fifo.nc	3 Jun 2008 04:43:03 -0000	1.2
***************
*** 49,53 ****
     * of the SPI transaction.
     */
!   async command cc2420_status_t beginRead( uint8_t* data, uint8_t length );
  
    /**
--- 49,53 ----
     * of the SPI transaction.
     */
!   async command cc2420_status_t beginRead( uint8_t* COUNT_NOK(length) data, uint8_t length );
  
    /**
***************
*** 60,64 ****
     * @return SUCCESS always.
     */
!   async command error_t continueRead( uint8_t* data, uint8_t length );
  
    /**
--- 60,64 ----
     * @return SUCCESS always.
     */
!   async command error_t continueRead( uint8_t* COUNT_NOK(length) data, uint8_t length );
  
    /**
***************
*** 69,73 ****
     * @param error notification of how the operation went
     */
!   async event void readDone( uint8_t* data, uint8_t length, error_t error );
  
    /**
--- 69,73 ----
     * @param error notification of how the operation went
     */
!   async event void readDone( uint8_t* COUNT_NOK(length) data, uint8_t length, error_t error );
  
    /**
***************
*** 80,84 ****
     * of the SPI transaction.
     */
!   async command cc2420_status_t write( uint8_t* data, uint8_t length );
  
    /**
--- 80,84 ----
     * of the SPI transaction.
     */
!   async command cc2420_status_t write( uint8_t* COUNT_NOK(length) data, uint8_t length );
  
    /**
***************
*** 89,93 ****
     * @param error notification of how the operation went
     */
!   async event void writeDone( uint8_t* data, uint8_t length, error_t error );
  
  }
--- 89,93 ----
     * @param error notification of how the operation went
     */
!   async event void writeDone( uint8_t* COUNT_NOK(length) data, uint8_t length, error_t error );
  
  }

Index: CC2420PacketBody.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/interfaces/CC2420PacketBody.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420PacketBody.nc	4 Jul 2007 00:37:14 -0000	1.1
--- CC2420PacketBody.nc	3 Jun 2008 04:43:03 -0000	1.2
***************
*** 40,49 ****
     * @return pointer to the cc2420_header_t of the given message
     */
!   async command cc2420_header_t *getHeader(message_t *msg);
    
    /**
     * @return pointer to the cc2420_metadata_t of the given message
     */
!   async command cc2420_metadata_t *getMetadata(message_t *msg);
    
  }
--- 40,49 ----
     * @return pointer to the cc2420_header_t of the given message
     */
!   async command cc2420_header_t * ONE getHeader(message_t * ONE msg);
    
    /**
     * @return pointer to the cc2420_metadata_t of the given message
     */
!   async command cc2420_metadata_t * ONE getMetadata(message_t * ONE msg);
    
  }

Index: CC2420Ram.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/interfaces/CC2420Ram.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420Ram.nc	4 Jul 2007 00:37:14 -0000	1.1
--- CC2420Ram.nc	3 Jun 2008 04:43:03 -0000	1.2
***************
*** 50,54 ****
     * of the SPI transaction.
     */
!   async command cc2420_status_t read( uint8_t offset, uint8_t* data, uint8_t length );
  
    /**
--- 50,54 ----
     * of the SPI transaction.
     */
!   async command cc2420_status_t read( uint8_t offset, uint8_t* COUNT_NOK(length) data, uint8_t length );
  
    /**
***************
*** 61,65 ****
     * of the SPI transaction.
     */
!   async command cc2420_status_t write( uint8_t offset, uint8_t* data, uint8_t length );
  
  }
--- 61,65 ----
     * of the SPI transaction.
     */
!   async command cc2420_status_t write( uint8_t offset, uint8_t* COUNT_NOK(length) data, uint8_t length );
  
  }

Index: CC2420Receive.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/interfaces/CC2420Receive.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC2420Receive.nc	13 May 2008 15:48:10 -0000	1.2
--- CC2420Receive.nc	3 Jun 2008 04:43:03 -0000	1.3
***************
*** 61,65 ****
     * @param message pointer to message received.
     */
!   async event void receive( uint8_t type, message_t* message );
  
  }
--- 61,65 ----
     * @param message pointer to message received.
     */
!   async event void receive( uint8_t type, message_t* ONE_NOK message );
  
  }

Index: CC2420Transmit.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/interfaces/CC2420Transmit.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420Transmit.nc	4 Jul 2007 00:37:14 -0000	1.1
--- CC2420Transmit.nc	3 Jun 2008 04:43:03 -0000	1.2
***************
*** 49,53 ****
     * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
!   async command error_t send( message_t* p_msg, bool useCca );
  
    /**
--- 49,53 ----
     * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
!   async command error_t send( message_t* ONE p_msg, bool useCca );
  
    /**
***************
*** 71,75 ****
     * @param error notifaction of how the operation went.
     */
!   async event void sendDone( message_t* p_msg, error_t error );
  
    /**
--- 71,75 ----
     * @param error notifaction of how the operation went.
     */
!   async event void sendDone( message_t* ONE_NOK p_msg, error_t error );
  
    /**
***************
*** 82,86 ****
     * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
!   async command error_t modify( uint8_t offset, uint8_t* buf, uint8_t len );
  
  }
--- 82,86 ----
     * @return SUCCESS if the request was accepted, FAIL otherwise.
     */
!   async command error_t modify( uint8_t offset, uint8_t* COUNT_NOK(len) buf, uint8_t len );
  
  }

Index: RadioBackoff.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/interfaces/RadioBackoff.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioBackoff.nc	4 Jul 2007 00:37:15 -0000	1.1
--- RadioBackoff.nc	3 Jun 2008 04:43:03 -0000	1.2
***************
*** 79,83 ****
     * @param msg pointer to the message being sent
     */
!   async event void requestInitialBackoff(message_t *msg);
    
    /**
--- 79,83 ----
     * @param msg pointer to the message being sent
     */
!   async event void requestInitialBackoff(message_t * ONE msg);
    
    /**
***************
*** 86,90 ****
     * @param msg pointer to the message being sent
     */
!   async event void requestCongestionBackoff(message_t *msg);
    
    /**
--- 86,90 ----
     * @param msg pointer to the message being sent
     */
!   async event void requestCongestionBackoff(message_t * ONE msg);
    
    /**
***************
*** 93,97 ****
     * @param msg pointer to the message being sent
     */
!   async event void requestCca(message_t *msg);
  }
  
--- 93,97 ----
     * @param msg pointer to the message being sent
     */
!   async event void requestCca(message_t * ONE msg);
  }