[Tinyos-2-commits] CVS: tinyos-2.x/tos/interfaces AMSend.nc, 1.4, 1.5 Packet.nc, 1.4, 1.5 Receive.nc, 1.4, 1.5 Send.nc, 1.4, 1.5

[Phil Levis]

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

Modified Files:
	AMSend.nc Packet.nc Receive.nc Send.nc 
Log Message:
The big interface switchover for Packet, Send, Receive, and AMSend.


Index: AMSend.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/AMSend.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AMSend.nc	12 Dec 2006 18:23:14 -0000	1.4
--- AMSend.nc	13 Sep 2007 23:10:17 -0000	1.5
***************
*** 115,121 ****
     /**
      * Return a pointer to a protocol's payload region in a packet.
!     * The length of this region is maxPayloadLength(). This command
!     * behaves similarly to <tt>Packet.getPayload</tt> (minus the
!     * length parameter) and is included in this interface
      * as a convenience.
      *
--- 115,120 ----
     /**
      * Return a pointer to a protocol's payload region in a packet.
!     * This command behaves identically to <tt>Packet.getPayload</tt>
!     * (minus the length parameter) and is included in this interface
      * as a convenience.
      *
***************
*** 123,127 ****
      * @return        the payload of the packet
      */
!   command void* getPayload(message_t* msg);
  
    
--- 122,126 ----
      * @return        the payload of the packet
      */
!   command void* getPayload(message_t* msg, uint8_t len);
  
    

Index: Packet.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/Packet.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Packet.nc	12 Dec 2006 18:23:14 -0000	1.4
--- Packet.nc	13 Sep 2007 23:10:17 -0000	1.5
***************
*** 96,110 ****
  
   /**
!    * Return a pointer to a protocol's payload region in a packet.  If
!    * len is not NULL, getPayload will return the length of the payload
!    * in it, which is the same as the return value from
!    * payloadLength(). If a protocol does not support variable length
!    * packets, then *len is equal to maxPayloadLength().
     *
     * @param msg   the packet
!    * @param len   pointer to where the current payload length should be stored.
     * @return      a pointer to the packet's data payload for this layer
     */
!   command void* getPayload(message_t* msg, uint8_t* len);
  
  }
--- 96,108 ----
  
   /**
!    * Return a pointer to a protocol's payload region in a packet which
!    * at least a certain length.  If the payload region is smaller than
!    * the len parameter, then getPayload returns NULL.
     *
     * @param msg   the packet
!    * @param len   the length of payload required
     * @return      a pointer to the packet's data payload for this layer
     */
!   command void* getPayload(message_t* msg, uint8_t len);
  
  }

Index: Receive.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/Receive.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Receive.nc	12 Dec 2006 18:23:15 -0000	1.4
--- Receive.nc	13 Sep 2007 23:10:17 -0000	1.5
***************
*** 66,91 ****
    
    event message_t* receive(message_t* msg, void* payload, uint8_t len);
- 
-   /**
-    * Return point to a protocol's payload region in a packet.  If len
-    * is not NULL, getPayload will return the length of the payload in
-    * it. This call is identical to <TT>Packet.getPayload</TT>, and is
-    * included in Receive as a convenience.
-    *
-    * @param  msg      the packet
-    * @param  len      a pointer to where to store the payload length
-    * @return          a pointer to the payload of the packet
-    */
-   command void* getPayload(message_t* msg, uint8_t* len);
- 
-   /**
-    * Return the length of the payload of msg. This call is identical
-    * to <TT>Packet.payloadLength</TT>, and is included in Receive as a
-    * convenience.
-    *
-    * @param  msg      the packet
-    * @return          the length of the packet's payload
-    */
-   command uint8_t payloadLength(message_t* msg);
    
  }
--- 66,69 ----

Index: Send.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/Send.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Send.nc	12 Dec 2006 18:23:15 -0000	1.4
--- Send.nc	13 Sep 2007 23:10:17 -0000	1.5
***************
*** 103,116 ****
  
     /**
!     * Return a pointer to a protocol's payload region in a packet.
!     * The length of this region is maxPayloadLength(). This command
!     * behaves similarly to <tt>Packet.getPayload</tt> (minus the
!     * length parameter) and is included in this interface
!     * as a convenience.
      *
      * @param   msg    the packet
      * @return         a pointer to the packet's payload
      */
!   command void* getPayload(message_t* msg);
  
  }
--- 103,116 ----
  
     /**
!     * Return a pointer to a protocol's payload region in a packet which
!     * at least a certain length.  If the payload region is smaller than
!     * the len parameter, then getPayload returns NULL. This command
!     * behaves identicallt to <tt>Packet.getPayload</tt> and is
!     * included in this interface as a convenience.
      *
      * @param   msg    the packet
      * @return         a pointer to the packet's payload
      */
!   command void* getPayload(message_t* msg, uint8_t len);
  
  }