[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/usart Msp430I2CC.nc, 1.4, 1.5 Msp430Spi0C.nc, 1.5, 1.6 Msp430Spi1C.nc, 1.5, 1.6 Msp430Uart0C.nc, 1.5, 1.6 Msp430Uart0P.nc, 1.4, 1.5 Msp430Uart1C.nc, 1.4, 1.5 Msp430Uart1P.nc, 1.4, 1.5 Msp430UartP.nc, 1.5, 1.6 Msp430Usart0C.nc, 1.4, 1.5 Msp430Usart1C.nc, 1.4, 1.5 Msp430UsartShare0P.nc, 1.4, 1.5 Msp430UsartShare1P.nc, 1.5, 1.6

Wed May 21 15:12:00 PDT 2008

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

Modified Files:
	Msp430I2CC.nc Msp430Spi0C.nc Msp430Spi1C.nc Msp430Uart0C.nc 
	Msp430Uart0P.nc Msp430Uart1C.nc Msp430Uart1P.nc Msp430UartP.nc 
	Msp430Usart0C.nc Msp430Usart1C.nc Msp430UsartShare0P.nc 
	Msp430UsartShare1P.nc 
Log Message:
Update to include paramaterization of the UartStream interface as well as push ResourceRequested out to the top level components such as Msp430Spi0C and Msp430Uart0C, etc.

Index: Msp430I2CC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430I2CC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430I2CC.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430I2CC.nc	21 May 2008 22:11:57 -0000	1.5
***************
*** 41,44 ****
--- 41,45 ----

    provides interface Resource;
+   provides interface ResourceRequested;
    provides interface I2CPacket<TI2CBasicAddr> as I2CBasicAddr;

***************
*** 59,62 ****
--- 60,64 ----

    components new Msp430Usart0C() as UsartC;
+   ResourceRequested = UsartC;
    I2CP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
    I2CP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;

Index: Msp430Spi0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Spi0C.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430Spi0C.nc	8 Nov 2007 21:34:42 -0000	1.5
--- Msp430Spi0C.nc	21 May 2008 22:11:57 -0000	1.6
***************
*** 46,49 ****
--- 46,50 ----

    provides interface Resource;
+   provides interface ResourceRequested;
    provides interface SpiByte;
    provides interface SpiPacket;
***************
*** 71,74 ****
--- 72,76 ----

    components new Msp430Usart0C() as UsartC;
+   ResourceRequested = UsartC;
    SpiP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
    SpiP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;

Index: Msp430Spi1C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Spi1C.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430Spi1C.nc	8 Nov 2007 21:34:42 -0000	1.5
--- Msp430Spi1C.nc	21 May 2008 22:11:57 -0000	1.6
***************
*** 46,49 ****
--- 46,50 ----

    provides interface Resource;
+   provides interface ResourceRequested;
    provides interface SpiByte;
    provides interface SpiPacket;
***************
*** 71,74 ****
--- 72,76 ----

    components new Msp430Usart1C() as UsartC;
+   ResourceReqeusted = UsartC;
    SpiP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
    SpiP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;

Index: Msp430Uart0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Uart0C.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430Uart0C.nc	9 Jan 2007 19:02:09 -0000	1.5
--- Msp430Uart0C.nc	21 May 2008 22:11:57 -0000	1.6
***************
*** 34,37 ****
--- 34,38 ----
   * @author Vlado Handziski <handzisk at tkn.tu-berlin.de>
   * @author Jonathan Hui <jhui at archedrock.com>
+  * @author Eric B. Decker <cire831 at gmail.com>
   * @version $Revision$ $Date$
   */
***************
*** 42,45 ****
--- 43,47 ----

    provides interface Resource;
+   provides interface ResourceRequested;
    provides interface UartStream;
    provides interface UartByte;
***************
*** 56,67 ****
    components Msp430Uart0P as UartP;
    Resource = UartP.Resource[ CLIENT_ID ];
!   UartStream = UartP.UartStream;
!   UartByte = UartP.UartByte;
    Msp430UartConfigure = UartP.Msp430UartConfigure[ CLIENT_ID ];

    components new Msp430Usart0C() as UsartC;
    UartP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
    UartP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;
!   UartP.UsartInterrupts -> UsartC.HplMsp430UsartInterrupts;
! 
  }
