[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/mac/tkn154/dummies NoPromiscuousModeP.nc, 1.3, 1.4

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/dummies
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19122/tos/lib/mac/tkn154/dummies

Modified Files:
	NoPromiscuousModeP.nc 
Log Message:
- bugfix: empty data frame sent in response to a datarequest (somtimes) had wrong header size
- updated signature of dummy component NoPromiscuousModeP

Index: NoPromiscuousModeP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/dummies/NoPromiscuousModeP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NoPromiscuousModeP.nc	24 Mar 2009 12:56:47 -0000	1.3
--- NoPromiscuousModeP.nc	4 Feb 2010 16:31:15 -0000	1.4
***************
*** 47,51 ****
      interface GetNow<token_requested_t> as IsRadioTokenRequested;
    } uses {
!     interface Resource as Token;
      interface RadioRx as PromiscuousRx;
      interface RadioOff;
--- 47,51 ----
      interface GetNow<token_requested_t> as IsRadioTokenRequested;
    } uses {
!     interface TransferableResource as RadioToken;
      interface RadioRx as PromiscuousRx;
      interface RadioOff;
***************
*** 64,72 ****
    command error_t PromiscuousMode.start() { return FAIL; }
  
!   event void Token.granted() { call Token.release(); }
  
!   async event void PromiscuousRx.prepareDone() { }
  
!   event message_t* PromiscuousRx.received(message_t *frame, ieee154_timestamp_t *timestamp) { return frame; }
  
    command error_t PromiscuousMode.stop() { return FAIL; }
--- 64,72 ----
    command error_t PromiscuousMode.start() { return FAIL; }
  
!   event void RadioToken.granted() { ASSERT(0);}
  
!   event message_t* PromiscuousRx.received(message_t *frame, const ieee154_timestamp_t *timestamp) { return frame; }
  
!   async event void PromiscuousRx.enableRxDone(){}
  
    command error_t PromiscuousMode.stop() { return FAIL; }
***************
*** 77,79 ****
--- 77,80 ----
    default event void PromiscuousMode.stopDone(error_t error){}
    async command token_requested_t IsRadioTokenRequested.getNow(){ return FALSE;}
+   async event void RadioToken.transferredFrom(uint8_t clientFrom){ASSERT(0);}
  }