From: janhauer <janhauer>
Date: Thu, 24 Jul 2008 11:06:23 +0000 (+0000)
Subject: Added a note to README that MAC interface naming deviates from TEP3 recommended pract... 
X-Git-Tag: release_tinyos_2_1_0_0~35
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=0bb0714d9edef64cc5a201f492e4d4ba9ed29fe9

Added a note to README that MAC interface naming deviates from TEP3 recommended practise. Fixed a timing issue.
---

diff --git a/apps/tests/tkn154/README.txt b/apps/tests/tkn154/README.txt
index a515e9ae..eb945797 100644
--- a/apps/tests/tkn154/README.txt
+++ b/apps/tests/tkn154/README.txt
@@ -9,6 +9,10 @@ separate subdirectory which includes a README.txt describing what it does and
 how it can be installed, respectively.
 
 The TKN15.4 implementation can be found in tinyos-2.x/tos/lib/mac/tkn154.
+Note: TEP3 recommends that interface names "should be mixed case, starting
+upper case". To match the syntax used in the IEEE 802.15.4 standard the
+interfaces provided by the MAC to the next higher layer deviate from this
+convention (they are all caps, e.g. MLME_START).
 
 $Id$o
 
diff --git a/tos/lib/mac/tkn154/BeaconSynchronizeP.nc b/tos/lib/mac/tkn154/BeaconSynchronizeP.nc
index 29de0273..e7c39110 100644
--- a/tos/lib/mac/tkn154/BeaconSynchronizeP.nc
+++ b/tos/lib/mac/tkn154/BeaconSynchronizeP.nc
@@ -346,7 +346,7 @@ implementation
       call Debug.log(LEVEL_INFO, SyncP_BEACON_RX, m_lastBeaconRxTime, timestamp, mhr[2]);
       m_numGtsSlots = (payload[2] & 7);
       gtsFieldLength = 1 + ((m_numGtsSlots > 0) ? 1 + m_numGtsSlots * 3: 0);
-      m_lastBeaconRxTime = timestamp + IEEE154_SYNC_SYMBOL_OFFSET - IEEE154_SYMBOLS_PER_OCTET - IEEE154_PREAMBLE_LENGTH;
+      m_lastBeaconRxTime = timestamp;
       m_finalCapSlot = (payload[1] & 0x0F);
       m_sfSlotDuration = (((uint32_t) 1) << ((payload[0] & 0xF0) >> 4)) * IEEE154_aBaseSlotDuration;
       memcpy(m_gtsField, &payload[2], gtsFieldLength);
diff --git a/tos/lib/mac/tkn154/README.txt b/tos/lib/mac/tkn154/README.txt
index c94d0190..e9b4bd3e 100644
--- a/tos/lib/mac/tkn154/README.txt
+++ b/tos/lib/mac/tkn154/README.txt
@@ -18,7 +18,7 @@ missing functionality:
 
 missing documentation:
 - overview on the architecture of TKN15.4
-- porting TKN15.4 to a new platform
+- guidance on porting TKN15.4 to a new platform
 - ...
 
 Implementation 
@@ -30,6 +30,11 @@ CC2420 driver: tinyos-2.x/tos/chips/cc2420_tkn154
 TelosB "platform glue" code: tinyos-2.x/tos/platforms/telosb/mac/tkn154
 Example applications: tinyos-2.x/apps/tests/tkn154
 
+Note: TEP3 recommends that interface names "should be mixed case, starting
+upper case". To match the syntax used in the IEEE 802.15.4 standard the
+interfaces provided by the MAC to the next higher layer deviate from this
+convention (they are all caps, e.g. MLME_START).
+
 Copyright
 ---------