X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2Firis%2Fchips%2Frf230%2FHplRF230C.nc;h=dd4285a4dfcd6010b16dd48bf20bb7b989f1f624;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=65459b40c9aab4bdc5bb11712a4a76a129c375e7;hpb=dfc42b47c11051bae3026948c390e7bbeae4b854;p=tinyos-2.x.git

diff --git a/tos/platforms/iris/chips/rf230/HplRF230C.nc b/tos/platforms/iris/chips/rf230/HplRF230C.nc
index 65459b40..dd4285a4 100644
--- 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,16 +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 LocalTime<TRF230>;
-
-		interface HplRF230;
+		interface Alarm<TRadio, uint16_t> as Alarm;
+		interface LocalTime<TRadio> as LocalTimeRadio;
 	}
 }
 
@@ -50,13 +48,9 @@ implementation
 	HplRF230P.PortCLKM -> IO.PortD6;
 	HplRF230P.PortIRQ -> IO.PortD4;
 	
-	// TODO: Ask why the HplAtm128SpiC does SlaveSelect via PortB0
-	// TODO: Remove the unused started field from Atm128SpiP
 	components Atm128SpiC as SpiC;
 	SpiResource = SpiC.Resource[unique("Atm128SpiC.Resource")];
-	SpiByte = SpiC;
-
-	HplRF230 = HplRF230P;
+	FastSpiByte = SpiC;
 
 	components HplAtm128GeneralIOC as IO;
 	SLP_TR = IO.PortB7;
@@ -72,11 +66,6 @@ implementation
 	components RealMainP;
 	RealMainP.PlatformInit -> HplRF230P.PlatformInit;
 
-	components CounterOne16C;
-	components new TransformCounterC(TRF230, uint32_t, TRF230, uint16_t, 0, uint32_t);
-	components new CounterToLocalTimeC(TRF230);
-
-	LocalTime = CounterToLocalTimeC;
-	CounterToLocalTimeC.Counter -> TransformCounterC;
-	TransformCounterC.CounterFrom -> CounterOne16C;
+	components LocalTimeMicroC;
+	LocalTimeRadio = LocalTimeMicroC;
 }