[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128 Atm128Uart0C.nc, 1.1.2.2, 1.1.2.3 Atm128UartP.nc, 1.1.2.2, 1.1.2.3

[David Gay]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Atm128Uart0C.nc Atm128UartP.nc 
Log Message:
fix mica family serial components - CounterThree may not be at 1MHz.


Index: Atm128Uart0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/Attic/Atm128Uart0C.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Atm128Uart0C.nc	17 Oct 2006 06:58:52 -0000	1.1.2.2
--- Atm128Uart0C.nc	30 Oct 2006 18:40:45 -0000	1.1.2.3
***************
*** 41,45 ****
    provides interface UartByte;
    provides interface UartStream;
!   uses interface Counter<TMicro, uint16_t>;
    
  }
--- 41,45 ----
    provides interface UartByte;
    provides interface UartStream;
!   uses interface Counter<TMicro, uint32_t>;
    
  }

Index: Atm128UartP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/Attic/Atm128UartP.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Atm128UartP.nc	17 Oct 2006 19:04:45 -0000	1.1.2.2
--- Atm128UartP.nc	30 Oct 2006 18:40:45 -0000	1.1.2.3
***************
*** 48,52 ****
    uses interface StdControl as HplUartRxControl;
    uses interface HplAtm128Uart as HplUart;
!   uses interface Counter<TMicro, uint16_t>;
    
  }
--- 48,52 ----
    uses interface StdControl as HplUartRxControl;
    uses interface HplAtm128Uart as HplUart;
!   uses interface Counter<TMicro, uint32_t>;
    
  }
***************
*** 163,167 ****
      start = call Counter.get();
      while ( call HplUart.isRxEmpty() ) {
!       if ( ( call Counter.get() - start ) >= timeout_micro )
  	return FAIL;
      }
--- 163,167 ----
      start = call Counter.get();
      while ( call HplUart.isRxEmpty() ) {
!       if ( ( (uint16_t)call Counter.get() - start ) >= timeout_micro )
  	return FAIL;
      }