From a29a4b339929f91a9b26c423e8de49d4e426abd4 Mon Sep 17 00:00:00 2001 From: mmaroti Date: Tue, 10 Mar 2009 19:40:50 +0000 Subject: [PATCH] go back to RF230* names --- apps/tests/rf230/RF230Sniffer/Makefile | 2 +- apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc | 8 ++++---- apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc | 2 -- apps/tests/rf230/RF230Test/RF230TestC.nc | 6 +++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/apps/tests/rf230/RF230Sniffer/Makefile b/apps/tests/rf230/RF230Sniffer/Makefile index aae82975..531d9061 100644 --- a/apps/tests/rf230/RF230Sniffer/Makefile +++ b/apps/tests/rf230/RF230Sniffer/Makefile @@ -2,5 +2,5 @@ COMPONENT=RF230SnifferC CFLAGS += -I$(TOSDIR)/lib/diagmsg CFLAGS += -DTASKLET_IS_TASK CFLAGS += -DDIAGMSG_RECORDED_MSGS=60 -CFLAGS += -DRF230_DEBUG -DRF230_DEBUG_MESSAGES +CFLAGS += -DRADIO_DEBUG -DRADIO_DEBUG_MESSAGES include $(MAKERULES) diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc index ce078455..02b301ed 100644 --- a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc +++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc @@ -27,15 +27,15 @@ configuration RF230SnifferC implementation { - components RF230SnifferP, MainC, SerialActiveMessageC, RF2xxDriverLayerC, RF2xxActiveMessageP, IEEE154PacketC, AssertC; + components RF230SnifferP, MainC, SerialActiveMessageC, RF230DriverLayerC, RF230ActiveMessageP, IEEE154PacketC, AssertC; RF230SnifferP.Boot -> MainC; RF230SnifferP.SplitControl -> SerialActiveMessageC; - RF230SnifferP.RadioState -> RF2xxDriverLayerC; + RF230SnifferP.RadioState -> RF230DriverLayerC; - RF2xxDriverLayerC.RF2xxDriverConfig -> RF2xxActiveMessageP; + RF230DriverLayerC.RF230DriverConfig -> RF230ActiveMessageP; - RF2xxActiveMessageP.IEEE154Packet -> IEEE154PacketC; + RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC; // just to avoid a timer compilation bug components new TimerMilliC(); diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc index ca82c53f..fc8562d5 100644 --- a/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc +++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc @@ -21,9 +21,7 @@ * Author: Miklos Maroti */ -#include #include -#include module RF230SnifferP { diff --git a/apps/tests/rf230/RF230Test/RF230TestC.nc b/apps/tests/rf230/RF230Test/RF230TestC.nc index 895e4f66..3b03b67c 100644 --- a/apps/tests/rf230/RF230Test/RF230TestC.nc +++ b/apps/tests/rf230/RF230Test/RF230TestC.nc @@ -37,8 +37,8 @@ implementation RF230TestM.SplitControl -> SerialActiveMessageC; RF230TestM.Timer -> TimerMilliC; - components RF2xxDriverLayerC, RF2xxActiveMessageC; + components RF230DriverLayerC, RF230ActiveMessageC; - RF230TestM.RadioState -> RF2xxDriverLayerC; - RF230TestM.AMSend -> RF2xxActiveMessageC; + RF230TestM.RadioState -> RF230DriverLayerC; + RF230TestM.AMSend -> RF230ActiveMessageC; } -- 2.39.2