[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/serial Serial802_15_4C.nc, NONE, 1.1 SerialPacketInfo802_15_4P.nc, 1.4, 1.5 Serial802_5_4C.nc, 1.4, NONE

[Vlado Handziski]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/serial
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23371

Modified Files:
	SerialPacketInfo802_15_4P.nc 
Added Files:
	Serial802_15_4C.nc 
Removed Files:
	Serial802_5_4C.nc 
Log Message:
-Fix support for transparent sending of cc2420 packets over serial type 0x02 frames

--- NEW FILE: Serial802_15_4C.nc ---
//$Id: Serial802_15_4C.nc,v 1.1 2008/05/13 00:15:21 vlahan Exp $

/* "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;
}

Index: SerialPacketInfo802_15_4P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/SerialPacketInfo802_15_4P.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SerialPacketInfo802_15_4P.nc	12 Dec 2006 18:23:32 -0000	1.4
--- SerialPacketInfo802_15_4P.nc	13 May 2008 00:15:21 -0000	1.5
***************
*** 31,35 ****
   */
  
- #include "802_15_4.h"
  module SerialPacketInfo802_15_4P {
    provides interface SerialPacketInfo as Info;
--- 31,34 ----
***************
*** 37,47 ****
  implementation {
    async command uint8_t Info.offset() {
!     return sizeof(TOSRadioHeader) - sizeof(TOS802Header);
    }
    async command uint8_t Info.dataLinkLength(message_t* msg, uint8_t upperLen) {
!     return upperLen + sizeof(TOS802Header) + sizeof(TOS802Footer);
    }
    async command uint8_t Info.upperLength(message_t* msg, uint8_t dataLinkLen) {
!     return dataLinkLen - (sizeof(TOS802Header) + sizeof(TOS802Footer));
    }
  }
--- 36,46 ----
  implementation {
    async command uint8_t Info.offset() {
!     return sizeof(message_header_t)-sizeof(cc2420_header_t);
    }
    async command uint8_t Info.dataLinkLength(message_t* msg, uint8_t upperLen) {
!     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(cc2420_header_t) + sizeof(cc2420_footer_t));
    }
  }

--- Serial802_5_4C.nc DELETED ---