--- 58,69 ----
    components Msp430Uart0P as UartP;
    Resource = UartP.Resource[ CLIENT_ID ];
!   UartStream = UartP.UartStream[ CLIENT_ID ];
!   UartByte = UartP.UartByte[ CLIENT_ID ];
    Msp430UartConfigure = UartP.Msp430UartConfigure[ CLIENT_ID ];

    components new Msp430Usart0C() as UsartC;
+   ResourceRequested = UsartC;
    UartP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
    UartP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;
!   UartP.UsartInterrupts[ CLIENT_ID ] -> UsartC.HplMsp430UsartInterrupts;
  }

Index: Msp430Uart0P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Uart0P.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430Uart0P.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430Uart0P.nc	21 May 2008 22:11:57 -0000	1.5
***************
*** 33,36 ****
--- 33,37 ----
   * @author Jonathan Hui <jhui at archedrock.com>
   * @author Vlado Handziski <handzisk at tkn.tu-berlin.de>
+  * @author Eric B. Decker <cire831 at gmail.com>
   * @version $Revision$ $Date$
   */
***************
*** 39,54 ****

    provides interface Resource[ uint8_t id ];
!   provides interface ResourceConfigure[uint8_t id ];
!   provides interface UartStream;
!   provides interface UartByte;

    uses interface Resource as UsartResource[ uint8_t id ];
    uses interface Msp430UartConfigure[ uint8_t id ];
!   uses interface HplMsp430UsartInterrupts as UsartInterrupts;
! 
  }

  implementation {
- 
    components new Msp430UartP() as UartP;
    Resource = UartP.Resource;
--- 40,53 ----

    provides interface Resource[ uint8_t id ];
!   provides interface ResourceConfigure[ uint8_t id ];
!   provides interface UartStream[ uint8_t id ];
!   provides interface UartByte[ uint8_t id ];

    uses interface Resource as UsartResource[ uint8_t id ];
    uses interface Msp430UartConfigure[ uint8_t id ];
!   uses interface HplMsp430UsartInterrupts as UsartInterrupts[ uint8_t id ];
  }

  implementation {
    components new Msp430UartP() as UartP;
    Resource = UartP.Resource;

Index: Msp430Uart1C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Uart1C.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430Uart1C.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430Uart1C.nc	21 May 2008 22:11:57 -0000	1.5
***************
*** 34,37 ****
--- 34,38 ----
   * @author Vlado Handziski <handzisk at tkn.tu-berlin.de>
   * @author Jonathan Hui <jhui at archedrock.com>
+  * @author Eric B. Decker <cire81 at gmail.com>
   * @version $Revision$ $Date$
   */
***************
*** 42,45 ****
--- 43,47 ----

    provides interface Resource;
+   provides interface ResourceRequested;
    provides interface UartStream;
    provides interface UartByte;
***************
*** 56,67 ****
    components Msp430Uart1P as UartP;
    Resource = UartP.Resource[ CLIENT_ID ];
!   UartStream = UartP.UartStream;
!   UartByte = UartP.UartByte;
    Msp430UartConfigure = UartP.Msp430UartConfigure[ CLIENT_ID ];

    components new Msp430Usart1C() as UsartC;
    UartP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
    UartP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;
!   UartP.UsartInterrupts -> UsartC.HplMsp430UsartInterrupts;
! 
  }
--- 58,69 ----
    components Msp430Uart1P as UartP;
    Resource = UartP.Resource[ CLIENT_ID ];
!   UartStream = UartP.UartStream[ CLIENT_ID ];
!   UartByte = UartP.UartByte[ CLIENT_ID ];;
    Msp430UartConfigure = UartP.Msp430UartConfigure[ CLIENT_ID ];

    components new Msp430Usart1C() as UsartC;
+   ResourceRequested = UsartC;
    UartP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
    UartP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;
!   UartP.UsartInterrupts[ CLIENT_ID ] -> UsartC.HplMsp430UsartInterrupts;
  }

Index: Msp430Uart1P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Uart1P.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430Uart1P.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430Uart1P.nc	21 May 2008 22:11:57 -0000	1.5
***************
*** 33,36 ****
--- 33,37 ----
   * @author Jonathan Hui <jhui at archedrock.com>
   * @author Vlado Handziski <handzisk at tkn.tu-berlin.de>
