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

[Jonathan Hui]

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

Modified Files:
	GoldenImageM.nc 
Log Message:
- No longer using generic component for storage stack.



Index: GoldenImageM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/TestDeluge/GoldenImage/GoldenImageM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GoldenImageM.nc	20 Jan 2005 21:30:38 -0000	1.2
--- GoldenImageM.nc	9 Feb 2005 02:54:30 -0000	1.3
***************
*** 129,133 ****
    task void writeData() {
      uint32_t offset = (uint32_t)curBuf * (uint32_t)BUF_SIZE + DELUGE_CRC_BLOCK_SIZE;
!     if (call DataWrite.write(DELUGE_FACTORY_IMAGE_NUM, offset, buf, BUF_SIZE) == FAIL)
        post writeData();
    }
--- 129,133 ----
    task void writeData() {
      uint32_t offset = (uint32_t)curBuf * (uint32_t)BUF_SIZE + DELUGE_CRC_BLOCK_SIZE;
!     if (call DataWrite.write(DELUGE_GOLDEN_IMAGE_NUM, offset, buf, BUF_SIZE) == FAIL)
        post writeData();
    }
***************
*** 188,192 ****
      
      imgDesc.vNum = 0;
!     imgDesc.imgNum = DELUGE_FACTORY_IMAGE_NUM;
      imgDesc.numPgsComplete = 1;
      imgDesc.numPgs = 1;
--- 188,192 ----
      
      imgDesc.vNum = 0;
!     imgDesc.imgNum = DELUGE_GOLDEN_IMAGE_NUM;
      imgDesc.numPgsComplete = 1;
      imgDesc.numPgs = 1;
***************
*** 222,226 ****
      tmp8 = TOSBOOT_GESTURE_MAX_COUNT;
      call IFlash.write((uint8_t*)TOSBOOT_GESTURE_COUNT_ADDR, &tmp8, sizeof(tmp8));
!     addr = call Storage.imgNum2Addr(DELUGE_FACTORY_IMAGE_NUM) + DELUGE_IDENT_SIZE;
      call IFlash.write((uint8_t*)TOSBOOT_NEW_IMG_START_ADDR, &addr, sizeof(addr));
  
--- 222,226 ----
      tmp8 = TOSBOOT_GESTURE_MAX_COUNT;
      call IFlash.write((uint8_t*)TOSBOOT_GESTURE_COUNT_ADDR, &tmp8, sizeof(tmp8));
!     addr = call Storage.imgNum2Addr(DELUGE_GOLDEN_IMAGE_NUM) + DELUGE_IDENT_SIZE;
      call IFlash.write((uint8_t*)TOSBOOT_NEW_IMG_START_ADDR, &addr, sizeof(addr));
  
***************
*** 263,267 ****
    event result_t Metadata.setupNewImageDone(result_t result) {
      // start cloning
!     call Metadata.receivedPage(DELUGE_FACTORY_IMAGE_NUM, 0);
      fillBuf();
      post writeData();
--- 263,267 ----
    event result_t Metadata.setupNewImageDone(result_t result) {
      // start cloning
!     call Metadata.receivedPage(DELUGE_GOLDEN_IMAGE_NUM, 0);
      fillBuf();
      post writeData();