Merge pull request #681 from OlegHahm/at86rf231_fixes

at86rf231: fix includes and shell commands

drivers/at86rf231/at86rf231_spi.c

@@ -1,6 +1,6 @@
 #include "at86rf231_spi.h"
 #include "at86rf231_arch.h"
-#include "at86rf231_settings.h"
+#include "at86rf231.h"
 
 void at86rf231_reg_write(uint8_t addr, uint8_t value)
 {

drivers/include/at86rf231.h

@@ -8,9 +8,7 @@
 
 #include "ieee802154_frame.h"
 
-#include "at86rf231_arch.h"
+#include "at86rf231/at86rf231_settings.h"
-#include "at86rf231_settings.h"
-#include "at86rf231_spi.h"
 
 #define AT86RF231_MAX_PKT_LENGTH 127
 #define AT86RF231_MAX_DATA_LENGTH 118

examples/rpl_udp/Makefile

@@ -44,8 +44,10 @@ USEMODULE += ps
 USEMODULE += vtimer
 ifeq ($(strip $(BOARD)),native)
 	USEMODULE += nativenet
-else
+else ifeq ($(strip $(BOARD)),msba2)
 	USEMODULE += cc110x
+else ifeq ($(strip $(BOARD)),iot-lab_M3)
+	USEMODULE += at86rf231
 endif
 USEMODULE += sixlowpan
 USEMODULE += rpl

sys/shell/commands/sc_transceiver.c

@@ -39,6 +39,11 @@
 #define TEXT_SIZE           CC2420_MAX_DATA_LENGTH
 #define _TC_TYPE            TRANSCEIVER_CC2420
 
+#elif defined( MODULE_AT86RF231 )
+#include "at86rf231.h"
+#define TEXT_SIZE           AT86RF231_MAX_DATA_LENGTH
+#define _TC_TYPE            TRANSCEIVER_AT86RF231
+
 #elif defined( MODULE_NATIVENET )
 #include "nativenet.h"
 #define TEXT_SIZE           NATIVE_MAX_DATA_LENGTH

sys/shell/commands/shell_commands.c

@@ -52,7 +52,7 @@ extern void _reset_current_handler(char *unused);
 #ifdef DBG_IGNORE
 #define _TC_IGN
 #endif
-#if (defined(MODULE_CC110X_NG) || defined(MODULE_CC2420) || defined(MODULE_NATIVENET))
+#if (defined(MODULE_CC110X_NG) || defined(MODULE_CC2420) || defined(MODULE_AT86RF231) || defined(MODULE_NATIVENET))
 #define _TC_ADDR
 #define _TC_CHAN
 #define _TC_MON

sys/transceiver/transceiver.c

@@ -55,7 +55,6 @@
 
 #ifdef MODULE_AT86RF231
 #include "at86rf231.h"
-#include "at86rf231_arch.h"
 #endif
 
 #define ENABLE_DEBUG (0)