+  * @author Eric B. Decker <cire831 at gmail.com>
   * @version $Revision$ $Date$
   */
***************
*** 39,49 ****

    provides interface Resource[ uint8_t id ];
!   provides interface ResourceConfigure[uint8_t id ];
!   provides interface UartStream;
!   provides interface UartByte;

    uses interface Resource as UsartResource[ uint8_t id ];
    uses interface Msp430UartConfigure[ uint8_t id ];
!   uses interface HplMsp430UsartInterrupts as UsartInterrupts;

  }
--- 40,50 ----

    provides interface Resource[ uint8_t id ];
!   provides interface ResourceConfigure[ uint8_t id ];
!   provides interface UartStream[ uint8_t id ];
!   provides interface UartByte[ uint8_t id ];

    uses interface Resource as UsartResource[ uint8_t id ];
    uses interface Msp430UartConfigure[ uint8_t id ];
!   uses interface HplMsp430UsartInterrupts as UsartInterrupts[ uint8_t id ];

  }

Index: Msp430UartP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430UartP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430UartP.nc	10 Jul 2007 00:49:41 -0000	1.5
--- Msp430UartP.nc	21 May 2008 22:11:57 -0000	1.6
***************
*** 33,36 ****
--- 33,37 ----
   * @author Jonathan Hui <jhui at archrock.com>
   * @author Vlado Handziski <handzisk at tkn.tu-berlin.de>
+  * @author Eric B. Decker <cire831 at gmail.com>
   * @version $Revision$ $Date$
   */
***************
*** 42,53 ****
    provides interface Resource[ uint8_t id ];
    provides interface ResourceConfigure[ uint8_t id ];
!   //provides interface Msp430UartControl as UartControl[ uint8_t id ];
!   provides interface UartStream;
!   provides interface UartByte;

    uses interface Resource as UsartResource[ uint8_t id ];
    uses interface Msp430UartConfigure[ uint8_t id ];
    uses interface HplMsp430Usart as Usart;
!   uses interface HplMsp430UsartInterrupts as UsartInterrupts;
    uses interface Counter<T32khz,uint16_t>;
    uses interface Leds;
--- 43,53 ----
    provides interface Resource[ uint8_t id ];
    provides interface ResourceConfigure[ uint8_t id ];
!   provides interface UartStream[ uint8_t id ];
!   provides interface UartByte[ uint8_t id ];

    uses interface Resource as UsartResource[ uint8_t id ];
    uses interface Msp430UartConfigure[ uint8_t id ];
    uses interface HplMsp430Usart as Usart;
!   uses interface HplMsp430UsartInterrupts as UsartInterrupts[ uint8_t id ];
    uses interface Counter<T32khz,uint16_t>;
    uses interface Leds;
***************
*** 61,64 ****
--- 61,65 ----
    norace uint16_t m_tx_pos, m_rx_pos;
    norace uint8_t m_byte_time;
+   norace uint8_t current_owner;

    async command error_t Resource.immediateRequest[ uint8_t id ]() {
***************
*** 75,78 ****
--- 76,81 ----

    async command error_t Resource.release[ uint8_t id ]() {
+     if (call UsartResource.isOwner[id]() == FALSE)
+       return FAIL;
      if ( m_rx_buf || m_tx_buf )
        return EBUSY;
***************
*** 91,95 ****
      call Usart.disableIntr();
      call Usart.disableUart();
!     call Usart.resetUsart(FALSE);
    }

--- 94,100 ----
      call Usart.disableIntr();
      call Usart.disableUart();
! 
!     /* leave the usart in reset */
!     //call Usart.resetUsart(FALSE); // this shouldn't be called.
    }

***************
*** 98,112 ****
    }

!   async command error_t UartStream.enableReceiveInterrupt() {
      call Usart.enableRxIntr();
      return SUCCESS;
    }

!   async command error_t UartStream.disableReceiveInterrupt() {
      call Usart.disableRxIntr();
      return SUCCESS;
    }

!   async command error_t UartStream.receive( uint8_t* buf, uint16_t len ) {
      if ( len == 0 )
        return FAIL;
--- 103,123 ----
    }

!   async command error_t UartStream.enableReceiveInterrupt[ uint8_t id ]() {
!     if (call UsartResource.isOwner[id]() == FALSE)
!       return FAIL;
      call Usart.enableRxIntr();
      return SUCCESS;
    }

