[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/Drip Drip.h, 1.5, 1.6 DripM.nc, 1.17, 1.18

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27083/Drip

Modified Files:
	Drip.h DripM.nc 
Log Message:
XSM-Related Modifications

* Initial response only occurs after power-on or external reset, not
after network reprogramming
* Initial response now occurs before other components are initialized
* Drip can be put to sleep, preventing all upcalls except for the
wakeup message
* Bootloader will start the XSM grenade timer
* Bootloader has a check to ensure that the factory image has been completely
copied before executing it
* XSM Serial ID is now returned
* Lots of testing has been done on a single XSM node.



Index: Drip.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip/Drip.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Drip.h	23 Aug 2004 23:19:48 -0000	1.5
--- Drip.h	6 Sep 2004 21:51:25 -0000	1.6
***************
*** 44,47 ****
--- 44,48 ----
  
  #include "AM.h"
+ #include <PowerMgmt.h>
  
  enum {
***************
*** 63,66 ****
--- 64,72 ----
  } DripMsg;
  
+ enum {
+   DRIP_WAKEUPID = AM_POWERMGMTCMDMSG,
+ };
+ 
  #endif
  
+ 

Index: DripM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip/DripM.nc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DripM.nc	24 Aug 2004 23:34:48 -0000	1.17
--- DripM.nc	6 Sep 2004 21:51:25 -0000	1.18
***************
*** 59,62 ****
--- 59,63 ----
  */
    bool msgBufBusy = FALSE;
+   bool dripStarted = FALSE;
  
    uint8_t sendEntry;
***************
*** 154,157 ****
--- 155,159 ----
    
    command result_t StdControl.start() {
+     dripStarted = TRUE;
      call SendTimer.start(TIMER_ONE_SHOT, call Random.rand() % TIMER_PERIOD);
      return call SubControl.start();
***************
*** 159,162 ****
--- 161,165 ----
    
    command result_t StdControl.stop() {
+     dripStarted = FALSE;
      call SendTimer.stop();
      return SUCCESS;
***************
*** 350,357 ****
      DripCacheEntry *dripEntry = 
        findEntry(dripMsg->metadata.id);
! 
      dbg(DBG_USR1, "Received msg(id=%d, seqno=%d)\n",
  	dripMsg->metadata.id, dripMsg->metadata.seqno);
      
      if (dripEntry == NULL)
        return pMsg;
--- 353,363 ----
      DripCacheEntry *dripEntry = 
        findEntry(dripMsg->metadata.id);
!     
      dbg(DBG_USR1, "Received msg(id=%d, seqno=%d)\n",
  	dripMsg->metadata.id, dripMsg->metadata.seqno);
      
+     if (dripStarted == FALSE && dripMsg->metadata.id != DRIP_WAKEUPID)
+       return pMsg;
+ 
      if (dripEntry == NULL)
        return pMsg;