From: janhauer <janhauer>
Date: Tue, 28 Apr 2009 14:12:03 +0000 (+0000)
Subject: Indirect transmissions in nonbeacon-enabled PANs on coordinator side were not properl... 
X-Git-Tag: rc_6_tinyos_2_1_1~401
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=f55c745db4317742cc6244950e47b0b824ed0262

Indirect transmissions in nonbeacon-enabled PANs on coordinator side were not properly handed in DataP - fixed that. Did some cosmetic changes.
---

diff --git a/tos/lib/mac/tkn154/DataP.nc b/tos/lib/mac/tkn154/DataP.nc
index 4b541962..146c3b47 100644
--- a/tos/lib/mac/tkn154/DataP.nc
+++ b/tos/lib/mac/tkn154/DataP.nc
@@ -42,7 +42,6 @@ module DataP
     interface MCPS_DATA; 
     interface MCPS_PURGE;
   } uses {
-    interface GetNow<bool> as IsSendingBeacons;
     interface FrameRx as CoordCapRx;
     interface FrameTx as DeviceCapTx;
     interface FrameTx as CoordCapTx;
@@ -145,7 +144,6 @@ implementation
 
       // indirect transmission?
       } else if ((txOptions & TX_OPTIONS_INDIRECT) && 
-          call IsSendingBeacons.getNow() && 
           (dstAddrMode >= ADDR_MODE_SHORT_ADDRESS)) {
         if (dstAddrMode == ADDR_MODE_SHORT_ADDRESS && dstAddr.shortAddress == 0xFFFF) {
           mhr[MHR_INDEX_FC1] &= ~FC1_ACK_REQUEST;
@@ -275,5 +273,4 @@ implementation
   default command ieee154_status_t DeviceCfpTx.transmit(ieee154_txframe_t *data) {return IEEE154_INVALID_GTS;}
   default command ieee154_status_t BroadcastTx.transmit(ieee154_txframe_t *data) {return IEEE154_INVALID_PARAMETER;}
   default command ieee154_status_t CoordCfpTx.transmit(ieee154_txframe_t *data) {return IEEE154_INVALID_GTS;}
-  default async command bool IsSendingBeacons.getNow() {return FALSE;}
 }
diff --git a/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc b/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc
index 7492d540..eccccc19 100644
--- a/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc
+++ b/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc
@@ -56,10 +56,6 @@
  * typically switch the radio off unless it has a frame to transmit.
  */
 
-#ifndef IEEE154_BEACON_ENABLED_PAN
-#error "The IEEE154_BEACON_ENABLED_PAN macro MUST be defined when using this component!"
-#endif
-
 generic module DispatchSlottedCsmaP(uint8_t sfDirection)
 {
   provides
diff --git a/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc b/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc
index d0baa381..53ebe948 100644
--- a/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc
+++ b/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc
@@ -46,10 +46,6 @@
  * not part of the MAC implementation but of the chip-specific radio driver.
  */
 
-#if IEEE154_BEACON_ENABLED_PAN
-#error "The IEEE154_BEACON_ENABLED_PAN macro MUST NOT be set when using this component!"
-#endif
-
 module DispatchUnslottedCsmaP
 {
   provides
diff --git a/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc b/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc
index 4b1b307a..a04bfea8 100644
--- a/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc
+++ b/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc
@@ -325,7 +325,6 @@ implementation
 
   /* ------------------ Data Transmission (MCPS-DATA) ------------------- */
 
-  DataP.IsSendingBeacons -> BeaconTransmitP.IsSendingBeacons;
   DataP.CoordCapRx -> CoordCap.FrameRx[FC1_FRAMETYPE_DATA]; 
   DataP.DeviceCapTx -> DeviceCapQueue.FrameTx[unique(CAP_TX_CLIENT)];
   DataP.CoordCapTx -> CoordCapQueue.FrameTx[unique(CAP_TX_CLIENT)];
diff --git a/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc b/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc
index 90c37311..e5b79176 100644
--- a/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc
+++ b/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc
@@ -39,8 +39,6 @@
 
 #define IEEE154_BEACON_ENABLED_PAN FALSE
 
-// TODO: check the wiring!!
-
 configuration TKN154NonBeaconEnabledP
 {
   provides