From: mmaroti Date: Thu, 27 Mar 2008 21:59:28 +0000 (+0000) Subject: fixed missing header file X-Git-Tag: release_tinyos_2_1_0_0~478 X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=cd16c7e5736a66fed8943bfbab582ea3577a3ba9;p=tinyos-2.x.git fixed missing header file --- diff --git a/tos/chips/rf230/DefaultPacket.h b/tos/chips/rf230/DefaultPacket.h index dcf62d3c..65ab1fe5 100644 --- a/tos/chips/rf230/DefaultPacket.h +++ b/tos/chips/rf230/DefaultPacket.h @@ -25,9 +25,15 @@ #define __DEFAULTPACKET_H__ #include +#include typedef ieee154_header_t defpacket_header_t; +typedef nx_struct defpacket_footer_t +{ + timesync_footer_t timesync; +} defpacket_footer_t; + typedef nx_struct defpacket_metadata_t { nx_uint8_t flags; diff --git a/tos/chips/rf230/TimeSyncMessage.h b/tos/chips/rf230/TimeSyncMessage.h new file mode 100644 index 00000000..1099410c --- /dev/null +++ b/tos/chips/rf230/TimeSyncMessage.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2007, Vanderbilt University + * 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 VANDERBILT UNIVERSITY 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 VANDERBILT + * UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * THE VANDERBILT UNIVERSITY 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 VANDERBILT UNIVERSITY HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Author: Miklos Maroti + */ + +#ifndef __TIMESYNCMESSAGE_H__ +#define __TIMESYNCMESSAGE_H__ + +typedef nx_struct timesync_footer_t +{ + nx_uint32_t time_offset; // in micorsec +} timesync_footer_t; + +#endif//__TIMESYNCMESSAGE_H__ diff --git a/tos/chips/rf230/TimeSyncMessageP.nc b/tos/chips/rf230/TimeSyncMessageP.nc index 8b99ccc8..9a936c80 100644 --- a/tos/chips/rf230/TimeSyncMessageP.nc +++ b/tos/chips/rf230/TimeSyncMessageP.nc @@ -21,6 +21,8 @@ * Author: Miklos Maroti */ +#include + module TimeSyncMessageP { provides @@ -48,11 +50,6 @@ implementation { /*----------------- Packet -----------------*/ - typedef nx_struct timesync_footer_t - { - nx_uint32_t time_offset; // in micorsec - } timesync_footer_t; - typedef struct timesync_local_t { uint32_t event_time; // in microsec diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc index d23ba3e2..3253e611 100644 --- a/tos/platforms/iris/ActiveMessageC.nc +++ b/tos/platforms/iris/ActiveMessageC.nc @@ -36,7 +36,6 @@ configuration ActiveMessageC interface PacketAcknowledgements; interface PacketField as PacketLinkQuality; interface PacketTimeStamp; - interface PacketTimeSynch; } } @@ -54,5 +53,4 @@ implementation PacketAcknowledgements = MAC; PacketLinkQuality = MAC; PacketTimeStamp = MAC; - PacketTimeSynch = MAC; }