Merge over into the trunk.

[tinyos-2.x.git] / tos / chips / tda5250 / Tda5250RadioC.nc

diff --git a/tos/chips/tda5250/Tda5250RadioC.nc b/tos/chips/tda5250/Tda5250RadioC.nc
index 467336ad8eb8b4fddf533e503cf690f94403108f..22282c5e196e37019cfe058a71ecafb2a1818bce 100644 (file)
--- a/tos/chips/tda5250/Tda5250RadioC.nc
+++ b/tos/chips/tda5250/Tda5250RadioC.nc
@@ -44,6 +44,7 @@ configuration Tda5250RadioC {
   provides {
     interface SplitControl;
     interface Tda5250Control;
+    interface ResourceRequested;
     interface RadioByteComm;
   }
 }
@@ -51,7 +52,7 @@ implementation {
   components Tda5250RadioP
            , HplTda5250ConfigC
            , HplTda5250DataC
-           , new Alarm32khzC() as DelayTimer
+           , new Alarm32khz16C() as DelayTimer
            , MainC;
 
   MainC.SoftwareInit -> HplTda5250ConfigC;
@@ -59,14 +60,18 @@ implementation {
   MainC.SoftwareInit -> Tda5250RadioP;
            
   Tda5250Control = Tda5250RadioP;
+  ResourceRequested = Tda5250RadioP;
   RadioByteComm = Tda5250RadioP;
   SplitControl = Tda5250RadioP;
 
-  Tda5250RadioP.DelayTimer -> DelayTimer.Alarm32khz16;
+  Tda5250RadioP.DelayTimer -> DelayTimer;
   
   Tda5250RadioP.ConfigResource -> HplTda5250ConfigC;
   Tda5250RadioP.DataResource -> HplTda5250DataC;
-
+  Tda5250RadioP.DataResourceRequested -> HplTda5250DataC;
+  
   Tda5250RadioP.HplTda5250Config -> HplTda5250ConfigC;
   Tda5250RadioP.HplTda5250Data -> HplTda5250DataC;
+       Tda5250RadioP.HplTda5250DataControl -> HplTda5250DataC;
+
 }