trusted casts for safe tinyos on MSP430 register accesses

[tinyos-2.x.git] / tos / chips / msp430 / pins / HplMsp430GeneralIOP.nc

diff --git a/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc b/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc
index b532f812fcd8ddb33bf5a29d50d84fb7a79e1b91..48f49dfdb0f3007b8a98df9cca4a3ce3c748e597 100644 (file)
--- a/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc
+++ b/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc
@@ -37,10 +37,10 @@ generic module HplMsp430GeneralIOP(
 }
 implementation
 {
-  #define PORTxIN (*(volatile TYPE_PORT_IN*)port_in_addr)
-  #define PORTx (*(volatile TYPE_PORT_OUT*)port_out_addr)
-  #define PORTxDIR (*(volatile TYPE_PORT_DIR*)port_dir_addr)
-  #define PORTxSEL (*(volatile TYPE_PORT_SEL*)port_sel_addr)
+  #define PORTxIN (*TCAST(volatile TYPE_PORT_IN* SINGLE NONNULL, port_in_addr))
+  #define PORTx (*TCAST(volatile TYPE_PORT_OUT* SINGLE NONNULL, port_out_addr))
+  #define PORTxDIR (*TCAST(volatile TYPE_PORT_DIR* SINGLE NONNULL, port_dir_addr))
+  #define PORTxSEL (*TCAST(volatile TYPE_PORT_SEL* SINGLE NONNULL, port_sel_addr))
 
   async command void IO.set() { atomic PORTx |= (0x01 << pin); }
   async command void IO.clr() { atomic PORTx &= ~(0x01 << pin); }