generic NeighborhoodC (for multiple independent rfxlink) - resolves t…

…inyos#273
zmanchun · Mar 24, 2015 · 8bb461d · 8bb461d
1 parent 726bb95
commit 8bb461d
Show file tree

Hide file tree

Showing 43 changed files with 183 additions and 2,323 deletions.
diff --git a/support/make/platforms/ucprotonb.platform b/support/make/platforms/ucprotonb.platform
@@ -3,7 +3,6 @@
 PFLAGS += -I%T/platforms/ucprotonb
 PFLAGS += -I%T/platforms/ucprotonb/chips/stm25p
 PFLAGS += -I%T/platforms/ucprotonb/chips/rf212
-#PFLAGS += -I%T/platforms/ucprotonb/chips/doubleradio
 PFLAGS += -I%T/chips/atm128rfa1
 PFLAGS += -I%T/chips/atm128rfa1/adc
 PFLAGS += -I%T/chips/atm128rfa1/pins

diff --git a/tos/chips/atm128rfa1/radio/RFA1RadioC.nc b/tos/chips/atm128rfa1/radio/RFA1RadioC.nc
@@ -101,10 +101,16 @@ implementation
 {
 	#define UQ_METADATA_FLAGS	"UQ_RFA1_METADATA_FLAGS"
 	#define UQ_RADIO_ALARM		"UQ_RFA1_RADIO_ALARM"
+	#define UQ_NEIGHBORHOOD_FLAG "UQ_RFA1_NEIGHBORHOOD_FLAG"
 
 // -------- TaskleC
 
 	components new TaskletC();
+
+
+// -------- NeighborhoodC
+
+	components new NeighborhoodC(RFA1_NEIGHBORHOOD_SIZE);
 
 
 // -------- RadioP
@@ -218,9 +224,11 @@ implementation
 
 // -------- UniqueLayer Send part (wired twice)
 
-	components new UniqueLayerC();
+	components new UniqueLayerC(RFA1_NEIGHBORHOOD_SIZE);
 	UniqueLayerC.Config -> RadioP;
 	UniqueLayerC.SubSend -> PacketLinkLayerC;
+	UniqueLayerC.Neighborhood -> NeighborhoodC;
+	UniqueLayerC.NeighborhoodFlag -> NeighborhoodC.NeighborhoodFlag[unique(UQ_NEIGHBORHOOD_FLAG)];
 
 // -------- Packet Link
 

diff --git a/tos/chips/cc2420x/CC2420XRadioC.nc b/tos/chips/cc2420x/CC2420XRadioC.nc
@@ -79,11 +79,16 @@ implementation
 {
 	#define UQ_METADATA_FLAGS	"UQ_CC2420X_METADATA_FLAGS"
 	#define UQ_RADIO_ALARM		"UQ_CC2420X_RADIO_ALARM"
+	#define UQ_NEIGHBORHOOD_FLAG "UQ_CC2420X_NEIGHBORHOOD_FLAG"
 
 // -------- TaskleC
 
 	components new TaskletC();
 
+// -------- NeighborhoodC
+
+	components new NeighborhoodC(CC2420X_NEIGHBORHOOD_SIZE);
+
 // -------- RadioP
 
 	components CC2420XRadioP as RadioP;
@@ -172,9 +177,11 @@ implementation
 
 // -------- UniqueLayer Send part (wired twice)
 
-	components new UniqueLayerC();
+	components new UniqueLayerC(CC2420X_NEIGHBORHOOD_SIZE);
 	UniqueLayerC.Config -> RadioP;
 	UniqueLayerC.SubSend -> PacketLinkLayerC;
+	UniqueLayerC.Neighborhood -> NeighborhoodC;
+	UniqueLayerC.NeighborhoodFlag -> NeighborhoodC.NeighborhoodFlag[unique(UQ_NEIGHBORHOOD_FLAG)];
 
 // -------- Packet Link
 

diff --git a/tos/chips/cc2520/CC2520RadioC.nc b/tos/chips/cc2520/CC2520RadioC.nc
@@ -93,11 +93,16 @@ implementation
 {
 #define UQ_METADATA_FLAGS "UQ_CC2520_METADATA_FLAGS"
 #define UQ_RADIO_ALARM    "UQ_CC2520_RADIO_ALARM"
+#define UQ_NEIGHBORHOOD_FLAG "UQ_CC2520_NEIGHBORHOOD_FLAG"
 
 // -------- TaskleC
 
 	components new TaskletC();
 
+// -------- NeighborhoodC
+
+	components new NeighborhoodC(CC2520_NEIGHBORHOOD_SIZE);
+
 // -------- RadioP
 
 	components CC2520RadioP as RadioP;
@@ -186,9 +191,12 @@ implementation
 
 // -------- UniqueLayer Send part (wired twice)
 
-	components new UniqueLayerC();
+	components new UniqueLayerC(CC2520_NEIGHBORHOOD_SIZE);
 	UniqueLayerC.Config -> RadioP;
 	UniqueLayerC.SubSend -> PacketLinkLayerC;
+	UniqueLayerC.Neighborhood -> NeighborhoodC;
+	UniqueLayerC.NeighborhoodFlag -> NeighborhoodC.NeighborhoodFlag[unique(UQ_NEIGHBORHOOD_FLAG)];
+
 
 // -------- Packet Link
 

diff --git a/tos/chips/rf212/RF212RadioC.nc b/tos/chips/rf212/RF212RadioC.nc
@@ -90,11 +90,16 @@ implementation
 {
 	#define UQ_METADATA_FLAGS	"UQ_RF212_METADATA_FLAGS"
 	#define UQ_RADIO_ALARM		"UQ_RF212_RADIO_ALARM"
+	#define UQ_NEIGHBORHOOD_FLAG "UQ_RF212_NEIGHBORHOOD_FLAG"
 
 // -------- TaskleC
 
 	components new TaskletC();
 
+// -------- NeighborhoodC
+
+	components new NeighborhoodC(RF212_NEIGHBORHOOD_SIZE);
+
 // -------- RadioP
 
 	components RF212RadioP as RadioP;
@@ -183,9 +188,11 @@ implementation
 
 // -------- UniqueLayer Send part (wired twice)
 
-	components new UniqueLayerC();
+	components new UniqueLayerC(RF212_NEIGHBORHOOD_SIZE);
 	UniqueLayerC.Config -> RadioP;
 	UniqueLayerC.SubSend -> PacketLinkLayerC;
+	UniqueLayerC.Neighborhood -> NeighborhoodC;
+	UniqueLayerC.NeighborhoodFlag -> NeighborhoodC.NeighborhoodFlag[unique(UQ_NEIGHBORHOOD_FLAG)];
 
 // -------- Packet Link
 

diff --git a/tos/chips/rf230/RF230RadioC.nc b/tos/chips/rf230/RF230RadioC.nc
@@ -100,11 +100,16 @@ implementation
 {
 	#define UQ_METADATA_FLAGS	"UQ_RF230_METADATA_FLAGS"
 	#define UQ_RADIO_ALARM		"UQ_RF230_RADIO_ALARM"
+	#define UQ_NEIGHBORHOOD_FLAG "UQ_RF230_NEIGHBORHOOD_FLAG"
 
 // -------- TaskleC
 
 	components new TaskletC();
 
+// -------- NeighborhoodC
+
+	components new NeighborhoodC(RF230_NEIGHBORHOOD_SIZE);
+
 // -------- RadioP
 
 	components RF230RadioP as RadioP;
@@ -216,9 +221,12 @@ implementation
 
 // -------- UniqueLayer Send part (wired twice)
 
-	components new UniqueLayerC();
+	components new UniqueLayerC(RF230_NEIGHBORHOOD_SIZE);
 	UniqueLayerC.Config -> RadioP;
 	UniqueLayerC.SubSend -> PacketLinkLayerC;
+	UniqueLayerC.Neighborhood -> NeighborhoodC;
+	UniqueLayerC.NeighborhoodFlag -> NeighborhoodC.NeighborhoodFlag[unique(UQ_NEIGHBORHOOD_FLAG)];
+
 
 // -------- Packet Link
 

diff --git a/tos/lib/rfxlink/layers/UniqueLayerC.nc b/tos/lib/rfxlink/layers/UniqueLayerC.nc
@@ -32,7 +32,7 @@
  * Author: Miklos Maroti
  */
 
-generic configuration UniqueLayerC()
+generic configuration UniqueLayerC(uint8_t neigborhoodSize)
 {
 	provides
 	{
@@ -46,16 +46,19 @@ generic configuration UniqueLayerC()
 		interface RadioReceive as SubReceive;
 
 		interface UniqueConfig as Config;
+
+		interface Neighborhood;
+		interface NeighborhoodFlag;
 	}
 }
 
 implementation
 {
-	components new UniqueLayerP(), MainC, NeighborhoodC, new NeighborhoodFlagC();
+	components new UniqueLayerP(neigborhoodSize), MainC;
 
 	MainC.SoftwareInit -> UniqueLayerP;
-	UniqueLayerP.Neighborhood -> NeighborhoodC;
-	UniqueLayerP.NeighborhoodFlag -> NeighborhoodFlagC;
+	Neighborhood = UniqueLayerP.Neighborhood;
+	NeighborhoodFlag = UniqueLayerP.NeighborhoodFlag;
 
 	Send = UniqueLayerP;
 	SubSend = UniqueLayerP;

diff --git a/tos/lib/rfxlink/layers/UniqueLayerP.nc b/tos/lib/rfxlink/layers/UniqueLayerP.nc
@@ -33,9 +33,8 @@
  */
 
 #include <Tasklet.h>
-#include <Neighborhood.h>
 
-generic module UniqueLayerP()
+generic module UniqueLayerP(uint8_t neigborhoodSize)
 {
 	provides
 	{
@@ -88,7 +87,7 @@ implementation
 		return signal RadioReceive.header(msg);
 	}
 
-	tasklet_norace uint8_t receivedNumbers[NEIGHBORHOOD_SIZE];
+	tasklet_norace uint8_t receivedNumbers[neigborhoodSize];
 
 	tasklet_async event message_t* SubReceive.receive(message_t* msg)
 	{

diff --git a/tos/lib/rfxlink/util/Neighborhood.h b/tos/lib/rfxlink/util/Neighborhood.h
diff --git a/tos/lib/rfxlink/util/NeighborhoodC.nc b/tos/lib/rfxlink/util/NeighborhoodC.nc
@@ -32,15 +32,17 @@
  * Author: Miklos Maroti
  */
 
-configuration NeighborhoodC
+generic configuration NeighborhoodC(uint8_t size)
 {
 	provides interface Neighborhood;
+	provides interface NeighborhoodFlag[uint8_t bit];
 }
 
 implementation
 {
-	components NeighborhoodP, MainC;
+	components new NeighborhoodP(size), MainC;
 
 	Neighborhood = NeighborhoodP;
+	NeighborhoodFlag = NeighborhoodP;
 	MainC.SoftwareInit -> NeighborhoodP;
 }
diff --git a/tos/lib/rfxlink/util/NeighborhoodFlagC.nc b/tos/lib/rfxlink/util/NeighborhoodFlagC.nc
diff --git a/tos/lib/rfxlink/util/NeighborhoodP.nc b/tos/lib/rfxlink/util/NeighborhoodP.nc
@@ -32,9 +32,7 @@
  * Author: Miklos Maroti
  */
 
-#include <Neighborhood.h>
-
-module NeighborhoodP
+generic module NeighborhoodP(uint8_t size)
 {
 	provides
 	{
@@ -46,17 +44,17 @@ module NeighborhoodP
 
 implementation
 {
-	tasklet_norace am_addr_t nodes[NEIGHBORHOOD_SIZE];
-	tasklet_norace uint8_t ages[NEIGHBORHOOD_SIZE];
-	tasklet_norace uint8_t flags[NEIGHBORHOOD_SIZE];
+	tasklet_norace am_addr_t nodes[size];
+	tasklet_norace uint8_t ages[size];
+	tasklet_norace uint8_t flags[size];
 	tasklet_norace uint8_t time;
 	tasklet_norace uint8_t last;
 
 	command error_t Init.init()
 	{
 		uint8_t i;
 
-		for(i = 0; i < NEIGHBORHOOD_SIZE; ++i)
+		for(i = 0; i < size; ++i)
 			nodes[i] = AM_BROADCAST_ADDR;
 
 		return SUCCESS;
@@ -79,7 +77,7 @@ implementation
 		if( nodes[last] == node )
 			return last;
 
-		for(i = 0; i < NEIGHBORHOOD_SIZE; ++i)
+		for(i = 0; i < size; ++i)
 		{
 			if( nodes[i] == node )
 			{
@@ -109,7 +107,7 @@ implementation
 			uint8_t oldest = 0;
 			maxAge = 0;
 
-			for(i = 0; i < NEIGHBORHOOD_SIZE; ++i)
+			for(i = 0; i < size; ++i)
 			{
 				uint8_t age;
 
@@ -132,7 +130,7 @@ implementation
 				}
 			}
 
-			if( i == NEIGHBORHOOD_SIZE )
+			if( i == size )
 			{
 				signal Neighborhood.evicted(oldest);
 
@@ -145,7 +143,7 @@ implementation
 
 		if( (time & 0x7F) == 0x7F && maxAge >= 0x7F )
 		{
-			for(i = 0; i < NEIGHBORHOOD_SIZE; ++i)
+			for(i = 0; i < size; ++i)
 			{
 				if( (ages[i] | 0x7F) != time )
 					ages[i] = time & 0x80;
@@ -176,7 +174,7 @@ implementation
 
 		bit = ~(1 << bit);
 
-		for(i = 0; i < NEIGHBORHOOD_SIZE; ++i)
+		for(i = 0; i < size; ++i)
 			flags[i] &= bit;
 	}
 }