go back to RF230* names

diff --git a/apps/tests/rf230/RF230Sniffer/Makefile b/apps/tests/rf230/RF230Sniffer/Makefile
index aae82975b096d800e1bde4509430f37eccae6686..531d906196728d40018a990d58230a903f58c600 100644 (file)
--- 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 ce078455eee07ef90793a4b652b208b40f8236f6..02b301ed210ffc94c2a187ff01c449f918978466 100644 (file)
--- 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 ca82c53f08c6948a2c3ac149d78c0572e944e750..fc8562d5a921f23e3ef9fe7d0a85308fd7db7ca6 100644 (file)
--- a/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc
+++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc
@@ -21,9 +21,7 @@
  * Author: Miklos Maroti
  */
 
-#include <RF2xxPacket.h>
 #include <Tasklet.h>
-#include <message.h>
 
 module RF230SnifferP
 {

diff --git a/apps/tests/rf230/RF230Test/RF230TestC.nc b/apps/tests/rf230/RF230Test/RF230TestC.nc
index 895e4f66f10d377eef41542954d58a20a51adfb2..3b03b67cbe5fa5284195eaa2608479933bcf7bcf 100644 (file)
--- 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;
 }