[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge/FlashVolumeManager FlashVolumeManagerP.nc, 1.13, 1.14

[Razvan Musaloiu-E.]

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

Modified Files:
	FlashVolumeManagerP.nc 
Log Message:
Merge of the latest Deluge T2.


Index: FlashVolumeManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FlashVolumeManagerP.nc	22 Jan 2008 00:40:59 -0000	1.13
--- FlashVolumeManagerP.nc	19 May 2008 21:25:08 -0000	1.14
***************
*** 25,28 ****
--- 25,30 ----
   */
  
+ #include "imgNum2volumeId.h"
+ 
  generic module FlashVolumeManagerP()
  {
***************
*** 89,99 ****
    };
  
-   uint8_t imgNum2volumeId[] = {
-     VOLUME_GOLDENIMAGE,
-     VOLUME_DELUGE1,
-     VOLUME_DELUGE2,
-     VOLUME_DELUGE3
-   };
-   
    void sendReply(error_t error, storage_len_t len)
    {
--- 91,94 ----
***************
*** 187,193 ****
  
      // Converts the image number that the user wants to the real image number
!     imgNum = request->imgNum < DELUGE_NUM_VOLUMES ? imgNum2volumeId[request->imgNum] : 0xFF;
      
!     if (imgNum != 0xFF) {
        error = SUCCESS;
        // We ask for a reservation only for erase and write.
--- 182,188 ----
  
      // Converts the image number that the user wants to the real image number
!     imgNum = imgNum2volumeId(request->imgNum);
      
!     if (imgNum != NON_DELUGE_VOLUME) {
        error = SUCCESS;
        // We ask for a reservation only for erase and write.
***************
*** 260,267 ****
      // Release the resource.
      if (state == S_IDLE && call Resource.isOwner()) {
-       call Leds.led1Off();
        call Resource.release();
      }
!     if (state == S_IDLE && !call ArbiterInfo.inUse()) {
        call Leds.led1Off();
      }
--- 255,261 ----
      // Release the resource.
      if (state == S_IDLE && call Resource.isOwner()) {
        call Resource.release();
      }
!     if (state == S_IDLE) {
        call Leds.led1Off();
      }