[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/mac/tkn154 BeaconSynchronizeP.nc, 1.3, 1.4 README.txt, 1.2, 1.3

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9781/tos/lib/mac/tkn154

Modified Files:
	BeaconSynchronizeP.nc README.txt 
Log Message:
Added a note to README that MAC interface naming deviates from TEP3 recommended practise. Fixed a timing issue.

Index: BeaconSynchronizeP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/BeaconSynchronizeP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BeaconSynchronizeP.nc	25 Jun 2008 10:19:02 -0000	1.3
--- BeaconSynchronizeP.nc	24 Jul 2008 11:06:24 -0000	1.4
***************
*** 347,351 ****
        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_finalCapSlot = (payload[1] & 0x0F);
        m_sfSlotDuration = (((uint32_t) 1) << ((payload[0] & 0xF0) >> 4)) * IEEE154_aBaseSlotDuration;
--- 347,351 ----
        m_numGtsSlots = (payload[2] & 7);
        gtsFieldLength = 1 + ((m_numGtsSlots > 0) ? 1 + m_numGtsSlots * 3: 0);
!       m_lastBeaconRxTime = timestamp;
        m_finalCapSlot = (payload[1] & 0x0F);
        m_sfSlotDuration = (((uint32_t) 1) << ((payload[0] & 0xF0) >> 4)) * IEEE154_aBaseSlotDuration;

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README.txt	18 Jun 2008 15:39:32 -0000	1.2
--- README.txt	24 Jul 2008 11:06:24 -0000	1.3
***************
*** 19,23 ****
  missing documentation:
  - overview on the architecture of TKN15.4
! - porting TKN15.4 to a new platform
  - ...
  
--- 19,23 ----
  missing documentation:
  - overview on the architecture of TKN15.4
! - guidance on porting TKN15.4 to a new platform
  - ...
  
***************
*** 31,34 ****
--- 31,39 ----
  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
  ---------