From ad0e3385119c0cf21296cebbec0c4f651c18f1fc Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Sat, 1 Mar 2014 16:59:33 +0100 Subject: [PATCH] tests/test_net_if: use defaulttransceiver --- tests/test_net_if/Makefile | 12 +----------- tests/test_net_if/main.c | 16 ++-------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/tests/test_net_if/Makefile b/tests/test_net_if/Makefile index 1291891129..dbefb1829a 100644 --- a/tests/test_net_if/Makefile +++ b/tests/test_net_if/Makefile @@ -10,17 +10,7 @@ endif USEMODULE += auto_init USEMODULE += net_if -ifeq ($(BOARD),native) - USEMODULE += nativenet -else ifeq ($(BOARD),msba2) - USEMODULE += cc110x_ng -else ifeq ($(BOARD),telosb) - USEMODULE += cc2420 -else ifeq ($(BOARD),wsn430-v1_4) - USEMODULE += cc2420 -else ifeq ($(BOARD),iot-lab_M3) - USEMODULE += at86rf231 -endif +USEMODULE += defaulttransceiver export INCLUDES += -I$(RIOTBASE)/sys/net/include diff --git a/tests/test_net_if/main.c b/tests/test_net_if/main.c index bc4cbf71d6..956af77882 100644 --- a/tests/test_net_if/main.c +++ b/tests/test_net_if/main.c @@ -14,18 +14,6 @@ #include "net_help.h" #include "transceiver.h" -#ifndef TRANSCEIVER -#ifdef MODULE_AT86RF231 -#define TRANSCEIVER (TRANSCEIVER_AT86RF231) -#elif MODULE_CC110X_NG -#define TRANSCEIVER (TRANSCEIVER_CC1100) -#elif MODULE_NATIVENET -#define TRANSCEIVER (TRANSCEIVER_NATIVE) -#elif MODULE_CC2420 -#define TRANSCEIVER (TRANSCEIVER_CC2420) -#endif -#endif - int initialize_tests(void); int test_net_if_initialization(int iface); int test_net_if_get_add_l3p_types(int iface); @@ -110,10 +98,10 @@ int initialize_tests(void) int iface; #ifndef MODULE_AUTO_INIT - transceiver_init(TRANSCEIVER); + transceiver_init(TRANSCEIVER_DEFAULT); transceiver_start(); net_if_init(); - iface = net_if_init_interface(0, TRANSCEIVER); + iface = net_if_init_interface(0, TRANSCEIVER_DEFAULT); return iface; #else iface = -1;