Replace the special-purpose Msp430UsciConfigure interface with the

[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..a5f8a89c4e1d6619eeaf27973fb3a0f9358f6463 100644 (file)
--- a/tos/chips/msp430/usci/Msp430UartA1C.nc
+++ b/tos/chips/msp430/usci/Msp430UartA1C.nc
@@ -40,7 +40,7 @@
 
 #include "Msp430Usci.h"
 
-configuration Msp430UartA1C {
+generic configuration Msp430UartA1C() {
   provides {
     interface Resource;
     interface ResourceRequested;
@@ -48,7 +48,8 @@ configuration Msp430UartA1C {
     interface UartByte;
     interface ArbiterInfo; /* ??? */
   }
-  uses interface Msp430UsciConfigure;
+  uses interface AsyncConfigure<const msp430_usci_config_t*> as
+    Msp430UsciConfigure;
 }
 implementation {
   enum {
@@ -60,7 +61,7 @@ implementation {
   UartByte = UartP;
   Msp430UsciConfigure = UartP;
 
-  components new Msp430UsciA1C() as UsciC;
+  components Msp430UsciA1C as UsciC;
   Resource = UsciC.Resource[CLIENT_ID];
   ResourceRequested = UsciC.ResourceRequested[CLIENT_ID];
   ArbiterInfo = UsciC.ArbiterInfo;