[Tinyos-2-commits] CVS: tinyos-2.x/doc/txt tep119.txt,1.8,1.9

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/doc/txt
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11151/txt

Modified Files:
	tep119.txt 
Log Message:

Incorporate net2 comments.


Index: tep119.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/doc/txt/tep119.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tep119.txt	10 Feb 2007 23:28:49 -0000	1.8
--- tep119.txt	1 May 2008 20:18:50 -0000	1.9
***************
*** 94,103 ****
  A node is configured to become a root by using the RootControl
  interface. RootControl.setRoot() MUST make the current node a root of
! the the collection infrastructure. RootControl.unsetRoot() MUST
! make the current root no longer a root in the collection infrastructure.
! Both calls are idempotent.
! RootControl.setRoot() MAY be called on a node that is already a root, to
! no effect. RootControl.unsetRoot() MAY be called on a node that is
! not a root::
  
    interface RootControl {
--- 94,102 ----
  A node is configured to become a root by using the RootControl
  interface. RootControl.setRoot() MUST make the current node a root of
! the collection infrastructure. RootControl.unsetRoot() MUST make
! the current root no longer a root in the collection infrastructure.
! Both calls are idempotent.  RootControl.setRoot() MAY be called on a
! node that is already a root, to no effect. RootControl.unsetRoot() MAY
! be called on a node that is not a root::
  
    interface RootControl {
***************
*** 107,110 ****
--- 106,114 ----
    }
  
+ Both commands MUST return SUCCESS if the node is now in the specified
+ state, and FAIL otherwise. For example, if a node is already a root
+ and an application calls RootControl.setRoot(), the call will
+ return SUCCESS.
+ 
  The collection infrastructure can be multiplexed among independent
  applications, by means of a *collection identifier*. It is important
***************
*** 128,134 ****
  
  The nodes can process a packet that are in transit. These in-network
! *processors* use the Intercept interface [1_] to receive and update
! a packet. The collection identifier is specified as a parameter
! to Intercept during instantiation.
  
  3 Collection Services
--- 132,152 ----
  
  The nodes can process a packet that are in transit. These in-network
! *processors* use the Intercept interface to receive
! and update a packet. The collection identifier is specified as a parameter
! to Intercept during instantiation. The Intercept interface has this
! signature:: 
! 
!   interface Intercept {
!     event bool forward(message_t* msg, void* payload, uint8_t len);
!   }
! 
! Intercept has a single event, Intercept.forward(). A collection
! service SHOULD signal this event when it receives a packet to forward.
! If the return value of the event is FALSE, then the collection layer
! MUST NOT forward the packet. This interface allows a higher layer
! to inspect the internals of a packet and possibly suppress it if
! it is unnecessary or if its contents can be aggregated into an
! existing packet.
! 
  
  3 Collection Services
***************
*** 215,219 ****
  
  An implementation of this TEP can be found in
! ``tinyos-2.x/tos/lib/net/ctp`` and ``tinyos-2.x/tos/lib/net/le``, in
  the CTP protocol. It is beyond the scope of this document to fully
  describe CTP, but we outline its main components. CTP will be
--- 233,237 ----
  
  An implementation of this TEP can be found in
! ``tinyos-2.x/tos/lib/net/ctp`` and ``tinyos-2.x/tos/lib/net/4bitle``, in
  the CTP protocol. It is beyond the scope of this document to fully
  describe CTP, but we outline its main components. CTP will be
***************
*** 402,405 ****
--- 420,435 ----
    * Packet timing: Random, RetxmitTimer
  
+ 4.4 MultihopLqi
+ ====================================================================
+ 
+ There is another implementation of collection in ``tos/lib/net/lqi``.
+ Its software structure is similar, with the exception that it does
+ not have a separate link estimator. MultihopLqi only works on
+ platforms that have a CC2420 radio, as it uses a special piece
+ of physical layer data the radio provides (the LQI value).
+ The three major components of the MultihopLqi implementation
+ are the modules LqiForwardingEngineP and  LqiRoutingEngineP, as
+ well as the configuration MultihopLqiP.
+ 
  
  5. Author Addresses