[Tinyos-commits] CVS: tinyos-1.x/tos/lib/TinyDB TupleRouter.nc, 1.27, 1.28 TupleRouterM.nc, 1.58, 1.59

[Sam Madden]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/TinyDB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10478

Modified Files:
	TupleRouter.nc TupleRouterM.nc 
Log Message:
support for CRICKET platform


Index: TupleRouter.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/TinyDB/TupleRouter.nc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** TupleRouter.nc	12 Apr 2004 16:51:32 -0000	1.27
--- TupleRouter.nc	14 Aug 2005 19:37:59 -0000	1.28
***************
*** 74,78 ****
      DBBufferC, TinyDBCommand, Attr, ExprEvalC, Command, TableM, 
      ServiceSchedulerC, HPLPowerManagementM, SimpleTimeM, TimerC
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)
      , CC1000RadioIntM as Radio
  #endif
--- 74,78 ----
      DBBufferC, TinyDBCommand, Attr, ExprEvalC, Command, TableM, 
      ServiceSchedulerC, HPLPowerManagementM, SimpleTimeM, TimerC
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) || defined(PLATFORM_CRICKET)
      , CC1000RadioIntM as Radio
  #endif
***************
*** 242,246 ****
    ServiceSchedulerC.StdControl[kTINYDB_SERVICE_ID] -> TupleRouterM.StdControl;
  
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)
    TupleRouterM.RadioSendCoordinator->Radio.RadioSendCoordinator;
    TupleRouterM.RadioReceiveCoordinator->Radio.RadioReceiveCoordinator;
--- 242,246 ----
    ServiceSchedulerC.StdControl[kTINYDB_SERVICE_ID] -> TupleRouterM.StdControl;
  
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)  || defined(PLATFORM_CRICKET)
    TupleRouterM.RadioSendCoordinator->Radio.RadioSendCoordinator;
    TupleRouterM.RadioReceiveCoordinator->Radio.RadioReceiveCoordinator;

Index: TupleRouterM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/TinyDB/TupleRouterM.nc,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** TupleRouterM.nc	24 Jan 2005 17:20:22 -0000	1.58
--- TupleRouterM.nc	14 Aug 2005 19:37:59 -0000	1.59
***************
*** 167,171 ****
      interface ServiceScheduler;
      command TinyDBError addResults(QueryResult *qr, ParsedQuery *q, Expr *e);
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)
      interface RadioCoordinator as RadioSendCoordinator;
      interface RadioCoordinator as RadioReceiveCoordinator;
--- 167,171 ----
      interface ServiceScheduler;
      command TinyDBError addResults(QueryResult *qr, ParsedQuery *q, Expr *e);
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) || defined(PLATFORM_CRICKET)
      interface RadioCoordinator as RadioSendCoordinator;
      interface RadioCoordinator as RadioReceiveCoordinator;
***************
*** 612,616 ****
  
  #ifdef USE_LOW_POWER_LISTENING
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)
      if (!isRoot())
        call PowerMgmtEnable();
--- 612,616 ----
  
  #ifdef USE_LOW_POWER_LISTENING
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) || defined(PLATFORM_CRICKET)
      if (!isRoot())
        call PowerMgmtEnable();
***************
*** 709,713 ****
  
  #ifndef USE_LOW_POWER_LISTENING
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)
        call PowerMgmtDisable();
  #endif
--- 709,713 ----
  
  #ifndef USE_LOW_POWER_LISTENING
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) || defined(PLATFORM_CRICKET)
        call PowerMgmtDisable();
  #endif
***************
*** 770,774 ****
  	{
  #ifndef USE_LOW_POWER_LISTENING
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)
  	  call PowerMgmtEnable();
  #endif
--- 770,774 ----
  	{
  #ifndef USE_LOW_POWER_LISTENING
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) || defined(PLATFORM_CRICKET)
  	  call PowerMgmtEnable();
  #endif
***************
*** 4012,4016 ****
    }
  
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)
    //this event indicates that the start symbol has been detected
    async event void RadioReceiveCoordinator.startSymbol(uint8_t bitsPerBlock, uint8_t offset, TOS_MsgPtr msgBuff) {
--- 4012,4016 ----
    }
  
! #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) || defined(PLATFORM_CRICKET)
    //this event indicates that the start symbol has been detected
    async event void RadioReceiveCoordinator.startSymbol(uint8_t bitsPerBlock, uint8_t offset, TOS_MsgPtr msgBuff) {