!   async command error_t UartStream.disableReceiveInterrupt[ uint8_t id ]() {
!     if (call UsartResource.isOwner[id]() == FALSE)
!       return FAIL;
      call Usart.disableRxIntr();
      return SUCCESS;
    }

!   async command error_t UartStream.receive[ uint8_t id ]( uint8_t* buf, uint16_t len ) {
!     if (call UsartResource.isOwner[id]() == FALSE)
!       return FAIL;
      if ( len == 0 )
        return FAIL;
***************
*** 121,125 ****
    }

!   async event void UsartInterrupts.rxDone( uint8_t data ) {
      if ( m_rx_buf ) {
        m_rx_buf[ m_rx_pos++ ] = data;
--- 132,136 ----
    }

!   async event void UsartInterrupts.rxDone[uint8_t id]( uint8_t data ) {
      if ( m_rx_buf ) {
        m_rx_buf[ m_rx_pos++ ] = data;
***************
*** 127,139 ****
  	uint8_t* buf = m_rx_buf;
  	m_rx_buf = NULL;
! 	signal UartStream.receiveDone( buf, m_rx_len, SUCCESS );
        }
!     }
!     else {
!       signal UartStream.receivedByte( data );
      }
    }

!   async command error_t UartStream.send( uint8_t* buf, uint16_t len ) {
      if ( len == 0 )
        return FAIL;
--- 138,151 ----
  	uint8_t* buf = m_rx_buf;
  	m_rx_buf = NULL;
! 	signal UartStream.receiveDone[id]( buf, m_rx_len, SUCCESS );
        }
!     } else {
!       signal UartStream.receivedByte[id]( data );
      }
    }

!   async command error_t UartStream.send[ uint8_t id ]( uint8_t* buf, uint16_t len ) {
!     if (call UsartResource.isOwner[id]() == FALSE)
!       return FAIL;
      if ( len == 0 )
        return FAIL;
***************
*** 143,152 ****
      m_tx_len = len;
      m_tx_pos = 0;
      call Usart.tx( buf[ m_tx_pos++ ] );
      return SUCCESS;
    }

!   async event void UsartInterrupts.txDone() {
!     if ( m_tx_pos < m_tx_len ) {
        call Usart.tx( m_tx_buf[ m_tx_pos++ ] );
      }
--- 155,170 ----
      m_tx_len = len;
      m_tx_pos = 0;
+     current_owner = id;
      call Usart.tx( buf[ m_tx_pos++ ] );
      return SUCCESS;
    }

!   async event void UsartInterrupts.txDone[uint8_t id]() {
!     if(current_owner != id) {
!       uint8_t* buf = m_tx_buf;
!       m_tx_buf = NULL;
!       signal UartStream.sendDone[id]( buf, m_tx_len, FAIL );
!     }
!     else if ( m_tx_pos < m_tx_len ) {
        call Usart.tx( m_tx_buf[ m_tx_pos++ ] );
      }
***************
*** 154,176 ****
        uint8_t* buf = m_tx_buf;
        m_tx_buf = NULL;
!       signal UartStream.sendDone( buf, m_tx_len, SUCCESS );
      }
    }

!     async command error_t UartByte.send( uint8_t data ) {
!       call Usart.clrTxIntr();
!       call Usart.disableTxIntr ();
!       call Usart.tx( data );
!       while( !call Usart.isTxIntrPending() );
!       call Usart.clrTxIntr();
!       call Usart.enableTxIntr();
      return SUCCESS;
    }

!   async command error_t UartByte.receive( uint8_t* byte, uint8_t timeout ) {

      uint16_t timeout_micro = m_byte_time * timeout + 1;
      uint16_t start;

      start = call Counter.get();
      while( !call Usart.isRxIntrPending() ) {
--- 172,198 ----
        uint8_t* buf = m_tx_buf;
        m_tx_buf = NULL;
!       signal UartStream.sendDone[id]( buf, m_tx_len, SUCCESS );
      }
    }

!   async command error_t UartByte.send[ uint8_t id ]( uint8_t data ) {
!     if (call UsartResource.isOwner[id]() == FALSE)
!       return FAIL;
!     call Usart.clrTxIntr();
!     call Usart.disableTxIntr ();
!     call Usart.tx( data );
!     while( !call Usart.isTxIntrPending() );
!     call Usart.clrTxIntr();
!     call Usart.enableTxIntr();
      return SUCCESS;
    }

