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

[Jonathan Hui]

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

Modified Files:
	GoldenImage.nc GoldenImageM.nc 
Log Message:
- Match changes with new storage stack.



Index: GoldenImage.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/TestDeluge/GoldenImage/GoldenImage.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GoldenImage.nc	20 Jan 2005 21:30:37 -0000	1.2
--- GoldenImage.nc	11 Mar 2005 21:46:38 -0000	1.3
***************
*** 47,51 ****
  
    Main.StdControl -> GoldenImageM;
-   Main.StdControl -> Storage;
  
    GoldenImageM.DelugeControl -> DelugeC;
--- 47,50 ----

Index: GoldenImageM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/TestDeluge/GoldenImage/GoldenImageM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GoldenImageM.nc	9 Feb 2005 02:54:30 -0000	1.3
--- GoldenImageM.nc	11 Mar 2005 21:46:39 -0000	1.4
***************
*** 133,139 ****
    }
  
!   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; }
  
    event result_t MetadataControl.initDone() {
--- 133,151 ----
    }
  
!   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; 
!   }
! 
!   event void Storage.loadImagesDone(result_t result) {
!     ;
!   }
  
    event result_t MetadataControl.initDone() {
***************
*** 233,242 ****
    }
  
!   event result_t DataWrite.writeDone(result_t result) {
  
!     if (result == FAIL) {
        // something went wrong, try again
        post writeData();
!       return SUCCESS;
      }
  
--- 245,254 ----
    }
  
!   event void DataWrite.writeDone(storage_result_t result) {
  
!     if (result == STORAGE_FAIL) {
        // something went wrong, try again
        post writeData();
!       return;
      }
  
***************
*** 247,251 ****
        if (call FlashWP.setWP() == FAIL)
  	post setWP();
!       return SUCCESS;
      }
  
--- 259,263 ----
        if (call FlashWP.setWP() == FAIL)
  	post setWP();
!       return;
      }
  
***************
*** 255,273 ****
      post writeData();
  
-     return SUCCESS;
- 
    }
  
!   event result_t DataWrite.eraseDone(result_t result) { return SUCCESS; }
  
!   event result_t Metadata.setupNewImageDone(result_t result) {
      // start cloning
      call Metadata.receivedPage(DELUGE_GOLDEN_IMAGE_NUM, 0);
      fillBuf();
      post writeData();
-     return SUCCESS;
    }
  
!   event result_t Metadata.receivedPageDone(result_t result) { return SUCCESS; }
  
  }
--- 267,282 ----
      post writeData();
  
    }
  
!   event void DataWrite.eraseDone(result_t result) { ; }
  
!   event void Metadata.setupNewImageDone(result_t result) {
      // start cloning
      call Metadata.receivedPage(DELUGE_GOLDEN_IMAGE_NUM, 0);
      fillBuf();
      post writeData();
    }
  
!   event void Metadata.receivedPageDone(result_t result) { ; }
  
  }