[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge/extra NetProgC.nc, 1.1, 1.2 NetProgM.nc, 1.1, 1.2

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/extra
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19802/tos/lib/net/Deluge/extra

Modified Files:
	NetProgC.nc NetProgM.nc 
Log Message:
Add support for MicaZ to Deluge T2.


Index: NetProgC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/extra/NetProgC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetProgC.nc	22 May 2007 20:34:24 -0000	1.1
--- NetProgC.nc	2 Jun 2007 00:09:14 -0000	1.2
***************
*** 47,54 ****
  
    MainC.SoftwareInit -> NetProgM.Init;
!   NetProgM.StorageMap[0] -> DelugeStorageC.StorageMap[0];
!   NetProgM.StorageMap[1] -> DelugeStorageC.StorageMap[1];
    NetProgM.DelugeMetadata -> DelugeStorageC;
    NetProgM.IFlash -> IFlash;
    NetProgM.Crc -> CrcP;
  }
--- 47,57 ----
  
    MainC.SoftwareInit -> NetProgM.Init;
!   NetProgM.DelugeStorage[VOLUME_DELUGE0] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE0];
!   NetProgM.DelugeStorage[VOLUME_DELUGE1] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE1];
    NetProgM.DelugeMetadata -> DelugeStorageC;
    NetProgM.IFlash -> IFlash;
    NetProgM.Crc -> CrcP;
+   
+   components LedsC;
+   NetProgM.Leds -> LedsC;
  }

Index: NetProgM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/extra/NetProgM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetProgM.nc	22 May 2007 20:34:24 -0000	1.1
--- NetProgM.nc	2 Jun 2007 00:09:14 -0000	1.2
***************
*** 38,45 ****
    }
    uses {
!     interface StorageMap[uint8_t img_num];
      interface InternalFlash as IFlash;
      interface Crc;
      interface DelugeMetadata;
    }
  }
--- 38,46 ----
    }
    uses {
!     interface DelugeStorage[uint8_t img_num];
      interface InternalFlash as IFlash;
      interface Crc;
      interface DelugeMetadata;
+     interface Leds;
    }
  }
***************
*** 104,108 ****
        writeTOSinfo();
        
!       args.imageAddr = call StorageMap.getPhysicalAddress[img_num](0);
        args.gestureCount = 0xff;
        args.noReprogram = FALSE;
--- 105,109 ----
        writeTOSinfo();
        
!       args.imageAddr = call DelugeStorage.getPhysicalAddress[img_num](0);
        args.gestureCount = 0xff;
        args.noReprogram = FALSE;
***************
*** 123,127 ****
    }
  
!   default command storage_addr_t StorageMap.getPhysicalAddress[uint8_t img_num](storage_addr_t addr) { return 0xFFFFFFFF; }
  
  }
--- 124,128 ----
    }
  
!   default command storage_addr_t DelugeStorage.getPhysicalAddress[uint8_t img_num](storage_addr_t addr) { return 0xFFFFFFFF; }
  
  }