wiring the wrong resource

diff --git a/tos/chips/cc2420/CC2420ActiveMessageC.nc b/tos/chips/cc2420/CC2420ActiveMessageC.nc
index e80e033d10396b73b876b9fb3ab8524aab61d46b..752d20a4643c589599b814021fede954a96116ca 100644 (file)
--- a/tos/chips/cc2420/CC2420ActiveMessageC.nc
+++ b/tos/chips/cc2420/CC2420ActiveMessageC.nc
@@ -61,7 +61,7 @@ configuration CC2420ActiveMessageC {
 }
 implementation {
   enum {
-    CC2420_AM_SEND_ID     = unique(IEEE154_SEND_CLIENT),
+    CC2420_AM_SEND_ID     = unique(RADIO_SEND_RESOURCE),
   };
 
   components CC2420RadioC as Radio;

diff --git a/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc b/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc
index e96354f0b930016e14191deaf1d08927a499c7b4..8e8061a9f8612aa70623baf49ec567b37092d66b 100644 (file)
--- a/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc
+++ b/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc
@@ -110,6 +110,7 @@ implementation {
     return &hdr->network;
 #else
     // you really can't use BareSend with TFRAMES
+#error "BareSend is not supported with TFRAMES: only the ActiveMessage layer is supported"
 #endif
   }
   
@@ -168,6 +169,7 @@ implementation {
     post grantTask();
 
     if (TINYOS_N_NETWORKS > 1) {
+
       return call Queue.enqueue(id);
     } else {
       if (id == resource_owner) {