[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/pins HplAtm128GeneralIOPinP.nc, 1.5, 1.6 HplAtm128GeneralIOSlowPinP.nc, 1.5, 1.6 HplAtm128InterruptPinP.nc, 1.4, 1.5

[John Regehr]

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

Modified Files:
	HplAtm128GeneralIOPinP.nc HplAtm128GeneralIOSlowPinP.nc 
	HplAtm128InterruptPinP.nc 
Log Message:
switch to new annotation syntax

Index: HplAtm128GeneralIOPinP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/pins/HplAtm128GeneralIOPinP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HplAtm128GeneralIOPinP.nc	16 Feb 2008 05:30:24 -0000	1.5
--- HplAtm128GeneralIOPinP.nc	31 May 2008 20:20:49 -0000	1.6
***************
*** 39,45 ****
  implementation
  {
! #define pin (*TCAST(volatile uint8_t * SINGLE NONNULL, pin_addr))
! #define port (*TCAST(volatile uint8_t * SINGLE NONNULL, port_addr))
! #define ddr (*TCAST(volatile uint8_t * SINGLE NONNULL, ddr_addr))
  
    inline async command bool IO.get()        { return READ_BIT (pin, bit); }
--- 39,45 ----
  implementation
  {
! #define pin (*TCAST(volatile uint8_t * ONE, pin_addr))
! #define port (*TCAST(volatile uint8_t * ONE, port_addr))
! #define ddr (*TCAST(volatile uint8_t * ONE, ddr_addr))
  
    inline async command bool IO.get()        { return READ_BIT (pin, bit); }

Index: HplAtm128GeneralIOSlowPinP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/pins/HplAtm128GeneralIOSlowPinP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HplAtm128GeneralIOSlowPinP.nc	16 Feb 2008 05:30:24 -0000	1.5
--- HplAtm128GeneralIOSlowPinP.nc	31 May 2008 20:20:49 -0000	1.6
***************
*** 40,46 ****
  implementation
  {
! #define pin (*TCAST(volatile uint8_t * SINGLE NONNULL, pin_addr))
! #define port (*TCAST(volatile uint8_t * SINGLE NONNULL, port_addr))
! #define ddr (*TCAST(volatile uint8_t * SINGLE NONNULL, ddr_addr))
  
    inline async command bool IO.get()        { return READ_BIT (pin, bit); }
--- 40,46 ----
  implementation
  {
! #define pin (*TCAST(volatile uint8_t * ONE, pin_addr))
! #define port (*TCAST(volatile uint8_t * ONE, port_addr))
! #define ddr (*TCAST(volatile uint8_t * ONE, ddr_addr))
  
    inline async command bool IO.get()        { return READ_BIT (pin, bit); }

Index: HplAtm128InterruptPinP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/pins/HplAtm128InterruptPinP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HplAtm128InterruptPinP.nc	12 Dec 2006 18:23:03 -0000	1.4
--- HplAtm128InterruptPinP.nc	31 May 2008 20:20:49 -0000	1.5
***************
*** 43,47 ****
    inline async command void Irq.disable()  { EIMSK &= ~(1 << bit); }
  
! #define ctrl  (*(volatile uint8_t *)ctrl_addr)
  
    inline async command void Irq.edge(bool low_to_high) {
--- 43,47 ----
    inline async command void Irq.disable()  { EIMSK &= ~(1 << bit); }
  
! #define ctrl  (*TCAST(volatile uint8_t * ONE, ctrl_addr))
  
    inline async command void Irq.edge(bool low_to_high) {