From: ayer1 <ayer1>
Date: Wed, 20 Jan 2010 17:55:39 +0000 (+0000)
Subject: re-work to reflect sfd remapping to interrupt-driven implementation
X-Git-Tag: rc_6_tinyos_2_1_1~51
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=c7c66d524f01bd188feb955638247a9501249733

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 c1227f34..d6fc3272 100644
--- 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;
 }