[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/timer HplAtm128Timer1P.nc, 1.4, 1.5

[John Regehr]

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

Modified Files:
	HplAtm128Timer1P.nc 
Log Message:
safe tinyos annotations

Index: HplAtm128Timer1P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/timer/HplAtm128Timer1P.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HplAtm128Timer1P.nc	12 Dec 2006 18:23:04 -0000	1.4
--- HplAtm128Timer1P.nc	3 Jun 2008 03:00:59 -0000	1.5
***************
*** 67,77 ****
    //=== Read the control registers. =====================================
    async command Atm128TimerCtrlCompare_t TimerCtrl.getCtrlCompare() { 
!     return *(Atm128TimerCtrlCompare_t*)&TCCR1A; 
    }
    async command Atm128TimerCtrlCapture_t TimerCtrl.getCtrlCapture() { 
!     return *(Atm128TimerCtrlCapture_t*)&TCCR1B; 
    }
    async command Atm128TimerCtrlClock_t TimerCtrl.getCtrlClock() { 
!     return *(Atm128TimerCtrlClock_t*)&TCCR1C; 
    }
  
--- 67,77 ----
    //=== Read the control registers. =====================================
    async command Atm128TimerCtrlCompare_t TimerCtrl.getCtrlCompare() { 
!     return *(Atm128TimerCtrlCompare_t*ONE)&TCCR1A; 
    }
    async command Atm128TimerCtrlCapture_t TimerCtrl.getCtrlCapture() { 
!     return *(Atm128TimerCtrlCapture_t*ONE)&TCCR1B; 
    }
    async command Atm128TimerCtrlClock_t TimerCtrl.getCtrlClock() { 
!     return *(Atm128TimerCtrlClock_t*ONE)&TCCR1C; 
    }
  
***************
*** 108,112 ****
    //=== Read the interrupt flags. =====================================
    async command Atm128_ETIFR_t TimerCtrl.getInterruptFlag() { 
!     return *(Atm128_ETIFR_t*)&ETIFR; 
    }
  
--- 108,112 ----
    //=== Read the interrupt flags. =====================================
    async command Atm128_ETIFR_t TimerCtrl.getInterruptFlag() { 
!     return *(Atm128_ETIFR_t*ONE)&ETIFR; 
    }