[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/TestDeluge/GoldenImage GoldenImage.nc, 1.1, 1.2 GoldenImageM.nc, 1.1, 1.2

[Jonathan Hui]

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

Modified Files:
	GoldenImage.nc GoldenImageM.nc 
Log Message:
- Don't start Deluge until after GoldenImage is written.



Index: GoldenImage.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/TestDeluge/GoldenImage/GoldenImage.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GoldenImage.nc	17 Jan 2005 19:34:42 -0000	1.1
--- GoldenImage.nc	20 Jan 2005 21:30:37 -0000	1.2
***************
*** 46,56 ****
      NetProgC;
  
-   Main.StdControl -> DelugeC;
    Main.StdControl -> GoldenImageM;
  
    GoldenImageM.DataWrite -> Storage.DataWrite[unique("DelugeDataWrite")];
    GoldenImageM.FlashWP -> FlashWPC;
    GoldenImageM.Metadata -> Metadata.Metadata[unique("DelugeMetadata")];
-   GoldenImageM.MetadataControl -> Metadata;
    GoldenImageM.IFlash -> IFlash;
    GoldenImageM.Leds -> LedsC;
--- 46,58 ----
      NetProgC;
  
    Main.StdControl -> GoldenImageM;
+   Main.StdControl -> Storage;
+ 
+   GoldenImageM.DelugeControl -> DelugeC;
+   GoldenImageM.MetadataControl -> Metadata;
  
    GoldenImageM.DataWrite -> Storage.DataWrite[unique("DelugeDataWrite")];
    GoldenImageM.FlashWP -> FlashWPC;
    GoldenImageM.Metadata -> Metadata.Metadata[unique("DelugeMetadata")];
    GoldenImageM.IFlash -> IFlash;
    GoldenImageM.Leds -> LedsC;

Index: GoldenImageM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/TestDeluge/GoldenImage/GoldenImageM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GoldenImageM.nc	17 Jan 2005 19:34:45 -0000	1.1
--- GoldenImageM.nc	20 Jan 2005 21:30:38 -0000	1.2
***************
*** 39,42 ****
--- 39,43 ----
      interface NetProg;
      interface SplitControl as MetadataControl;
+     interface StdControl as DelugeControl;
    }
  }
***************
*** 132,137 ****
    }
  
!   command result_t StdControl.init() { return SUCCESS; }
!   command result_t StdControl.start() { return SUCCESS; }
    command result_t StdControl.stop() { return SUCCESS; }
  
--- 133,138 ----
    }
  
!   command result_t StdControl.init() { return call DelugeControl.init(); }
!   command result_t StdControl.start() { return call MetadataControl.start(); }
    command result_t StdControl.stop() { return SUCCESS; }
  
***************
*** 164,168 ****
      // don't clone to flash if golden image has been loaded
      if (!(isGoldenImgLoaded & TOSBOOT_GOLDEN_IMG_LOADED))
!       return SUCCESS;
      
      // haven't cloned to flash before
--- 165,169 ----
      // don't clone to flash if golden image has been loaded
      if (!(isGoldenImgLoaded & TOSBOOT_GOLDEN_IMG_LOADED))
!       return call DelugeControl.start();
      
      // haven't cloned to flash before