[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/mac/tkn154 DataP.nc, 1.5, 1.6 DispatchSlottedCsmaP.nc, 1.3, 1.4 DispatchUnslottedCsmaP.nc, 1.5, 1.6 TKN154BeaconEnabledP.nc, 1.3, 1.4 TKN154NonBeaconEnabledP.nc, 1.4, 1.5

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15648/tos/lib/mac/tkn154

Modified Files:
	DataP.nc DispatchSlottedCsmaP.nc DispatchUnslottedCsmaP.nc 
	TKN154BeaconEnabledP.nc TKN154NonBeaconEnabledP.nc 
Log Message:
Indirect transmissions in nonbeacon-enabled PANs on coordinator side were not properly handed in DataP - fixed that. Did some cosmetic changes.

Index: DataP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/DataP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataP.nc	17 Apr 2009 14:47:09 -0000	1.5
--- DataP.nc	28 Apr 2009 14:12:03 -0000	1.6
***************
*** 43,47 ****
      interface MCPS_PURGE;
    } uses {
-     interface GetNow<bool> as IsSendingBeacons;
      interface FrameRx as CoordCapRx;
      interface FrameTx as DeviceCapTx;
--- 43,46 ----
***************
*** 146,150 ****
        // 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) {
--- 145,148 ----
***************
*** 276,279 ****
    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;}
  }
--- 274,276 ----

Index: DispatchSlottedCsmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DispatchSlottedCsmaP.nc	2 Apr 2009 14:02:11 -0000	1.3
--- DispatchSlottedCsmaP.nc	28 Apr 2009 14:12:03 -0000	1.4
***************
*** 57,64 ****
   */
  
- #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)
  {
--- 57,60 ----

Index: DispatchUnslottedCsmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DispatchUnslottedCsmaP.nc	17 Apr 2009 14:47:09 -0000	1.5
--- DispatchUnslottedCsmaP.nc	28 Apr 2009 14:12:04 -0000	1.6
***************
*** 47,54 ****
   */
  
- #if IEEE154_BEACON_ENABLED_PAN
- #error "The IEEE154_BEACON_ENABLED_PAN macro MUST NOT be set when using this component!"
- #endif
- 
  module DispatchUnslottedCsmaP
  {
--- 47,50 ----

Index: TKN154BeaconEnabledP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/TKN154BeaconEnabledP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TKN154BeaconEnabledP.nc	24 Mar 2009 12:56:47 -0000	1.3
--- TKN154BeaconEnabledP.nc	28 Apr 2009 14:12:04 -0000	1.4
***************
*** 326,330 ****
    /* ------------------ Data Transmission (MCPS-DATA) ------------------- */
  
-   DataP.IsSendingBeacons -> BeaconTransmitP.IsSendingBeacons;
    DataP.CoordCapRx -> CoordCap.FrameRx[FC1_FRAMETYPE_DATA]; 
    DataP.DeviceCapTx -> DeviceCapQueue.FrameTx[unique(CAP_TX_CLIENT)];
--- 326,329 ----

Index: TKN154NonBeaconEnabledP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/TKN154NonBeaconEnabledP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TKN154NonBeaconEnabledP.nc	1 Apr 2009 08:50:39 -0000	1.4
--- TKN154NonBeaconEnabledP.nc	28 Apr 2009 14:12:04 -0000	1.5
***************
*** 40,45 ****
  #define IEEE154_BEACON_ENABLED_PAN FALSE
  
- // TODO: check the wiring!!
- 
  configuration TKN154NonBeaconEnabledP
  {
--- 40,43 ----