[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/timer Msp430TimerCapComP.nc, 1.2, 1.3 Msp430TimerP.nc, 1.3, 1.4

[John Regehr]

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

Modified Files:
	Msp430TimerCapComP.nc Msp430TimerP.nc 
Log Message:
trusted casts for safe tinyos on MSP430 register accesses

Index: Msp430TimerCapComP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430TimerCapComP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Msp430TimerCapComP.nc	12 Jul 2006 17:01:45 -0000	1.2
--- Msp430TimerCapComP.nc	16 Feb 2008 20:03:51 -0000	1.3
***************
*** 39,44 ****
  implementation
  {
!   #define TxCCTLx (*(volatile TYPE_TACCTL0*)TxCCTLx_addr)
!   #define TxCCRx (*(volatile TYPE_TACCR0*)TxCCRx_addr)
  
    typedef msp430_compare_control_t cc_t;
--- 39,44 ----
  implementation
  {
!   #define TxCCTLx (*TCAST(volatile TYPE_TACCTL0* SINGLE NONNULL, TxCCTLx_addr))
!   #define TxCCRx (*TCAST(volatile TYPE_TACCR0* SINGLE NONNULL, TxCCRx_addr))
  
    typedef msp430_compare_control_t cc_t;

Index: Msp430TimerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430TimerP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Msp430TimerP.nc	15 Dec 2006 14:25:38 -0000	1.3
--- Msp430TimerP.nc	16 Feb 2008 20:03:51 -0000	1.4
***************
*** 45,51 ****
  implementation
  {
!   #define TxIV (*(volatile TYPE_TAIV*)TxIV_addr)
!   #define TxR (*(volatile TYPE_TAR*)TxR_addr)
!   #define TxCTL (*(volatile TYPE_TACTL*)TxCTL_addr)
  
    async command uint16_t Timer.get()
--- 45,51 ----
  implementation
  {
!   #define TxIV (*TCAST(volatile TYPE_TAIV* SINGLE NONNULL, TxIV_addr))
!   #define TxR (*TCAST(volatile TYPE_TAR* SINGLE NONNULL, TxR_addr))
!   #define TxCTL (*TCAST(volatile TYPE_TACTL* SINGLE NONNULL, TxCTL_addr))
  
    async command uint16_t Timer.get()