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

Thu Apr 2 07:02:19 PDT 2009

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

Modified Files:
	DispatchSlottedCsmaP.nc DispatchUnslottedCsmaP.nc README.txt 
Log Message:
updated README.txt, changed a comment

Index: DispatchSlottedCsmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/DispatchSlottedCsmaP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DispatchSlottedCsmaP.nc	24 Mar 2009 12:56:46 -0000	1.2
--- DispatchSlottedCsmaP.nc	2 Apr 2009 14:02:11 -0000	1.3
***************
*** 206,210 ****
        m_currentFrame = NULL;
        m_txStatus = IEEE154_NO_BEACON;
-       dbg_serial("DispatchSlottedCsmaP", "CAP component got token, remaining time: %lu\n");
        post signalTxDoneTask();
        return;
--- 206,209 ----
***************
*** 645,650 ****
--- 644,652 ----
      uint8_t *mhr = MHR(frame);
      uint8_t frameType = mhr[MHR_INDEX_FC1] & FC1_FRAMETYPE_MASK;
+ 
      if (frameType == FC1_FRAMETYPE_CMD)
        frameType += payload[0];
+     dbg("DispatchSlottedCsmaP", "Received frame, DSN: %lu, type: 0x%lu\n", 
+         (uint32_t) mhr[MHR_INDEX_SEQNO], (uint32_t) frameType);
      atomic {
        if (DEVICE_ROLE && m_indirectTxPending) {

Index: DispatchUnslottedCsmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/DispatchUnslottedCsmaP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DispatchUnslottedCsmaP.nc	25 Mar 2009 16:47:49 -0000	1.3
--- DispatchUnslottedCsmaP.nc	2 Apr 2009 14:02:14 -0000	1.4
***************
*** 469,475 ****
      uint8_t frameType = mhr[MHR_INDEX_FC1] & FC1_FRAMETYPE_MASK;

-     dbg("DispatchUnslottedCsmaP", "Received frame, DSN: %lu, result: 0x%lx\n", (uint32_t) mhr[MHR_INDEX_SEQNO]);
      if (frameType == FC1_FRAMETYPE_CMD)
        frameType += payload[0];
      atomic {
        if (m_indirectTxPending) {
--- 469,476 ----
      uint8_t frameType = mhr[MHR_INDEX_FC1] & FC1_FRAMETYPE_MASK;

      if (frameType == FC1_FRAMETYPE_CMD)
        frameType += payload[0];
+     dbg("DispatchUnslottedCsmaP", "Received frame, DSN: %lu, type: 0x%lu\n", 
+         (uint32_t) mhr[MHR_INDEX_SEQNO], (uint32_t) frameType);
      atomic {
        if (m_indirectTxPending) {

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/mac/tkn154/README.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README.txt	4 Mar 2009 18:31:28 -0000	1.5
--- README.txt	2 Apr 2009 14:02:15 -0000	1.6
***************
*** 1,28 ****
  This directory contains "TKN15.4", a platform-independent IEEE 802.15.4-2006
! MAC implementation. The code is under active development, but most of the 
! functionality described in the standard is implemented (and cursorily tested). 
! The MAC itself is platform-independent, but it requires (1) a suitable radio 
! driver, (2) Alarms/Timers with symbol precision and (3) some "platform glue" 
! code (defining guard times, etc.). Currently the only supported platform is 
! TelosB (but without additional hardware support on TelosB the timing in 
  beacon-enabled mode is not standard compliant).

! This code is the basis for the implementation of the TinyOS 15.4 WG:
! http://tinyos.stanford.edu:8000/15.4_WG
! 
! Status 3/4/09
! -------------

  Missing functionality:
- - security 
  - GTS 
! - PAN ID conflict resolution
! - multiple indirect transmissions to the same destination

- Documentation
- -------------

! A technical report on TKN15.4 is under way and will be available at:
! http://www.tkn.tu-berlin.de/publications/reports.jsp

  Implementation 
--- 1,36 ----
  This directory contains "TKN15.4", a platform-independent IEEE 802.15.4-2006
! MAC implementation. The code is under active development, but most of the
! functionality described in the standard is implemented and tested.
! The MAC itself is platform-independent, but it requires (1) a suitable radio
! driver, (2) Alarms/Timers with symbol precision and (3) some "platform glue"
! code (defining guard times, etc.). Currently the only supported platform is
! TelosB (but without additional hardware support on TelosB the timing in
  beacon-enabled mode is not standard compliant).

! Status (last updated 4/2/09)
! ----------------------------

  Missing functionality:
  - GTS 
! - security services
! - PAN ID conflict notification/resolution
! - indirect transmissions are incomplete, this is missing:
!   -- returning an empty DATA frame when there is no data for the device
!   -- set pending flag if there are multiple indirect transmissions pending
!   -- purging indirect transmissions on MLME_PURGE.request
!   -- keep frame in transaction queue in case CSMA-CA algorithm fails
! - responding to active scans in nonbeacon-enabled PANs

! Known Issues:
! - resetting the MAC during operation (via MLME_RESET) has not been tested
! - if initial beacon Tx timestamp is invalid, then coordinator can hang 
! - frame pending flags are (need to be) always set in the ACK headers
! - transmitting coordinator realignment frames has not been tested
! - using an incoming and outgoing superframe at the same time has not been tested
! - during an ongoing CSMA-CA transmission incoming frames are ignored
! - on a beacon-enabled PAN: if the device cannot find the beacon the DATA frame 
!   is not transmitted (but it should be transmitted using unslotted CSMA-CA, see 
!   Sect. 7.5.6.1 "Transmission")

  Implementation 
***************
*** 40,43 ****
--- 48,60 ----
  convention (they are all caps, e.g. MLME_START).

+ Documentation
+ -------------
+ 
+ A technical report on TKN15.4 is available here:
+ http://www.tkn.tu-berlin.de/publications/papers/TKN154.pdf
+ 
+ TKN15.4 is the basis for the implementation of the TinyOS 15.4 WG:
+ http://tinyos.stanford.edu:8000/15.4_WG
+ 
  Copyright
  ---------