[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/storage/Config RandRWAppC.nc, 1.1.2.1, 1.1.2.2 RandRWC.nc, 1.1.2.1, 1.1.2.2

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/storage/Config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21622

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	RandRWAppC.nc RandRWC.nc 
Log Message:
changes for config storage cleanup


Index: RandRWAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/storage/Config/Attic/RandRWAppC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** RandRWAppC.nc	25 May 2006 22:21:46 -0000	1.1.2.1
--- RandRWAppC.nc	30 May 2006 21:36:58 -0000	1.1.2.2
***************
*** 23,32 ****
  
    MainC.Boot <- RandRWC;
-   MainC.SoftwareInit -> SerialActiveMessageC;
  
    RandRWC.SerialControl -> SerialActiveMessageC;
    RandRWC.AMSend -> SerialActiveMessageC.AMSend[1];
    RandRWC.ConfigStorage -> ConfigStorageC.ConfigStorage;
!   RandRWC.ConfigMount -> ConfigStorageC.SplitControl;
    RandRWC.Leds -> LedsC;
  }
--- 23,31 ----
  
    MainC.Boot <- RandRWC;
  
    RandRWC.SerialControl -> SerialActiveMessageC;
    RandRWC.AMSend -> SerialActiveMessageC.AMSend[1];
    RandRWC.ConfigStorage -> ConfigStorageC.ConfigStorage;
!   RandRWC.ConfigMount -> ConfigStorageC.Mount;
    RandRWC.Leds -> LedsC;
  }

Index: RandRWC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/storage/Config/Attic/RandRWC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** RandRWC.nc	25 May 2006 22:21:46 -0000	1.1.2.1
--- RandRWC.nc	30 May 2006 21:36:58 -0000	1.1.2.2
***************
*** 27,31 ****
      interface AMSend;
      interface SplitControl as SerialControl;
!     interface SplitControl as ConfigMount;
    }
  }
--- 27,31 ----
      interface AMSend;
      interface SplitControl as SerialControl;
!     interface Mount as ConfigMount;
    }
  }
***************
*** 203,210 ****
        }
  
!     call ConfigMount.start();
    }
  
!   event void ConfigMount.startDone(error_t e) {
      if (e != SUCCESS)
        fail(e);
--- 203,210 ----
        }
  
!     scheck(call ConfigMount.mount());
    }
  
!   event void ConfigMount.mountDone(error_t e) {
      if (e != SUCCESS)
        fail(e);
***************
*** 279,282 ****
  
    event void SerialControl.stopDone(error_t e) { }
-   event void ConfigMount.stopDone(error_t e) { }
  }
--- 279,281 ----