From 96fc21ea070e4f860e0bcbc8fce4a66f42526be5 Mon Sep 17 00:00:00 2001 From: gnawali Date: Tue, 13 May 2008 18:30:47 +0000 Subject: [PATCH] fix the range - NALP code for TinyOS is 0x3f --- doc/txt/tep125.txt | 6 +++--- doc/txt/tep4.txt | 34 ++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/doc/txt/tep125.txt b/doc/txt/tep125.txt index 0be638f9..6f2b4f1b 100644 --- a/doc/txt/tep125.txt +++ b/doc/txt/tep125.txt @@ -77,10 +77,10 @@ The TinyOS 802.15.4 I-frame format is as follows:: +-------------------+---------+------------------------------+--------------+ 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 192-255. -TinyOS uses code 255. +this as a TinyOS packet. NALP codes must be in the range of 0-63. +TinyOS uses code 63. -The AM type 255 is reserved for both T-Frames and I-Frames. A TinyOS +The AM type 63 is reserved for both T-Frames and I-Frames. A TinyOS program MUST NOT use it. 4. Implementation diff --git a/doc/txt/tep4.txt b/doc/txt/tep4.txt index fb60916b..c7a1ed00 100644 --- a/doc/txt/tep4.txt +++ b/doc/txt/tep4.txt @@ -37,19 +37,19 @@ unreserved pool. 2. Current Allocations ==================================================================== -The unreserved pool is in the range 0-127 (0x00-0x7F). The reserved -pool is in the range 128-255 (0x80-0xFF). +The unreserved pool is in the range 128-255 (0x80-0xFF). The reserved +pool is in the range 128-255 (0x00-0x7F). -2.1 Unreserved pool (0x00 - 0x7F) +2.1 Unreserved pool (0x80 - 0x7F) --------------------------------- -When an application uses the AM ID in the range 0-127, it is +When an application uses the AM ID in the range 128-255, it is guaranteed to not conflict with AM IDs used by the protocols distributed with TinyOS 2.x. These IDs may conflict with the protocols in the contrib tree or other applications. No allocation request is necessary to use AM IDs in this range. -2.2 Reserved pool (0x80 - 0xFF) +2.2 Reserved pool (0x00 - 0x7F) ------------------------------- When a protocol uses an allocated AM ID in the reserved pool, it is @@ -59,25 +59,27 @@ with the protocols and applications in the contrib tree. Here is a list of current allocations:: - * 0xF0 - 0XFF are reserved for collection protocols maintained by + * 0x70 - 0x7F are reserved for collection protocols maintained by the Network Protocol Working Group. - 0xF0 - CTP routing beacon and LEEP (''tos/lib/net/ctp'', TEP 119, 123, and 124) - 0xF1 - CTP data packets (''tos/lib/net/ctp'', TEP 119, 123) - 0xF2 - CTP debug messages (''tos/lib/net/ctp'') - 0xF3 - MultiHopLQI routing beacon (''tos/lib/net/lqi'') - 0xF4 - MultiHopLQI data packets (''tos/lib/net/lqi'') - 0xF5 - MultiHopLQI debug messages (''tos/lib/net/lqi'') + 0x70 - CTP routing beacon and LEEP (''tos/lib/net/ctp'', TEP 119, 123, and 124) + 0x71 - CTP data packets (''tos/lib/net/ctp'', TEP 119, 123) + 0x72 - CTP debug messages (''tos/lib/net/ctp'') + 0x73 - MultiHopLQI routing beacon (''tos/lib/net/lqi'') + 0x74 - MultiHopLQI data packets (''tos/lib/net/lqi'') + 0x75 - MultiHopLQI debug messages (''tos/lib/net/lqi'') - * 0xE0 - 0xEF are reserved for dissemination protocols maintained by + * 0x60 - 0x6F are reserved for dissemination protocols maintained by the Network Protocol Working Group. - 0xE0 - Drip (''tos/lib/net/drip'', TEP 118) - 0xE1 - DIP (''tos/lib/net/dip'', TEP 118) + 0x60 - Drip (''tos/lib/net/drip'', TEP 118) + 0x61 - DIP (''tos/lib/net/dip'', TEP 118) - * 0xD0 - DYMO (''tos/lib/net/dymo'') maintained by the Network + * 0x50 - DYMO (''tos/lib/net/dymo'') maintained by the Network Protocol Working Group. + * 0x3F - TinyOS NALP code (TEP 125) reserved by the Core Working + Group. 3. Requesting AM ID Allocation -- 2.39.2