!   async command error_t UartByte.receive[ uint8_t id ]( uint8_t* byte, uint8_t timeout ) {

      uint16_t timeout_micro = m_byte_time * timeout + 1;
      uint16_t start;

+     if (call UsartResource.isOwner[id]() == FALSE)
+       return FAIL;
      start = call Counter.get();
      while( !call Usart.isRxIntrPending() ) {
***************
*** 195,197 ****
--- 217,223 ----

    default event void Resource.granted[ uint8_t id ]() {}
+ 
+   default async event void UartStream.sendDone[ uint8_t id ](uint8_t* buf, uint16_t len, error_t error) {}
+   default async event void UartStream.receivedByte[ uint8_t id ](uint8_t byte) {}
+   default async event void UartStream.receiveDone[ uint8_t id ]( uint8_t* buf, uint16_t len, error_t error ) {}
  }

Index: Msp430Usart0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Usart0C.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430Usart0C.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430Usart0C.nc	21 May 2008 22:11:57 -0000	1.5
***************
*** 40,43 ****
--- 40,44 ----

    provides interface Resource;
+   provides interface ResourceRequested;
    provides interface ArbiterInfo;
    provides interface HplMsp430Usart;
***************
*** 61,64 ****
--- 62,66 ----

    Resource = UsartShareP.Resource[ CLIENT_ID ];
+   ResourceRequested = UsartShareP.ResourceRequested[ CLIENT_ID ];
    ResourceConfigure = UsartShareP.ResourceConfigure[ CLIENT_ID ];
    ArbiterInfo = UsartShareP.ArbiterInfo;

Index: Msp430Usart1C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430Usart1C.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430Usart1C.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430Usart1C.nc	21 May 2008 22:11:57 -0000	1.5
***************
*** 41,44 ****
--- 41,45 ----

    provides interface Resource;
+   provides interface ResourceRequested;
    provides interface ArbiterInfo;
    provides interface HplMsp430Usart;
***************
*** 57,60 ****
--- 58,62 ----

    Resource = UsartShareP.Resource[ CLIENT_ID ];
+   ResourceRequested = UsartShareP.ResourceRequested[ CLIENT_ID ];
    ResourceConfigure = UsartShareP.ResourceConfigure[ CLIENT_ID ];
    ArbiterInfo = UsartShareP.ArbiterInfo;

Index: Msp430UsartShare0P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430UsartShare0P.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430UsartShare0P.nc	12 Dec 2006 18:23:11 -0000	1.4
--- Msp430UsartShare0P.nc	21 May 2008 22:11:57 -0000	1.5
***************
*** 40,43 ****
--- 40,44 ----
    provides interface HplMsp430I2CInterrupts as I2CInterrupts[ uint8_t id ];
    provides interface Resource[ uint8_t id ];
+   provides interface ResourceRequested[ uint8_t id ];
    provides interface ArbiterInfo;

***************
*** 53,56 ****
--- 54,58 ----
    components new FcfsArbiterC( MSP430_HPLUSART0_RESOURCE ) as ArbiterC;
    Resource = ArbiterC;
+   ResourceRequested = ArbiterC;
    ResourceConfigure = ArbiterC;
    ArbiterInfo = ArbiterC;

Index: Msp430UsartShare1P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Msp430UsartShare1P.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430UsartShare1P.nc	4 Feb 2007 19:55:12 -0000	1.5
--- Msp430UsartShare1P.nc	21 May 2008 22:11:57 -0000	1.6
***************
*** 40,43 ****
--- 40,44 ----
    provides interface HplMsp430UsartInterrupts as Interrupts[ uint8_t id ];
    provides interface Resource[ uint8_t id ];
+   provides interface ResourceRequested[ uint8_t id ];
    provides interface ArbiterInfo;

***************
*** 53,56 ****
--- 54,58 ----
    components new FcfsArbiterC( MSP430_HPLUSART1_RESOURCE ) as ArbiterC;
    Resource = ArbiterC;
+   ResourceRequested = ArbiterC;
    ResourceConfigure = ArbiterC;
    ArbiterInfo = ArbiterC;