[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420/lpl DefaultLplP.nc, 1.4, 1.5

[dmm]

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

Modified Files:
	DefaultLplP.nc 
Log Message:
* Removed hardware address recognition to monitor its affect on unit tests, low power listening reliability, and ack reliability in general.
* Implemented software-based address recognition in ReceiveP.
* Applied Steve Dawson-Haggerty's patch to make the RadioBackoff interface parameterized by AM ID only at the top of the stack, whiich allows stack modifications that do not support AM ID's to exist below the active message layer.

Index: DefaultLplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/lpl/DefaultLplP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultLplP.nc	13 Sep 2007 23:10:16 -0000	1.4
--- DefaultLplP.nc	14 May 2008 21:33:07 -0000	1.5
***************
*** 55,59 ****
      interface Send as SubSend;
      interface CC2420Transmit as Resend;
!     interface RadioBackoff[am_id_t amId];
      interface Receive as SubReceive;
      interface AMPacket;
--- 55,59 ----
      interface Send as SubSend;
      interface CC2420Transmit as Resend;
!     interface RadioBackoff;
      interface Receive as SubReceive;
      interface AMPacket;
***************
*** 284,288 ****
      }
      
!     return FAIL;
    }
  
--- 284,288 ----
      }
      
!     return EBUSY;
    }
  
***************
*** 309,329 ****
    
    /***************** RadioBackoff Events ****************/
!   async event void RadioBackoff.requestInitialBackoff[am_id_t amId](message_t *msg) {
      if((call CC2420PacketBody.getMetadata(msg))->rxInterval 
          > ONE_MESSAGE) {
!       call RadioBackoff.setInitialBackoff[amId]( call Random.rand16() 
            % (0x4 * CC2420_BACKOFF_PERIOD) + CC2420_MIN_BACKOFF);
      }
    }
    
!   async event void RadioBackoff.requestCongestionBackoff[am_id_t amId](message_t *msg) {
      if((call CC2420PacketBody.getMetadata(msg))->rxInterval 
          > ONE_MESSAGE) {
!       call RadioBackoff.setCongestionBackoff[amId]( call Random.rand16() 
            % (0x3 * CC2420_BACKOFF_PERIOD) + CC2420_MIN_BACKOFF);
      }
    }
    
!   async event void RadioBackoff.requestCca[am_id_t amId](message_t *msg) {
    }
    
--- 309,329 ----
    
    /***************** RadioBackoff Events ****************/
!   async event void RadioBackoff.requestInitialBackoff(message_t *msg) {
      if((call CC2420PacketBody.getMetadata(msg))->rxInterval 
          > ONE_MESSAGE) {
!       call RadioBackoff.setInitialBackoff( call Random.rand16() 
            % (0x4 * CC2420_BACKOFF_PERIOD) + CC2420_MIN_BACKOFF);
      }
    }
    
!   async event void RadioBackoff.requestCongestionBackoff(message_t *msg) {
      if((call CC2420PacketBody.getMetadata(msg))->rxInterval 
          > ONE_MESSAGE) {
!       call RadioBackoff.setCongestionBackoff( call Random.rand16() 
            % (0x3 * CC2420_BACKOFF_PERIOD) + CC2420_MIN_BACKOFF);
      }
    }
    
!   async event void RadioBackoff.requestCca(message_t *msg) {
    }