[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128 Atm128Uart0C.nc, 1.1.2.1, 1.1.2.2 HplAtm128UartC.nc, 1.1.2.6, 1.1.2.7

[Jonathan Hui]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Atm128Uart0C.nc HplAtm128UartC.nc 
Log Message:

Fix typos in wiring. Caused Init for HplAtm128UartP to not be wired in.



Index: Atm128Uart0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/Attic/Atm128Uart0C.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Atm128Uart0C.nc	10 Oct 2006 19:18:42 -0000	1.1.2.1
--- Atm128Uart0C.nc	17 Oct 2006 06:58:52 -0000	1.1.2.2
***************
*** 53,66 ****
    UartP.Counter = Counter;
    
!   components HplAtm128UartP as HplUartP;
!   UartP.HplUartTxControl -> HplUartP.Uart0TxControl;
!   UartP.HplUartRxControl -> HplUartP.Uart0RxControl;
!   UartP.HplUart -> HplUartP.HplUart0;
!   
!   components PlatformC;
!   HplUartP.Atm128Calibrate -> PlatformC;
!   
!   components McuSleepC;
!   HplUartP.McuPowerState -> McuSleepC;
    
    components MainC;
--- 53,60 ----
    UartP.Counter = Counter;
    
!   components HplAtm128UartC as HplUartC;
!   UartP.HplUartTxControl -> HplUartC.Uart0TxControl;
!   UartP.HplUartRxControl -> HplUartC.Uart0RxControl;
!   UartP.HplUart -> HplUartC.HplUart0;
    
    components MainC;

Index: HplAtm128UartC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/HplAtm128UartC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** HplAtm128UartC.nc	10 Oct 2006 19:18:42 -0000	1.1.2.6
--- HplAtm128UartC.nc	17 Oct 2006 06:58:52 -0000	1.1.2.7
***************
*** 48,66 ****
  {
    components HplAtm128UartP, PlatformC, McuSleepC;
! 
    Uart0TxControl = HplAtm128UartP.Uart0TxControl;
    Uart0RxControl = HplAtm128UartP.Uart0RxControl;
!   Uart0 = HplAtm128UartP.Uart0;
!     
    Uart1TxControl = HplAtm128UartP.Uart1TxControl;
    Uart1RxControl = HplAtm128UartP.Uart1RxControl;
!   Uart1 = HplAtm128UartP.Uart1;
! 
    HplAtm128UartP.Atm128Calibrate -> PlatformC;
    HplAtm128UartP.McuPowerState -> McuSleepC;
! 
    components MainC;
    MainC.SoftwareInit -> HplAtm128UartP.Uart0Init;
!   MainC.SoftwareINit -> HplAtm128UartP.Uart1Init;
! 
  }
--- 48,66 ----
  {
    components HplAtm128UartP, PlatformC, McuSleepC;
!   
    Uart0TxControl = HplAtm128UartP.Uart0TxControl;
    Uart0RxControl = HplAtm128UartP.Uart0RxControl;
!   HplUart0 = HplAtm128UartP.HplUart0;
!   
    Uart1TxControl = HplAtm128UartP.Uart1TxControl;
    Uart1RxControl = HplAtm128UartP.Uart1RxControl;
!   HplUart1 = HplAtm128UartP.HplUart1;
!   
    HplAtm128UartP.Atm128Calibrate -> PlatformC;
    HplAtm128UartP.McuPowerState -> McuSleepC;
!   
    components MainC;
    MainC.SoftwareInit -> HplAtm128UartP.Uart0Init;
!   MainC.SoftwareInit -> HplAtm128UartP.Uart1Init;
!   
  }