rfxlink: remove deprecated ReceiveDefault and SnoopDefault

ReceiveDefault and SnoopDefault were introduced and only used by TosThreads which has been deprecated. Remove vestiges. fixes tinyos#345
zmanchun · Jun 12, 2015 · 905d096 · 905d096
1 parent 1a2292f
commit 905d096
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 94 deletions.
diff --git a/tos/chips/atm128rfa1/radio/RFA1ActiveMessageC.nc b/tos/chips/atm128rfa1/radio/RFA1ActiveMessageC.nc
@@ -49,11 +49,6 @@ configuration RFA1ActiveMessageC
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface Packet;
 		interface AMPacket;
 
@@ -83,10 +78,6 @@ implementation
 	Receive = RadioC.Receive;
 	Snoop = RadioC.Snoop;
 	SendNotifier = RadioC;
-
-	ReceiveDefault = RadioC.ReceiveDefault;
-	SnoopDefault = RadioC.SnoopDefault;
-
 	Packet = RadioC.PacketForActiveMessage;
 	AMPacket = RadioC;
 

diff --git a/tos/chips/atm128rfa1/radio/RFA1RadioC.nc b/tos/chips/atm128rfa1/radio/RFA1RadioC.nc
@@ -56,11 +56,6 @@ configuration RFA1RadioC
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface AMPacket;
 		interface Packet as PacketForActiveMessage;
 #endif
@@ -147,9 +142,6 @@ implementation
 	SendNotifier = ActiveMessageLayerC;
 	AMPacket = ActiveMessageLayerC;
 	PacketForActiveMessage = ActiveMessageLayerC;
-
-	ReceiveDefault = ActiveMessageLayerC.ReceiveDefault;
-	SnoopDefault = ActiveMessageLayerC.SnoopDefault;
 #endif
 
 // -------- Automatic RadioSend Resource

diff --git a/tos/chips/cc2420x/CC2420XActiveMessageC.nc b/tos/chips/cc2420x/CC2420XActiveMessageC.nc
@@ -37,11 +37,6 @@ configuration CC2420XActiveMessageC
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface Packet;
 		interface AMPacket;
 
@@ -79,10 +74,6 @@ implementation
 	Receive = RadioC.Receive;
 	Snoop = RadioC.Snoop;
 	SendNotifier = RadioC;
-
-	ReceiveDefault = RadioC.ReceiveDefault;
-	SnoopDefault = RadioC.SnoopDefault;
-
 	Packet = RadioC.PacketForActiveMessage;
 	AMPacket = RadioC;
 

diff --git a/tos/chips/cc2420x/CC2420XRadioC.nc b/tos/chips/cc2420x/CC2420XRadioC.nc
@@ -34,11 +34,6 @@ configuration CC2420XRadioC
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface AMPacket;
 		interface Packet as PacketForActiveMessage;
 #endif
@@ -123,9 +118,6 @@ implementation
 	SendNotifier = ActiveMessageLayerC;
 	AMPacket = ActiveMessageLayerC;
 	PacketForActiveMessage = ActiveMessageLayerC;
-
-	ReceiveDefault = ActiveMessageLayerC.ReceiveDefault;
-	SnoopDefault = ActiveMessageLayerC.SnoopDefault;
 #endif
 
 // -------- Automatic RadioSend Resource

diff --git a/tos/chips/cc2520/CC2520RadioC.nc b/tos/chips/cc2520/CC2520RadioC.nc
@@ -49,11 +49,6 @@ configuration CC2520RadioC
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface AMPacket;
 		interface Packet as PacketForActiveMessage;
 #endif
@@ -137,9 +132,6 @@ implementation
 	SendNotifier = ActiveMessageLayerC;
 	AMPacket = ActiveMessageLayerC;
 	PacketForActiveMessage = ActiveMessageLayerC;
-
-	ReceiveDefault = ActiveMessageLayerC.ReceiveDefault;
-	SnoopDefault = ActiveMessageLayerC.SnoopDefault;
 #endif
 
 // -------- Automatic RadioSend Resource

diff --git a/tos/chips/rf212/RF212ActiveMessageC.nc b/tos/chips/rf212/RF212ActiveMessageC.nc
@@ -49,10 +49,6 @@ configuration RF212ActiveMessageC
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
 
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface Packet;
 		interface AMPacket;
 
@@ -83,9 +79,6 @@ implementation
 	Snoop = RadioC.Snoop;
 	SendNotifier = RadioC;
 
