[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/chips/msp430 Msp430Uart0C.nc, 1.1.2.1, 1.1.2.2 Msp430Usart0C.nc, 1.1.2.1, 1.1.2.2 Msp430UsartShare0P.nc, 1.1.2.1, 1.1.2.2

[Philipp Huppertz]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Msp430Uart0C.nc Msp430Usart0C.nc Msp430UsartShare0P.nc 
Log Message:
- updated to new Uart interfaces

Index: Msp430Uart0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/msp430/Attic/Msp430Uart0C.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
*** Msp430Uart0C.nc	15 Aug 2006 13:54:07 -0000	1.1.2.1
--- Msp430Uart0C.nc	11 Oct 2006 11:50:49 -0000	1.1.2.2
***************
*** 42,46 ****
  
    provides interface Resource;   provides interface ResourceRequested;
!   provides interface SerialByteComm;
    provides interface Msp430UartControl as UartControl;
  
--- 42,47 ----
  
    provides interface Resource;   provides interface ResourceRequested;
!   provides interface UartStream;
!   provides interface UartByte;
    provides interface Msp430UartControl as UartControl;
  
***************
*** 56,60 ****
    components Msp430Uart0P as UartP;
    Resource = UartP.Resource[ CLIENT_ID ];
!   SerialByteComm = UartP.SerialByteComm;
    UartControl = UartP.UartControl[ CLIENT_ID ];
    Msp430UartConfigure = UartP.Msp430UartConfigure[ CLIENT_ID ];
--- 57,62 ----
    components Msp430Uart0P as UartP;
    Resource = UartP.Resource[ CLIENT_ID ];
!   UartStream = UartP.UartStream;
!   UartByte = UartP.UartByte;
    UartControl = UartP.UartControl[ CLIENT_ID ];
    Msp430UartConfigure = UartP.Msp430UartConfigure[ CLIENT_ID ];

Index: Msp430Usart0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/msp430/Attic/Msp430Usart0C.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
*** Msp430Usart0C.nc	15 Aug 2006 13:54:07 -0000	1.1.2.1
--- Msp430Usart0C.nc	11 Oct 2006 11:50:49 -0000	1.1.2.2
***************
*** 44,47 ****
--- 44,48 ----
    provides interface HplMsp430Usart;
    provides interface HplMsp430UsartInterrupts;
+   provides interface HplMsp430I2CInterrupts;
  
    uses interface ResourceConfigure;
***************
*** 61,64 ****
--- 62,66 ----
    ArbiterInfo = UsartShareP.ArbiterInfo;
    HplMsp430UsartInterrupts = UsartShareP.Interrupts[ CLIENT_ID ];
+   HplMsp430I2CInterrupts = UsartShareP.I2CInterrupts[ CLIENT_ID ];
  
    components HplMsp430Usart0C as UsartC;

Index: Msp430UsartShare0P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/msp430/Attic/Msp430UsartShare0P.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
*** Msp430UsartShare0P.nc	15 Aug 2006 13:54:07 -0000	1.1.2.1
--- Msp430UsartShare0P.nc	11 Oct 2006 11:50:49 -0000	1.1.2.2
***************
*** 38,41 ****
--- 38,42 ----
  
    provides interface HplMsp430UsartInterrupts as Interrupts[ uint8_t id ];
+   provides interface HplMsp430I2CInterrupts as I2CInterrupts[ uint8_t id ];
    provides interface Resource[ uint8_t id ];
    provides interface ResourceRequested[ uint8_t id ];
***************
*** 49,53 ****
--- 50,56 ----
    components new Msp430UsartShareP() as UsartShareP;
    Interrupts = UsartShareP;
+   I2CInterrupts = UsartShareP;
    UsartShareP.RawInterrupts -> UsartC;
+   UsartShareP.RawI2CInterrupts -> UsartC;
  
    components new FcfsArbiterC( MSP430_HPLUSART0_RESOURCE ) as ArbiterC;