re-work to reflect sfd remapping to interrupt-driven implementation

instead of unavailable capture pin default.

diff --git a/tos/platforms/shimmer2/chips/cc2420/HplCC2420InterruptsC.nc b/tos/platforms/shimmer2/chips/cc2420/HplCC2420InterruptsC.nc
index c1227f3439434a35532817217e9faf99aa66118f..d6fc32726155f91f81e96ca00962902975016da3 100644 (file)
--- a/tos/platforms/shimmer2/chips/cc2420/HplCC2420InterruptsC.nc
+++ b/tos/platforms/shimmer2/chips/cc2420/HplCC2420InterruptsC.nc
@@ -46,6 +46,8 @@
 configuration HplCC2420InterruptsC {
 
   provides interface GpioCapture as CaptureSFD;
+  provides interface GpioInterrupt as InterruptSFD;
+
   provides interface GpioInterrupt as InterruptCCA;
   provides interface GpioInterrupt as InterruptFIFOP;
 
@@ -53,20 +55,26 @@ configuration HplCC2420InterruptsC {
 
 implementation {
 
-  components HplMsp430GeneralIOC as GeneralIOC;
-  components Msp430TimerC;
-  components new GpioCaptureC() as CaptureSFDC;
-  CaptureSFDC.Msp430TimerControl -> Msp430TimerC.ControlA1;
-  CaptureSFDC.Msp430Capture -> Msp430TimerC.CaptureA1;
-  CaptureSFDC.GeneralIO -> GeneralIOC.Port10;
-
   components HplMsp430InterruptC;
   components new Msp430InterruptC() as InterruptCCAC;
   components new Msp430InterruptC() as InterruptFIFOPC;
+  components new Msp430InterruptC() as InterruptSFDC;
+
   InterruptCCAC.HplInterrupt -> HplMsp430InterruptC.Port27;
   InterruptFIFOPC.HplInterrupt -> HplMsp430InterruptC.Port12;
+  InterruptSFDC.HplInterrupt -> HplMsp430InterruptC.Port10;
+
+  components HplCC2420InterruptsP;
+  components LocalTimeMilliC;
+  components new GpioCaptureC() as CaptureSFDC;
+  components HplCC2420PinsC;
+
+  CaptureSFD = HplCC2420InterruptsP.CaptureSFD;
+
+  HplCC2420InterruptsP.InterruptSFD ->  InterruptSFDC.Interrupt;
+  HplCC2420InterruptsP.LocalTime     -> LocalTimeMilliC;
 
-  CaptureSFD = CaptureSFDC.Capture;
   InterruptCCA = InterruptCCAC.Interrupt;
   InterruptFIFOP = InterruptFIFOPC.Interrupt;
+  InterruptSFD = InterruptSFDC.Interrupt;
 }