[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/usart Msp430SpiNoDmaP.nc, 1.4, 1.5 Msp430UartP.nc, 1.6, 1.7

[John Regehr]

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

Modified Files:
	Msp430SpiNoDmaP.nc Msp430UartP.nc 
Log Message:
safe tinyos annotations

Index: Msp430SpiNoDmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430SpiNoDmaP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430SpiNoDmaP.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430SpiNoDmaP.nc	4 Jun 2008 05:31:15 -0000	1.5
***************
*** 57,63 ****
    };
  
-   norace uint8_t* m_tx_buf;
-   norace uint8_t* m_rx_buf;
    norace uint16_t m_len;
    norace uint16_t m_pos;
    norace uint8_t m_client;
--- 57,63 ----
    };
  
    norace uint16_t m_len;
+   norace uint8_t* COUNT_NOK(m_len) m_tx_buf;
+   norace uint8_t* COUNT_NOK(m_len) m_rx_buf;
    norace uint16_t m_pos;
    norace uint8_t m_client;

Index: Msp430UartP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430UartP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Msp430UartP.nc	21 May 2008 22:11:57 -0000	1.6
--- Msp430UartP.nc	4 Jun 2008 05:31:15 -0000	1.7
***************
*** 57,62 ****
  implementation {
    
-   norace uint8_t *m_tx_buf, *m_rx_buf;
    norace uint16_t m_tx_len, m_rx_len;
    norace uint16_t m_tx_pos, m_rx_pos;
    norace uint8_t m_byte_time;
--- 57,62 ----
  implementation {
    
    norace uint16_t m_tx_len, m_rx_len;
+   norace uint8_t * COUNT_NOK(m_tx_len) m_tx_buf, * COUNT_NOK(m_rx_len) m_rx_buf;
    norace uint16_t m_tx_pos, m_rx_pos;
    norace uint8_t m_byte_time;