[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/mac/tkn154/interfaces/public IEEE154Frame.nc, 1.1, 1.2 IEEE154TxBeaconPayload.nc, 1.1, 1.2

Tue Nov 25 01:35:11 PST 2008

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/interfaces/public
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21632/tos/lib/mac/tkn154/interfaces/public

Modified Files:
	IEEE154Frame.nc IEEE154TxBeaconPayload.nc 
Log Message:
+ modified radio driver (PHY) interfaces: CSMA-CA algorithm is now pushed to radio driver
+ adapted CC2420 driver
+ renamed CsmaP -> FrameDispatchP
+ provided workaround for a problem with virtualized alarms (sometimes they seem to fire 2s too late)
+ updated placeholder components
+ updated debug information

Index: IEEE154Frame.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/interfaces/public/IEEE154Frame.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IEEE154Frame.nc	16 Jun 2008 18:00:34 -0000	1.1
--- IEEE154Frame.nc	25 Nov 2008 09:35:09 -0000	1.2
***************
*** 116,123 ****
     * Sets the addressing fields in the MAC header of a frame. The source 
     * PAN identifier and the source address will be set automatically, their
!    * values depend on the <code>SrcAddrMode</code> parameter: if 
!    * <code>SrcAddrMode</code> is a short or extended address, then
!    * the current PIB attributes <code>macShortAddress</code> or 
!    * <code>aExtendedAddress</code> and <code>macPANId</code> are used.
     *
     * @param frame         the frame
--- 116,123 ----
     * Sets the addressing fields in the MAC header of a frame. The source 
     * PAN identifier and the source address will be set automatically, their
!    * values depend on the <tt>SrcAddrMode</tt> parameter: if 
!    * <tt>SrcAddrMode</tt> is a short or extended address, then
!    * the current PIB attributes <tt>macShortAddress</tt> or 
!    * <tt>aExtendedAddress</tt> and <tt>macPANId</tt> are used.
     *
     * @param frame         the frame
***************
*** 158,162 ****
   /**
     * Returns the point in time when the frame was received. If 
!    * <code>isTimestampValid()<\code> returns FALSE then the 
     * timestamp is not valid and must be ignored.
     *
--- 158,162 ----
   /**
     * Returns the point in time when the frame was received. If 
!    * <tt>isTimestampValid()<\tt> returns FALSE then the 
     * timestamp is not valid and must be ignored.
     *
***************
*** 193,197 ****
      * BEACON=0, DATA=1, ACK=2, COMMAND=3.
      *
!     * Note: For beacon frames one can use the <code>IEEE154BeaconFrame<\code>
      * interface to inspect additional fields of the frame.
      *
--- 193,197 ----
      * BEACON=0, DATA=1, ACK=2, COMMAND=3.
      *
!     * Note: For beacon frames one can use the <tt>IEEE154BeaconFrame<\tt>
      * interface to inspect additional fields of the frame.
      *
***************
*** 234,239 ****
      * (except CRC check) was applied. Note: if this command returns
      * FALSE, then all other commands in this interface (except
!     * <code>wasPromiscuousModeEnabled()</code>) and the 
!     * <code>IEEE154BeaconFrame</code> interface return undefined values!
      *
      * @param  frame   the frame
--- 234,239 ----
      * (except CRC check) was applied. Note: if this command returns
      * FALSE, then all other commands in this interface (except
!     * <tt>wasPromiscuousModeEnabled()</tt>) and the 
!     * <tt>IEEE154BeaconFrame</tt> interface return undefined values!
      *
      * @param  frame   the frame

Index: IEEE154TxBeaconPayload.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/interfaces/public/IEEE154TxBeaconPayload.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IEEE154TxBeaconPayload.nc	16 Jun 2008 18:00:34 -0000	1.1
--- IEEE154TxBeaconPayload.nc	25 Nov 2008 09:35:09 -0000	1.2
***************
*** 43,48 ****
     * This command replaces the MLME-SET command for the PIB attribute values
     * 0x45 (macBeaconPayload) and 0x46 (macBeaconPayloadLength). The
!    * <code>setBeaconPayloadDone()<\code> event will be signalled when the 
!    * beacon payload has been set -- until then <code>beaconPayload<\code> must 
     * not be modified.
     *
--- 43,48 ----
     * This command replaces the MLME-SET command for the PIB attribute values
     * 0x45 (macBeaconPayload) and 0x46 (macBeaconPayloadLength). The
!    * <tt>setBeaconPayloadDone()<\tt> event will be signalled when the 
!    * beacon payload has been set -- until then <tt>beaconPayload<\tt> must 
     * not be modified.
     *
***************
*** 51,55 ****
     *
     * @return EBUSY if another transaction is pending, ESIZE if length is too big, 
!    * SUCCESS otherwise (and only then the <code>setBeaconPayloadDone<\code> event 
     * will be signalled)
     */
--- 51,55 ----
     *
     * @return EBUSY if another transaction is pending, ESIZE if length is too big, 
!    * SUCCESS otherwise (and only then the <tt>setBeaconPayloadDone<\tt> event 
     * will be signalled)
     */
***************
*** 57,68 ****
  
    /**
!    * Signalled in response to a <code>setBeaconPayload()<\code> request.
     * Indicates that the beacon payload has been copied and returns the
     * ownership of the buffer to the next higher layer. 
     * 
!    * @param beaconPayload   the <code>beaconPayload<\code> passed in the 
!    *                        <code>setBeaconPayload()<\code> command
!    * @param length          the <code>length<\code> passed in the 
!    *                        <code>setBeaconPayload()<\code> command
     */
   event void setBeaconPayloadDone(void *beaconPayload, uint8_t length);
--- 57,68 ----
  
    /**
!    * Signalled in response to a <tt>setBeaconPayload()<\tt> request.
     * Indicates that the beacon payload has been copied and returns the
     * ownership of the buffer to the next higher layer. 
     * 
!    * @param beaconPayload   the <tt>beaconPayload<\tt> passed in the 
!    *                        <tt>setBeaconPayload()<\tt> command
!    * @param length          the <tt>length<\tt> passed in the 
!    *                        <tt>setBeaconPayload()<\tt> command
     */
   event void setBeaconPayloadDone(void *beaconPayload, uint8_t length);
***************
*** 85,91 ****
     * Replaces (overwrites) a portion of the current beacon payload. Whenever
     * possible, to minimize overhead, the next higher layer should prefer this
!    * command over the <code>setBeaconPayload()<\code> command.  The
!    * <code>modifyBeaconPayloadDone()<\code> event will be signalled when the 
!    * beacon payload has been updated -- until then <code>buffer<\code> must 
     * not be modified.
     *
--- 85,91 ----
     * Replaces (overwrites) a portion of the current beacon payload. Whenever
     * possible, to minimize overhead, the next higher layer should prefer this
!    * command over the <tt>setBeaconPayload()<\tt> command.  The
!    * <tt>modifyBeaconPayloadDone()<\tt> event will be signalled when the 
!    * beacon payload has been updated -- until then <tt>buffer<\tt> must 
     * not be modified.
     *
***************
*** 95,99 ****
     *
     * @return EBUSY if another transaction is pending, ESIZE if offset+length is too big, 
!    * SUCCESS otherwise (and only then the <code>modifyBeaconPayloadDone<\code> event 
     * will be signalled)
     */
--- 95,99 ----
     *
     * @return EBUSY if another transaction is pending, ESIZE if offset+length is too big, 
!    * SUCCESS otherwise (and only then the <tt>modifyBeaconPayloadDone<\tt> event 
     * will be signalled)
     */
***************
*** 101,113 ****
  
    /**
!    * Signalled in response to a <code>modifyBeaconPayload()<\code> request.
     * Indicates that the beacon payload has been updated. 
     * 
!    * @param offset        the <code>offset<\code> passed in the 
!    *                      <code>modifyBeaconPayload()<\code> command
!    * @param buffer        the <code>buffer<\code> passed in the 
!    *                      <code>modifyBeaconPayload()<\code> command
!    * @param bufferLength  the <code>bufferLength<\code> passed in the 
!    *                      <code>modifyBeaconPayload()<\code> command
     */
   event void modifyBeaconPayloadDone(uint8_t offset, void *buffer, uint8_t bufferLength);
--- 101,113 ----
  
    /**
!    * Signalled in response to a <tt>modifyBeaconPayload()<\tt> request.
     * Indicates that the beacon payload has been updated. 
     * 
!    * @param offset        the <tt>offset<\tt> passed in the 
!    *                      <tt>modifyBeaconPayload()<\tt> command
!    * @param buffer        the <tt>buffer<\tt> passed in the 
!    *                      <tt>modifyBeaconPayload()<\tt> command
!    * @param bufferLength  the <tt>bufferLength<\tt> passed in the 
!    *                      <tt>modifyBeaconPayload()<\tt> command
     */
   event void modifyBeaconPayloadDone(uint8_t offset, void *buffer, uint8_t bufferLength);
***************
*** 118,122 ****
     *
     * The usual policy is that (1) this event is signalled before every beacon
!    * transmission, and (2) that a subsequent call to <code>setPayload<\code>
     * will update the beacon payload portion of this beacon.  However, 
     * because of tight timing constraints in beacon-enabled mode neither can be
--- 118,122 ----
     *
     * The usual policy is that (1) this event is signalled before every beacon
!    * transmission, and (2) that a subsequent call to <tt>setPayload<\tt>
     * will update the beacon payload portion of this beacon.  However, 
     * because of tight timing constraints in beacon-enabled mode neither can be
***************
*** 127,131 ****
    /** 
     * Indicates that a beacon frame has been transmitted (the 
!    * <code>getBeaconPayload<\code> command can be used to inspect the
     * beacon payload).
     */
--- 127,131 ----
    /** 
     * Indicates that a beacon frame has been transmitted (the 
!    * <tt>getBeaconPayload<\tt> command can be used to inspect the
     * beacon payload).
     */