Small cleanup.

diff --git a/tos/chips/cc2420/control/CC2420ControlC.nc b/tos/chips/cc2420/control/CC2420ControlC.nc
index 8eaf9cabf789da5d301ef6e4c0002cb5dff9ce45..d135199feed800f1d27e56ba5c0ad0d33947c8bf 100644 (file)
--- a/tos/chips/cc2420/control/CC2420ControlC.nc
+++ b/tos/chips/cc2420/control/CC2420ControlC.nc
@@ -59,9 +59,6 @@ implementation {
   components MainC;
   MainC.SoftwareInit -> CC2420ControlP;
   
-  components CC2420ActiveMessageC;
-  CC2420ControlP.AMPacket -> CC2420ActiveMessageC;
-  
   components AlarmMultiplexC as Alarm;
   CC2420ControlP.StartupTimer -> Alarm;
 

diff --git a/tos/chips/cc2420/control/CC2420ControlP.nc b/tos/chips/cc2420/control/CC2420ControlP.nc
index 290ad98ee974e5e5424f085044cdf8629d51ef5c..4ea1382e44e753d18bb8d1bdd49e4ff780c23742 100644 (file)
--- a/tos/chips/cc2420/control/CC2420ControlP.nc
+++ b/tos/chips/cc2420/control/CC2420ControlP.nc
@@ -65,7 +65,6 @@ module CC2420ControlP {
   uses interface CC2420Strobe as SRFOFF;
   uses interface CC2420Strobe as SXOSCOFF;
   uses interface CC2420Strobe as SXOSCON;
-  uses interface AMPacket;
   
   uses interface Resource as SpiResource;
   uses interface Resource as RssiResource;

diff --git a/tos/chips/cc2420/interfaces/CC2420Receive.nc b/tos/chips/cc2420/interfaces/CC2420Receive.nc
index 70230b029cafc13e72f88d696d00330b7088935e..4401e4731308fc5f64db109cbaf5c582328074e1 100644 (file)
--- a/tos/chips/cc2420/interfaces/CC2420Receive.nc
+++ b/tos/chips/cc2420/interfaces/CC2420Receive.nc
@@ -37,6 +37,8 @@
  * @version $Revision$ $Date$
  */
 
+#include "message.h"
+
 interface CC2420Receive {
 
   /**