X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fcc2420%2Flowpan%2FCC2420TinyosNetworkP.nc;h=8e8061a9f8612aa70623baf49ec567b37092d66b;hb=d30405c532321fd306f685545094c57132123e94;hp=bdfaee95b8e5b50695cde2cdf8f33c75b76418bb;hpb=5196ea6d34543eff9e48c94d99882acc8e61f8f7;p=tinyos-2.x.git diff --git a/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc b/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc index bdfaee95..8e8061a9 100644 --- a/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc +++ b/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc @@ -65,7 +65,7 @@ implementation { enum { OWNER_NONE = 0xff, - TINYOS_N_NETWORKS = uniqueCount("RADIO_SEND_RESOURCE"), + TINYOS_N_NETWORKS = uniqueCount(RADIO_SEND_RESOURCE), } state; norace uint8_t resource_owner = OWNER_NONE, next_owner; @@ -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) {