From 7bae398b43f69d024cf524349705fee97ab002ae Mon Sep 17 00:00:00 2001 From: prabal Date: Sat, 20 Feb 2010 06:54:03 +0000 Subject: [PATCH] RC4 fixes for Epic support --- .../RadioCountToLedsAppC.nc | 2 +- .../TestPeriodicAppC.nc | 2 +- .../TestPeriodicAppC.nc | 2 +- tos/platforms/epic/ActiveMessageC.nc | 75 ------------------- 4 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 tos/platforms/epic/ActiveMessageC.nc diff --git a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc index 49020672..20f16ebc 100644 --- a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc +++ b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsAppC.nc @@ -49,7 +49,7 @@ implementation { #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) components CC1000ActiveMessageC as LplC; -#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_TELOSB) || defined(PLATFORM_SHIMMER) || defined(PLATFORM_SHIMMER2) || defined(PLATFORM_INTELMOTE2) +#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_TELOSB) || defined(PLATFORM_SHIMMER) || defined(PLATFORM_SHIMMER2) || defined(PLATFORM_INTELMOTE2) || defined(PLATFORM_EPIC) components CC2420ActiveMessageC as LplC; #else #error "LPL testing not supported on this platform" diff --git a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc index 08b8cce2..fee5d28a 100644 --- a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc +++ b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicAppC.nc @@ -48,7 +48,7 @@ implementation { #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) components CC1000ActiveMessageC as Lpl; -#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_TELOSB) || defined(PLATFORM_SHIMMER) || defined(PLATFORM_SHIMMER2) || defined(PLATFORM_INTELMOTE2) +#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_TELOSB) || defined(PLATFORM_SHIMMER) || defined(PLATFORM_SHIMMER2) || defined(PLATFORM_INTELMOTE2) || defined(PLATFORM_EPIC) components CC2420ActiveMessageC as Lpl; #else #error "LPL testing not supported on this platform" diff --git a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc index 7d243466..dd6c18f6 100644 --- a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc +++ b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicAppC.nc @@ -48,7 +48,7 @@ implementation { #if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT) components CC1000ActiveMessageC as Lpl; -#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_TELOSB) || defined(PLATFORM_SHIMMER) || defined(PLATFORM_SHIMMER2) || defined(PLATFORM_INTELMOTE2) +#elif defined(PLATFORM_MICAZ) || defined(PLATFORM_TELOSB) || defined(PLATFORM_SHIMMER) || defined(PLATFORM_SHIMMER2) || defined(PLATFORM_INTELMOTE2) || defined(PLATFORM_EPIC) components CC2420ActiveMessageC as Lpl; #else #error "LPL testing not supported on this platform" diff --git a/tos/platforms/epic/ActiveMessageC.nc b/tos/platforms/epic/ActiveMessageC.nc deleted file mode 100644 index 8f00e430..00000000 --- a/tos/platforms/epic/ActiveMessageC.nc +++ /dev/null @@ -1,75 +0,0 @@ -// $Id$ - -/* - * "Copyright (c) 2004-2008 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." - * - * Copyright (c) 2004-2005 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached - * INTEL-LICENSE file. If you do not find these files, copies can be - * found by writing to Intel Research Berkeley, 2150 Shattuck Avenue, - * Suite 1300, Berkeley, CA, 94704. Attention: Intel License Inquiry. - */ - -/** - * The Active Message layer on the Epic platform. This is a naming - * wrapper around the CC2420 Active Message layer. - * - * @author Philip Levis - * @author Prabal Dutta - */ -#include "Timer.h" - -configuration ActiveMessageC { - provides { - interface SplitControl; - - interface AMSend[uint8_t id]; - interface Receive[uint8_t id]; - interface Receive as Snoop[uint8_t id]; - - interface Packet; - interface AMPacket; - interface PacketAcknowledgements; - - interface PacketTimeStamp as PacketTimeStamp32khz; - interface PacketTimeStamp as PacketTimeStampMilli; - } -} -implementation { - components CC2420ActiveMessageC as AM; - components CC2420PacketC; - - SplitControl = AM; - - AMSend = AM; - Receive = AM.Receive; - Snoop = AM.Snoop; - Packet = AM; - AMPacket = AM; - PacketAcknowledgements = AM; - - PacketTimeStamp32khz = CC2420PacketC; - PacketTimeStampMilli = CC2420PacketC; -} -- 2.39.2