Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / msp430 / usci / Msp430UartA1C.nc

diff --git a/tos/chips/msp430/usci/Msp430UartA1C.nc b/tos/chips/msp430/usci/Msp430UartA1C.nc
index 558a29b53c7d8a40786668afec42d710055a622c..67a917c3bab2acd9c074c9d4c1c5e43150c05949 100644 (file)
--- a/tos/chips/msp430/usci/Msp430UartA1C.nc
+++ b/tos/chips/msp430/usci/Msp430UartA1C.nc
@@ -26,21 +26,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /**
  * This configuration provides the interface for using USCI_A1 in its UART
  * mode.
  *
- * @author R. Steve McKown <smckown@gmail.com>
+ * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
+
 #if !defined(__MSP430_HAS_USCI_AB0__)
 #error "Target does not have a USCI_A1 peripheral (UART)"
 #endif
 
 #include "Msp430Usci.h"
 
-configuration Msp430UartA1C {
+generic configuration Msp430UartA1C() {
   provides {
     interface Resource;
     interface ResourceRequested;
@@ -48,7 +48,7 @@ configuration Msp430UartA1C {
     interface UartByte;
     interface ArbiterInfo; /* ??? */
   }
-  uses interface Msp430UsciConfigure;
+  uses interface AsyncConfigure<const msp430_usci_uart_t*> as Configure;
 }
 implementation {
   enum {
@@ -58,9 +58,9 @@ implementation {
   components new Msp430UartP() as UartP;
   UartStream = UartP;
   UartByte = UartP;
-  Msp430UsciConfigure = UartP;
+  Configure = UartP;
 
-  components new Msp430UsciA1C() as UsciC;
+  components Msp430UsciA1C as UsciC;
   Resource = UsciC.Resource[CLIENT_ID];
   ResourceRequested = UsciC.ResourceRequested[CLIENT_ID];
   ArbiterInfo = UsciC.ArbiterInfo;