[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/pxa27x/timer BusyWaitMicroC.nc, 1.1.2.3, 1.1.2.4 HalPXA27xBusyWaitM.nc, 1.1.2.1, 1.1.2.2

[Philip Buonadonna]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/timer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5392

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	BusyWaitMicroC.nc HalPXA27xBusyWaitM.nc 
Log Message:
Minor fixes for busywait routines.

Index: BusyWaitMicroC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/timer/Attic/BusyWaitMicroC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** BusyWaitMicroC.nc	7 Dec 2005 23:08:02 -0000	1.1.2.3
--- BusyWaitMicroC.nc	5 Jul 2006 18:58:28 -0000	1.1.2.4
***************
*** 42,46 ****
  implementation
  {
!   components new HalPXA27xBusWaitM(TMicro,13) as PXA27xBusyWaitMicro;
    components HplPXA27xOSTimerC;
  
--- 42,46 ----
  implementation
  {
!   components new HalPXA27xBusyWaitM(TMicro,13) as PXA27xBusyWaitMicro;
    components HplPXA27xOSTimerC;
  

Index: HalPXA27xBusyWaitM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/timer/Attic/HalPXA27xBusyWaitM.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
*** HalPXA27xBusyWaitM.nc	7 Dec 2005 23:08:02 -0000	1.1.2.1
--- HalPXA27xBusyWaitM.nc	5 Jul 2006 18:58:28 -0000	1.1.2.2
***************
*** 58,65 ****
      atomic {
        uint32_t t0 = call OST.getOSCR();
!       dCounts = (dt * 4) * valScale;
        dCounts >>= 2;
!       while (((call OST.getOSCR.get()) - t0) < dCounts);
      }
    }
  }
--- 58,70 ----
      atomic {
        uint32_t t0 = call OST.getOSCR();
!       dCounts = (dt * 4) * val4xScale;
        dCounts >>= 2;
!       while (((call OST.getOSCR()) - t0) < dCounts);
      }
    }
+ 
+   async event void OST.fired() {
+     return;
+   }
+ 
  }