Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / doc / html / tep125.html

diff --git a/doc/html/tep125.html b/doc/html/tep125.html
index 7dbdbfc79f4e0d72bdc851c43f40dc0dc55c0e15..ced538ed149aba6484f2251c0f0fe64cce1ea082 100644 (file)
--- a/doc/html/tep125.html
+++ b/doc/html/tep125.html
@@ -298,9 +298,9 @@ ul.auto-toc {
 <td>Jonathan Hui, Philip Levis, and David Moss</td></tr>
 <tr class="field"><th class="docinfo-name">Draft-Created:</th><td class="field-body">2-Feb-2007</td>
 </tr>
-<tr class="field"><th class="docinfo-name">Draft-Version:</th><td class="field-body">1.2</td>
+<tr class="field"><th class="docinfo-name">Draft-Version:</th><td class="field-body">1.6</td>
 </tr>
-<tr class="field"><th class="docinfo-name">Draft-Modified:</th><td class="field-body">2007-04-09</td>
+<tr class="field"><th class="docinfo-name">Draft-Modified:</th><td class="field-body">2008-06-20</td>
 </tr>
 <tr class="field"><th class="docinfo-name">Draft-Discuss:</th><td class="field-body">TinyOS Developer List &lt;tinyos-devel at mail.millennium.berkeley.edu&gt;</td>
 </tr>
@@ -339,7 +339,7 @@ A TinyOS device MAY support additional 802.15.4 frame formats.</p>
 <h1><a id="frame-format" name="frame-format">3. Frame Format</a></h1>
 <p>TinyOS has two 802.15.4 frame formats. The first format, the T-Frame, is
 for TinyOS networks which do not share their channel with other wireless
-networking archtiectures. This frame format assumes that TinyOS can use
+networking architectures. This frame format assumes that TinyOS can use
 every bit of the packet and does not need to state that it is a TinyOS packet.
 T-Frame stands for &quot;TinyOS Frame.&quot;</p>
 <p>The TinyOS 802.15.4 T-frame format is as follows:</p>
@@ -361,22 +361,26 @@ for &quot;Interoperable Frame.&quot;</p>
 | 802.15.4 Header   | 6lowpan | AM type |        data        | 802.15.4 CRC |
 +-------------------+---------+------------------------------+--------------+
 </pre>
-<p>AM type is the same as in a T-frame. 6lowpan is the IANA-assigned code
-to identify this as a TinyOS packet. At this time, the exact value of
-this code has not been determined. To inform 6lowpan that this is not
-a 6lowpan packet, the code used MUST be in the range of 192-55.</p>
-<p>The AM type 6lowpan is reserved. A TinyOS program MUST NOT use it.</p>
+<p>AM type is the same as in a T-frame. 6lowpan is the NALP code to
+identify this as a TinyOS packet. NALP codes must be in the range of
+0-63.  TinyOS uses code 63 (0x3F).</p>
+<p>The AM type 63 is reserved for both T-Frames and I-Frames. A TinyOS
+program MUST NOT use it.</p>
 </div>
 <div class="section">
 <h1><a id="implementation" name="implementation">4. Implementation</a></h1>
-<p>An implementation of the T-Frame can be found in tinyos-2.x/tos/chips/cc2420.</p>
-<p>An implementation of the I-Frame will soon be found in
-tinyos-2.x/tos/chips/cc2420.</p>
+<p>An implementation of T-Frames and I-Frames can be found in
+tinyos-2.x/tos/chips/cc2420/.  The components in
+tos/chips/cc2420/lowpan/ control which is used. By default, TinyOS
+802.15.4 stacks use I-Frames, and the 'tframe' make option configures
+them to use T-Frames. This make option defines a symbol named
+<tt class="docutils literal"><span class="pre">TFRAMES_ENABLED</span></tt>. In the case of the CC2420 stack, this causes
+<tt class="docutils literal"><span class="pre">CC2420.h</span></tt> to define <tt class="docutils literal"><span class="pre">CC2420_IFRAME_TYPE</span></tt>, which adds the extra
+byte to the message_t header structure.</p>
 </div>
 <div class="section">
 <h1><a id="author-addresses" name="author-addresses">5. Author Addresses</a></h1>
 <div class="line-block">
-<div class="line"><br /></div>
 <div class="line">Jonathan Hui</div>
 <div class="line">657 Mission St. Ste. 600</div>
 <div class="line">Arched Rock Corporation</div>
@@ -394,10 +398,12 @@ tinyos-2.x/tos/chips/cc2420.</p>
 <div class="line">email - <a class="reference" href="mailto:pal&#64;cs.stanford.edu">pal&#64;cs.stanford.edu</a></div>
 <div class="line"><br /></div>
 <div class="line">David Moss</div>
-<div class="line">Rincon Research</div>
-<div class="line"><br /></div>
-<div class="line"><br /></div>
+<div class="line">Rincon Research Corporation</div>
+<div class="line">101 N. Wilmot, Suite 101</div>
+<div class="line">Tucson, AZ  85750</div>
 <div class="line"><br /></div>
+<div class="line">phone - +1 520 519 3138</div>
+<div class="line">email - <a class="reference" href="mailto:dmm&#64;rincon.com">dmm&#64;rincon.com</a></div>
 </div>
 </div>
 </div>