Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / iris / chips / rf230 / HplRF230C.nc

diff --git a/tos/platforms/iris/chips/rf230/HplRF230C.nc b/tos/platforms/iris/chips/rf230/HplRF230C.nc
index 91962f7ea93d366f6f3cc12b3033be748c73693c..dd4285a4dfcd6010b16dd48bf20bb7b989f1f624 100644 (file)
--- a/tos/platforms/iris/chips/rf230/HplRF230C.nc
+++ b/tos/platforms/iris/chips/rf230/HplRF230C.nc
@@ -21,7 +21,7 @@
  * Author: Miklos Maroti
  */
 
-#include <HplRF230.h>
+#include <RadioConfig.h>
 
 configuration HplRF230C
 {
@@ -29,15 +29,14 @@ configuration HplRF230C
        {
                interface GeneralIO as SELN;
                interface Resource as SpiResource;
-               interface SpiByte;
+               interface FastSpiByte;
 
                interface GeneralIO as SLP_TR;
                interface GeneralIO as RSTN;
 
                interface GpioCapture as IRQ;
-               interface Alarm<TRF230, uint16_t> as Alarm;
-
-               interface HplRF230;
+               interface Alarm<TRadio, uint16_t> as Alarm;
+               interface LocalTime<TRadio> as LocalTimeRadio;
        }
 }
 
@@ -51,9 +50,7 @@ implementation
        
        components Atm128SpiC as SpiC;
        SpiResource = SpiC.Resource[unique("Atm128SpiC.Resource")];
-       SpiByte = SpiC;
-
-       HplRF230 = HplRF230P;
+       FastSpiByte = SpiC;
 
        components HplAtm128GeneralIOC as IO;
        SLP_TR = IO.PortB7;
@@ -68,4 +65,7 @@ implementation
 
        components RealMainP;
        RealMainP.PlatformInit -> HplRF230P.PlatformInit;
+
+       components LocalTimeMicroC;
+       LocalTimeRadio = LocalTimeMicroC;
 }