[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/ctp CompareBit.nc, 1.1, 1.2 CtpForwardingEngine.h, 1.3, 1.4 CtpForwardingEngineP.nc, 1.12, 1.13 CtpRoutingEngineP.nc, 1.14, 1.15 CtpRoutingPacket.nc, 1.4, 1.5

[John Regehr]

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

Modified Files:
	CompareBit.nc CtpForwardingEngine.h CtpForwardingEngineP.nc 
	CtpRoutingEngineP.nc CtpRoutingPacket.nc 
Log Message:
safe tinyos annotations

Index: CompareBit.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CompareBit.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareBit.nc	5 Dec 2007 22:29:55 -0000	1.1
--- CompareBit.nc	4 Jun 2008 04:30:41 -0000	1.2
***************
*** 39,42 ****
  
    /* should the source of this message be inserted into the neighbor table? */
!    event bool shouldInsert(message_t *msg, void* payload, uint8_t len, bool white_bit);
  }
--- 39,42 ----
  
    /* should the source of this message be inserted into the neighbor table? */
!    event bool shouldInsert(message_t * ONE msg, void* COUNT_NOK(len) payload, uint8_t len, bool white_bit);
  }

Index: CtpForwardingEngine.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpForwardingEngine.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CtpForwardingEngine.h	27 May 2008 17:31:47 -0000	1.3
--- CtpForwardingEngine.h	4 Jun 2008 04:30:41 -0000	1.4
***************
*** 111,115 ****
   */
  typedef struct {
!   message_t *msg;
    uint8_t client;
    uint8_t retries;
--- 111,115 ----
   */
  typedef struct {
!   message_t * ONE_NOK msg;
    uint8_t client;
    uint8_t retries;

Index: CtpForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpForwardingEngineP.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CtpForwardingEngineP.nc	28 Apr 2008 04:28:36 -0000	1.12
--- CtpForwardingEngineP.nc	4 Jun 2008 04:30:41 -0000	1.13
***************
*** 221,225 ****
  
    fe_queue_entry_t clientEntries[CLIENT_COUNT];
!   fe_queue_entry_t* clientPtrs[CLIENT_COUNT];
  
    /* The loopback message is for when a collection roots calls
--- 221,225 ----
  
    fe_queue_entry_t clientEntries[CLIENT_COUNT];
!   fe_queue_entry_t* ONE_NOK clientPtrs[CLIENT_COUNT];
  
    /* The loopback message is for when a collection roots calls
***************
*** 230,234 ****
       
    message_t loopbackMsg;
!   message_t* loopbackMsgPtr;
  
    command error_t Init.init() {
--- 230,234 ----
       
    message_t loopbackMsg;
!   message_t* ONE_NOK loopbackMsgPtr;
  
    command error_t Init.init() {
***************
*** 643,647 ****
     * put it on the send queue.
     */
!   message_t* forward(message_t* m) {
      if (call MessagePool.empty()) {
        dbg("Route", "%s cannot forward, message pool empty.\n", __FUNCTION__);
--- 643,647 ----
     * put it on the send queue.
     */
!   message_t* ONE forward(message_t* ONE m) {
      if (call MessagePool.empty()) {
        dbg("Route", "%s cannot forward, message pool empty.\n", __FUNCTION__);

Index: CtpRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpRoutingEngineP.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CtpRoutingEngineP.nc	28 Apr 2008 04:28:36 -0000	1.14
--- CtpRoutingEngineP.nc	4 Jun 2008 04:30:41 -0000	1.15
***************
*** 454,458 ****
  
  
!     ctp_routing_header_t* getHeader(message_t* m) {
        return (ctp_routing_header_t*)call BeaconSend.getPayload(m, call BeaconSend.maxPayloadLength());
      }
--- 454,458 ----
  
  
!     ctp_routing_header_t* getHeader(message_t* ONE m) {
        return (ctp_routing_header_t*)call BeaconSend.getPayload(m, call BeaconSend.maxPayloadLength());
      }

Index: CtpRoutingPacket.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/CtpRoutingPacket.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CtpRoutingPacket.nc	12 Dec 2006 18:23:29 -0000	1.4
--- CtpRoutingPacket.nc	4 Jun 2008 04:30:41 -0000	1.5
***************
*** 44,58 ****
  
    /* Allow individual options to be read, set, and reset independently */
!   command bool          getOption(message_t* msg, ctp_options_t opt);
!   command void          setOption(message_t* msg, ctp_options_t opt);
!   command void          clearOption(message_t* msg, ctp_options_t opt);
    
    /* Clear all options */
!   command void          clearOptions(message_t* msg);
  
!   command am_addr_t     getParent(message_t* msg);
!   command void          setParent(message_t* msg, am_addr_t addr);
  
!   command uint16_t      getEtx(message_t* msg);
!   command void          setEtx(message_t* msg, uint8_t etx);
  }
--- 44,58 ----
  
    /* Allow individual options to be read, set, and reset independently */
!   command bool          getOption(message_t* ONE msg, ctp_options_t opt);
!   command void          setOption(message_t* ONE msg, ctp_options_t opt);
!   command void          clearOption(message_t* ONE msg, ctp_options_t opt);
    
    /* Clear all options */
!   command void          clearOptions(message_t* ONE msg);
  
!   command am_addr_t     getParent(message_t* ONE msg);
!   command void          setParent(message_t* ONE msg, am_addr_t addr);
  
!   command uint16_t      getEtx(message_t* ONE msg);
!   command void          setEtx(message_t* ONE msg, uint8_t etx);
  }