From 8639d2c27d4c0416b455dc6069e0830565af6aeb Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Tue, 11 Aug 2015 23:52:02 +0200
Subject: [PATCH] at86rf2xx: rename remaining files and variables
---
Makefile.dep | 2 +-
Makefile.pseudomodules | 4 ++--
boards/iot-lab_M3/Makefile.dep | 2 +-
boards/mulle/Makefile.dep | 2 +-
boards/samr21-xpro/Makefile.dep | 2 +-
.../{auto_init_ng_at86rf2xx.c => auto_init_at86rf2xx.c} | 0
tests/driver_at86rf2xx/Makefile | 8 ++++----
7 files changed, 10 insertions(+), 10 deletions(-)
rename sys/auto_init/netif/{auto_init_ng_at86rf2xx.c => auto_init_at86rf2xx.c} (100%)
diff --git a/Makefile.dep b/Makefile.dep
index 7bd54f6c64..bfcadf9342 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -10,7 +10,7 @@ ifneq (,$(filter ng_nomac,$(USEMODULE)))
USEMODULE += ng_netbase
endif
-ifneq (,$(filter ng_at86rf2%,$(USEMODULE)))
+ifneq (,$(filter at86rf2%,$(USEMODULE)))
USEMODULE += at86rf2xx
USEMODULE += ieee802154
endif
diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules
index 812c825992..79ffcb8724 100644
--- a/Makefile.pseudomodules
+++ b/Makefile.pseudomodules
@@ -12,5 +12,5 @@ PSEUDOMODULES += log
PSEUDOMODULES += log_printfnoformat
# include variants of the AT86RF2xx drivers as pseudo modules
-PSEUDOMODULES += ng_at86rf23%
-PSEUDOMODULES += ng_at86rf21%
+PSEUDOMODULES += at86rf23%
+PSEUDOMODULES += at86rf21%
diff --git a/boards/iot-lab_M3/Makefile.dep b/boards/iot-lab_M3/Makefile.dep
index c5fd7c2342..b8732d076d 100644
--- a/boards/iot-lab_M3/Makefile.dep
+++ b/boards/iot-lab_M3/Makefile.dep
@@ -1,4 +1,4 @@
ifneq (,$(filter ng_netif_default,$(USEMODULE)))
- USEMODULE += ng_at86rf231
+ USEMODULE += at86rf231
USEMODULE += ng_nomac
endif
diff --git a/boards/mulle/Makefile.dep b/boards/mulle/Makefile.dep
index 98ff416c3a..7adfff1029 100644
--- a/boards/mulle/Makefile.dep
+++ b/boards/mulle/Makefile.dep
@@ -1,5 +1,5 @@
ifneq (,$(filter ng_netif_default,$(USEMODULE)))
- USEMODULE += ng_at86rf212b
+ USEMODULE += at86rf212b
USEMODULE += ng_nomac
endif
diff --git a/boards/samr21-xpro/Makefile.dep b/boards/samr21-xpro/Makefile.dep
index 87c0062d23..bc1a4baad3 100644
--- a/boards/samr21-xpro/Makefile.dep
+++ b/boards/samr21-xpro/Makefile.dep
@@ -1,4 +1,4 @@
ifneq (,$(filter ng_netif_default,$(USEMODULE)))
- USEMODULE += ng_at86rf233
+ USEMODULE += at86rf233
USEMODULE += ng_nomac
endif
diff --git a/sys/auto_init/netif/auto_init_ng_at86rf2xx.c b/sys/auto_init/netif/auto_init_at86rf2xx.c
similarity index 100%
rename from sys/auto_init/netif/auto_init_ng_at86rf2xx.c
rename to sys/auto_init/netif/auto_init_at86rf2xx.c
diff --git a/tests/driver_at86rf2xx/Makefile b/tests/driver_at86rf2xx/Makefile
index 7a443d9df6..f91040035b 100644
--- a/tests/driver_at86rf2xx/Makefile
+++ b/tests/driver_at86rf2xx/Makefile
@@ -8,19 +8,19 @@ BOARD_BLACKLIST := nucleo-f334
# nucleo-f334: not enough GPIO pins defined
ifneq (,$(filter samr21-xpro,$(BOARD)))
- DRIVER ?= ng_at86rf233
+ DRIVER ?= at86rf233
USE_BOARD_PARAMETERS:=true
endif
ifneq (,$(filter iot-lab_M3,$(BOARD)))
- DRIVER ?= ng_at86rf231
+ DRIVER ?= at86rf231
USE_BOARD_PARAMETERS:=true
endif
ifneq (,$(DRIVER))
USEMODULE += $(DRIVER)
else
- # default to ng_at86rf231
- USEMODULE += ng_at86rf231
+ # default to at86rf231
+ USEMODULE += at86rf231
endif
ifneq (true,$(USE_BOARD_PARAMETERS))
--
GitLab