[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 Msp430Adc12P.nc, 1.1.2.7, 1.1.2.8

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


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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Msp430Adc12P.nc 
Log Message:
Fix: Perform resource owner check in atomics.

Index: Msp430Adc12P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Attic/Msp430Adc12P.nc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** Msp430Adc12P.nc	2 Jun 2006 17:42:52 -0000	1.1.2.7
--- Msp430Adc12P.nc	6 Jun 2006 13:45:08 -0000	1.1.2.8
***************
*** 91,102 ****
    error_t clientAccessRequest(uint8_t id)
    {
!     if (call ADCArbiterInfo.userId() == id){
!       atomic {
          if (flags & ADC_BUSY)
            return EBUSY;
          flags = ADC_BUSY;
          clientID = id;
        }
-       return SUCCESS;
      }
      return ERESERVE;
--- 91,102 ----
    error_t clientAccessRequest(uint8_t id)
    {
!     atomic {
!       if (call ADCArbiterInfo.userId() == id){
          if (flags & ADC_BUSY)
            return EBUSY;
          flags = ADC_BUSY;
          clientID = id;
+         return SUCCESS;
        }
      }
      return ERESERVE;



More information about the Tinyos-2-commits mailing list