[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 AdcC.nc, 1.1.2.11, 1.1.2.12

Jan-Hinrich Hauer janhauer at users.sourceforge.net
Tue Jun 6 04:27:45 PDT 2006


Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5845/tos/chips/msp430/adc12

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	AdcC.nc 
Log Message:
Small fix: Reset state when call to HAL1 fails.

Index: AdcC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Attic/AdcC.nc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** AdcC.nc	2 Jun 2006 17:42:24 -0000	1.1.2.11
--- AdcC.nc	6 Jun 2006 11:27:41 -0000	1.1.2.12
***************
*** 117,123 ****
      }
      readSync = TRUE;
-     owner = client;
      hal1request = call SingleChannel.getSingleData[client](&settings);
      if (hal1request != SUCCESS){
        call Resource.release[client]();
        signal Read.readDone[client](FAIL, 0);
--- 117,123 ----
      }
      readSync = TRUE;
      hal1request = call SingleChannel.getSingleData[client](&settings);
      if (hal1request != SUCCESS){
+       readSync = FALSE;
        call Resource.release[client]();
        signal Read.readDone[client](FAIL, 0);
***************
*** 135,138 ****
--- 135,139 ----
      if (readSync){ // was Read.read request
        readSync = FALSE;
+       owner = client;
        value = data;
        post readDone();



More information about the Tinyos-2-commits mailing list