[Tinyos-2-commits] CVS: tinyos-2.x/doc/html tep119.html,1.11,1.12

[Phil Levis]

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

Modified Files:
	tep119.html 
Log Message:

Incorporate net2 comments.


Index: tep119.html
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/doc/html/tep119.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tep119.html	14 Aug 2007 18:57:59 -0000	1.11
--- tep119.html	1 May 2008 20:18:50 -0000	1.12
***************
*** 375,384 ****
  <p>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:</p>
  <pre class="literal-block">
  interface RootControl {
--- 375,383 ----
  <p>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:</p>
  <pre class="literal-block">
  interface RootControl {
***************
*** 388,391 ****
--- 387,394 ----
  }
  </pre>
+ <p>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.</p>
  <p>The collection infrastructure can be multiplexed among independent
  applications, by means of a <em>collection identifier</em>. It is important
***************
*** 405,411 ****
  to Receive during instantiation.</p>
  <p>The nodes can process a packet that are in transit. These in-network
! <em>processors</em> use the Intercept interface [<a class="reference" href="#id1">1</a>] to receive and update
! a packet. The collection identifier is specified as a parameter
! to Intercept during instantiation.</p>
  </div>
  <div class="section">
--- 408,427 ----
  to Receive during instantiation.</p>
  <p>The nodes can process a packet that are in transit. These in-network
! <em>processors</em> 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:</p>
! <pre class="literal-block">
! interface Intercept {
!   event bool forward(message_t* msg, void* payload, uint8_t len);
! }
! </pre>
! <p>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.</p>
  </div>
  <div class="section">
***************
*** 481,485 ****
  <h1><a id="implementation" name="implementation">4 Implementation</a></h1>
  <p>An implementation of this TEP can be found in
! <tt class="docutils literal"><span class="pre">tinyos-2.x/tos/lib/net/ctp</span></tt> and <tt class="docutils literal"><span class="pre">tinyos-2.x/tos/lib/net/le</span></tt>, 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
--- 497,501 ----
  <h1><a id="implementation" name="implementation">4 Implementation</a></h1>
  <p>An implementation of this TEP can be found in
! <tt class="docutils literal"><span class="pre">tinyos-2.x/tos/lib/net/ctp</span></tt> and <tt class="docutils literal"><span class="pre">tinyos-2.x/tos/lib/net/4bitle</span></tt>, 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
***************
*** 660,663 ****
--- 676,690 ----
  </div>
  <div class="section">
+ <h1><a id="multihoplqi" name="multihoplqi">4.4 MultihopLqi</a></h1>
+ <p>There is another implementation of collection in <tt class="docutils literal"><span class="pre">tos/lib/net/lqi</span></tt>.
+ 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.</p>
+ </div>
+ <div class="section">
  <h1><a id="author-addresses" name="author-addresses">5. Author Addresses</a></h1>
  <div class="line-block">