From f379eefbd8aa87dc424d72800a1e52c8bc23ccac Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Tue, 11 Feb 2014 17:15:03 +0100
Subject: [PATCH] fix includes and shell commands for at86rf231

---
 drivers/at86rf231/at86rf231_spi.c                            | 2 +-
 drivers/include/at86rf231.h                                  | 4 +---
 .../include => include/at86rf231}/at86rf231_settings.h       | 0
 examples/rpl_udp/Makefile                                    | 4 +++-
 sys/shell/commands/sc_transceiver.c                          | 5 +++++
 sys/shell/commands/shell_commands.c                          | 2 +-
 sys/transceiver/transceiver.c                                | 1 -
 7 files changed, 11 insertions(+), 7 deletions(-)
 rename drivers/{at86rf231/include => include/at86rf231}/at86rf231_settings.h (100%)

diff --git a/drivers/at86rf231/at86rf231_spi.c b/drivers/at86rf231/at86rf231_spi.c
index 166bd9ee52..bbc5586550 100644
--- a/drivers/at86rf231/at86rf231_spi.c
+++ b/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)
 {
diff --git a/drivers/include/at86rf231.h b/drivers/include/at86rf231.h
index 65ef56374a..9e152b20ee 100644
--- a/drivers/include/at86rf231.h
+++ b/drivers/include/at86rf231.h
@@ -8,9 +8,7 @@
 
 #include "ieee802154_frame.h"
 
-#include "at86rf231_arch.h"
-#include "at86rf231_settings.h"
-#include "at86rf231_spi.h"
+#include "at86rf231/at86rf231_settings.h"
 
 #define AT86RF231_MAX_PKT_LENGTH 127
 #define AT86RF231_MAX_DATA_LENGTH 118
diff --git a/drivers/at86rf231/include/at86rf231_settings.h b/drivers/include/at86rf231/at86rf231_settings.h
similarity index 100%
rename from drivers/at86rf231/include/at86rf231_settings.h
rename to drivers/include/at86rf231/at86rf231_settings.h
diff --git a/examples/rpl_udp/Makefile b/examples/rpl_udp/Makefile
index f6c82e3e29..5cf18e48df 100644
--- a/examples/rpl_udp/Makefile
+++ b/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
diff --git a/sys/shell/commands/sc_transceiver.c b/sys/shell/commands/sc_transceiver.c
index c2ea7ecb28..9954d59ce4 100644
--- a/sys/shell/commands/sc_transceiver.c
+++ b/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
diff --git a/sys/shell/commands/shell_commands.c b/sys/shell/commands/shell_commands.c
index a2aa5f038b..ace871a7f9 100644
--- a/sys/shell/commands/shell_commands.c
+++ b/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
diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c
index e5bd66b43d..4d15fe1bf6 100644
--- a/sys/transceiver/transceiver.c
+++ b/sys/transceiver/transceiver.c
@@ -55,7 +55,6 @@
 
 #ifdef MODULE_AT86RF231
 #include "at86rf231.h"
-#include "at86rf231_arch.h"
 #endif
 
 #define ENABLE_DEBUG (0)