[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge DelugeMetadataC.nc, 1.2, 1.3 DelugeMetadataM.nc, 1.3, 1.4

[Jonathan Hui]

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

Modified Files:
	DelugeMetadataC.nc DelugeMetadataM.nc 
Log Message:
- Adding back trick of waiting for the radio to start up before
starting initialization phase of Deluge. Plays nicer with radio since
they share the same bus on telos and makes it less likely of causing
radio init to fail.



Index: DelugeMetadataC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadataC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelugeMetadataC.nc	26 Nov 2004 18:59:10 -0000	1.2
--- DelugeMetadataC.nc	27 Nov 2004 17:36:41 -0000	1.3
***************
*** 45,48 ****
--- 45,53 ----
      DelugeStorageC as Storage;
  
+ #ifdef PLATFORM_TELOSB
+   components CC2420RadioC as RadioControl;
+   DelugeMetadataM.RadioControl -> RadioControl;
+ #endif
+ 
    SplitControl = DelugeMetadataM;
    Metadata = DelugeMetadataM;

Index: DelugeMetadataM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadataM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DelugeMetadataM.nc	26 Nov 2004 18:59:10 -0000	1.3
--- DelugeMetadataM.nc	27 Nov 2004 17:36:41 -0000	1.4
***************
*** 40,43 ****
--- 40,46 ----
      interface DelugeMetadataWrite as MetadataWrite;
      interface StdControl as SubControl;
+ #ifdef PLATFORM_TELOSB
+     interface SplitControl as RadioControl;
+ #endif
    }
  }
***************
*** 108,113 ****
    }
  
!   command result_t SplitControl.start() {
! 
      result_t result;
  
--- 111,115 ----
    }
  
!   result_t realStart() {
      result_t result;
  
***************
*** 120,124 ****
--- 122,132 ----
  
      return SUCCESS;
+   }
  
+   command result_t SplitControl.start() {
+ #ifndef PLATFORM_TELOSB
+     return realStart();
+ #endif
+     return SUCCESS;
    }
  
***************
*** 127,130 ****
--- 135,146 ----
    }
  
+ #ifdef PLATFORM_TELOSB
+   event result_t RadioControl.initDone() { return SUCCESS; }
+   event result_t RadioControl.startDone() {
+     return realStart();
+   }
+   event result_t RadioControl.stopDone() { return SUCCESS; }
+ #endif
+ 
    command bool Metadata.isImgDescValid[uint8_t id](DelugeImgDesc* tmpImgDesc) {