-	ReceiveDefault = RadioC.ReceiveDefault;
-	SnoopDefault = RadioC.SnoopDefault;
-
 	Packet = RadioC.PacketForActiveMessage;
 	AMPacket = RadioC;
 

diff --git a/tos/chips/rf212/RF212RadioC.nc b/tos/chips/rf212/RF212RadioC.nc
@@ -46,10 +46,6 @@ configuration RF212RadioC
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
 
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface AMPacket;
 		interface Packet as PacketForActiveMessage;
 #endif
@@ -134,9 +130,6 @@ implementation
 	SendNotifier = ActiveMessageLayerC;
 	AMPacket = ActiveMessageLayerC;
 	PacketForActiveMessage = ActiveMessageLayerC;
-
-	ReceiveDefault = ActiveMessageLayerC.ReceiveDefault;
-	SnoopDefault = ActiveMessageLayerC.SnoopDefault;
 #endif
 
 // -------- Automatic RadioSend Resource

diff --git a/tos/chips/rf230/RF230ActiveMessageC.nc b/tos/chips/rf230/RF230ActiveMessageC.nc
@@ -49,10 +49,6 @@ configuration RF230ActiveMessageC
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
 
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface Packet;
 		interface AMPacket;
 
@@ -83,9 +79,6 @@ implementation
 	Snoop = RadioC.Snoop;
 	SendNotifier = RadioC;
 
-	ReceiveDefault = RadioC.ReceiveDefault;
-	SnoopDefault = RadioC.SnoopDefault;
-
 	Packet = RadioC.PacketForActiveMessage;
 	AMPacket = RadioC;
 

diff --git a/tos/chips/rf230/RF230RadioC.nc b/tos/chips/rf230/RF230RadioC.nc
@@ -55,11 +55,6 @@ configuration RF230RadioC
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
-
 		interface AMPacket;
 		interface Packet as PacketForActiveMessage;
 #endif
@@ -144,9 +139,6 @@ implementation
 	SendNotifier = ActiveMessageLayerC;
 	AMPacket = ActiveMessageLayerC;
 	PacketForActiveMessage = ActiveMessageLayerC;
-
-	ReceiveDefault = ActiveMessageLayerC.ReceiveDefault;
-	SnoopDefault = ActiveMessageLayerC.SnoopDefault;
 #endif
 
 // -------- Automatic RadioSend Resource

diff --git a/tos/lib/rfxlink/layers/ActiveMessageLayerC.nc b/tos/lib/rfxlink/layers/ActiveMessageLayerC.nc
@@ -42,10 +42,6 @@ generic configuration ActiveMessageLayerC()
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];	
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
 	}
 
 	uses
@@ -69,9 +65,6 @@ implementation
 	Snoop = ActiveMessageLayerP.Snoop;
 	SendNotifier = ActiveMessageLayerP;
 
-	ReceiveDefault = ActiveMessageLayerP.ReceiveDefault;
-	SnoopDefault = ActiveMessageLayerP.SnoopDefault;
-
 	SubPacket = ActiveMessageLayerP;
 	SubSend = ActiveMessageLayerP;
 	SubReceive = ActiveMessageLayerP;

diff --git a/tos/lib/rfxlink/layers/ActiveMessageLayerP.nc b/tos/lib/rfxlink/layers/ActiveMessageLayerP.nc
@@ -46,10 +46,6 @@ generic module ActiveMessageLayerP()
 		interface Receive[am_id_t id];
 		interface Receive as Snoop[am_id_t id];	
 		interface SendNotifier[am_id_t id];
-
-		// for TOSThreads
-		interface Receive as ReceiveDefault[am_id_t id];
-		interface Receive as SnoopDefault[am_id_t id];
 	}
 
 	uses
@@ -142,22 +138,12 @@ implementation
 
 	default event message_t* Receive.receive[am_id_t id](message_t* msg, void* payload, uint8_t len)
 	{
-		return signal ReceiveDefault.receive[id](msg, payload, len);;
-	}
-
-	default event message_t* ReceiveDefault.receive[am_id_t id](message_t* msg, void* payload, uint8_t len)
-	{
-		return msg;
+                return msg;
 	}
 
 	default event message_t* Snoop.receive[am_id_t id](message_t* msg, void* payload, uint8_t len)
 	{
-		return signal SnoopDefault.receive[id](msg, payload, len);;
-	}
-
-	default event message_t* SnoopDefault.receive[am_id_t id](message_t* msg, void* payload, uint8_t len)
-	{
-		return msg;
+                return msg;
 	}
 
 /*----------------- AMPacket -----------------*/