[Tinyos-commits] CVS: tinyos-1.x/tos/lib/CC2420Radio CC2420RadioM.nc, 1.40, 1.41

[Joe Polastre]

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

Modified Files:
	CC2420RadioM.nc 
Log Message:
if we put starting the radio from StdControl in a task, then it
delays executing until the other "start" functions are done.
the bug occurs when other components use the underlying bus in their
start() functions.  since the radio is split phase, it acquires
the bus during SplitControl.start() but doesn't release it until
SplitControl.startDone() causing other components' start() command
to fail.  Ideally, Main would be changed to
understand SplitControl and run each SplitControl serially.


Index: CC2420RadioM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/CC2420Radio/CC2420RadioM.nc,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** CC2420RadioM.nc	26 Jul 2005 18:07:15 -0000	1.40
--- CC2420RadioM.nc	15 Aug 2005 17:51:45 -0000	1.41
***************
*** 236,242 ****
    }
  
    // This interface is depricated, please use SplitControl instead
    command result_t StdControl.start() {
!     return call SplitControl.start();
    }
  
--- 236,253 ----
    }
  
+   task void startRadio() {
+     call SplitControl.start();
+   }
+ 
    // This interface is depricated, please use SplitControl instead
    command result_t StdControl.start() {
!     // if we put starting the radio from StdControl in a task, then it
!     // delays executing until the other "start" functions are done.
!     // the bug occurs when other components use the underlying bus in their
!     // start() functions.  since the radio is split phase, it acquires
!     // the bus during SplitControl.start() but doesn't release it until
!     // SplitControl.startDone().  Ideally, Main would be changed to
!     // understand SplitControl and run each SplitControl serially.
!     return post startRadio();
    }