-Fix support for transparent sending of cc2420 packets over serial type 0x02 frames

diff --git a/tos/lib/serial/Serial802_15_4C.nc b/tos/lib/serial/Serial802_15_4C.nc
new file mode 100644 (file)
index 0000000..675f681
--- /dev/null
+++ b/tos/lib/serial/Serial802_15_4C.nc
@@ -0,0 +1,49 @@
+//$Id$
+
+/* "Copyright (c) 2000-2005 The Regents of the University of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement
+ * is hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY
+ * OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * Implementation of communication 802.15.4 message_t packets over the
+ * serial port.
+ *
+ * @author Philip Levis
+ * @author Ben Greenstein
+ * @date August 7 2005
+ *
+ */
+
+#include "Serial.h"
+configuration Serial802_15_4C {
+  provides {
+    interface Send;
+    interface Receive;
+  }
+  uses interface Leds;
+}
+implementation { 
+  components MainC, SerialPacketInfo802_15_4P, SerialDispatcherC;
+
+  MainC.SoftwareInit -> SerialDispatcherC;
+  Leds = SerialDispatcherC;
+  Send = SerialDispatcherC.Send[TOS_SERIAL_802_15_4_ID];
+  Receive = SerialDispatcherC.Receive[TOS_SERIAL_802_15_4_ID];
+  SerialDispatcherC.SerialPacketInfo[TOS_SERIAL_802_15_4_ID] -> SerialPacketInfo802_15_4P.Info;
+}

diff --git a/tos/lib/serial/Serial802_5_4C.nc b/tos/lib/serial/Serial802_5_4C.nc
deleted file mode 100644 (file)
index c6187fe..0000000
--- a/tos/lib/serial/Serial802_5_4C.nc
+++ /dev/null
@@ -1,49 +0,0 @@
-//$Id$
-
-/* "Copyright (c) 2000-2005 The Regents of the University of California.  
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement
- * is hereby granted, provided that the above copyright notice, the following
- * two paragraphs and the author appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY
- * OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
- */
-
-/**
- * Implementation of communication 802.15.4 message_t packets over the
- * serial port.
- *
- * @author Philip Levis
- * @author Ben Greenstein
- * @date August 7 2005
- *
- */
-
-#include "Serial.h"
-configuration Serial802_15_4C {
-  provides {
-    interface Send;
-    interface Receive;
-  }
-  uses interface Leds;
-}
-implementation { 
-  components SerialPacketInfo802_15_4P as Info, SerialDispatcherC;
-
-  Init = SerialDispatcherC;
-  Leds = SerialDispatcherC;
-  Send = SerialDispatcherC.Send[TOS_SERIAL_802_15_4_ID];
-  Receive = SerialDispatcherC.Receive[TOS_SERIAL_802_15_4_ID];
-  SerialDispatcherC.SerialPacketInfo[TOS_SERIAL_802_15_4_ID] -> Info;
-}

diff --git a/tos/lib/serial/SerialPacketInfo802_15_4P.nc b/tos/lib/serial/SerialPacketInfo802_15_4P.nc
index ead437a6b6d4238546ac4f07a69be8b154ea5829..a70beb779f090349b3629781da6a55a7de620052 100644 (file)
--- a/tos/lib/serial/SerialPacketInfo802_15_4P.nc
+++ b/tos/lib/serial/SerialPacketInfo802_15_4P.nc
@@ -30,18 +30,17 @@
  *
  */
 
-#include "802_15_4.h"
 module SerialPacketInfo802_15_4P {
   provides interface SerialPacketInfo as Info;
 }
 implementation {
   async command uint8_t Info.offset() {
-    return sizeof(TOSRadioHeader) - sizeof(TOS802Header);
+    return sizeof(message_header_t)-sizeof(cc2420_header_t);
   }
   async command uint8_t Info.dataLinkLength(message_t* msg, uint8_t upperLen) {
-    return upperLen + sizeof(TOS802Header) + sizeof(TOS802Footer);
+    return upperLen + sizeof(cc2420_header_t) + sizeof(cc2420_footer_t);
   }
   async command uint8_t Info.upperLength(message_t* msg, uint8_t dataLinkLen) {
-    return dataLinkLen - (sizeof(TOS802Header) + sizeof(TOS802Footer));
+    return dataLinkLen - (sizeof(cc2420_header_t) + sizeof(cc2420_footer_t));
   }
 }