From: sdhsdh Date: Thu, 11 Feb 2010 04:39:46 +0000 (+0000) Subject: wiring the wrong resource X-Git-Tag: rc_6_tinyos_2_1_1~19 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=d30405c532321fd306f685545094c57132123e94 wiring the wrong resource --- diff --git a/tos/chips/cc2420/CC2420ActiveMessageC.nc b/tos/chips/cc2420/CC2420ActiveMessageC.nc index e80e033d..752d20a4 100644 --- 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 e96354f0..8e8061a9 100644 --- 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) {