From 0c5929c18527c85bcea5145419793392f5ff02f3 Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Tue, 26 Mar 2019 21:37:35 +0100
Subject: [PATCH 1/2] ble/skald: move module to sys/net/ble

---
 sys/Makefile                              | 2 +-
 sys/net/{ => ble}/skald/Makefile          | 0
 sys/net/{ => ble}/skald/skald.c           | 0
 sys/net/{ => ble}/skald/skald_eddystone.c | 0
 sys/net/{ => ble}/skald/skald_ibeacon.c   | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename sys/net/{ => ble}/skald/Makefile (100%)
 rename sys/net/{ => ble}/skald/skald.c (100%)
 rename sys/net/{ => ble}/skald/skald_eddystone.c (100%)
 rename sys/net/{ => ble}/skald/skald_ibeacon.c (100%)

diff --git a/sys/Makefile b/sys/Makefile
index 5a7f2c340b..0852a691dc 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -125,7 +125,7 @@ ifneq (,$(filter nanocoap,$(USEMODULE)))
   DIRS += net/application_layer/nanocoap
 endif
 ifneq (,$(filter skald,$(USEMODULE)))
-  DIRS += net/skald
+  DIRS += net/ble/skald
 endif
 ifneq (,$(filter cord_common,$(USEMODULE)))
   DIRS += net/application_layer/cord/common
diff --git a/sys/net/skald/Makefile b/sys/net/ble/skald/Makefile
similarity index 100%
rename from sys/net/skald/Makefile
rename to sys/net/ble/skald/Makefile
diff --git a/sys/net/skald/skald.c b/sys/net/ble/skald/skald.c
similarity index 100%
rename from sys/net/skald/skald.c
rename to sys/net/ble/skald/skald.c
diff --git a/sys/net/skald/skald_eddystone.c b/sys/net/ble/skald/skald_eddystone.c
similarity index 100%
rename from sys/net/skald/skald_eddystone.c
rename to sys/net/ble/skald/skald_eddystone.c
diff --git a/sys/net/skald/skald_ibeacon.c b/sys/net/ble/skald/skald_ibeacon.c
similarity index 100%
rename from sys/net/skald/skald_ibeacon.c
rename to sys/net/ble/skald/skald_ibeacon.c

From aad15751ad83cf41bd2d6415d269a29b87727a3d Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Tue, 26 Mar 2019 21:56:05 +0100
Subject: [PATCH 2/2] ble/skald: adapt doxygen groups

---
 sys/include/net/skald.h             | 4 ++--
 sys/include/net/skald/eddystone.h   | 4 ++--
 sys/include/net/skald/ibeacon.h     | 4 ++--
 sys/net/ble/skald/skald.c           | 2 +-
 sys/net/ble/skald/skald_eddystone.c | 2 +-
 sys/net/ble/skald/skald_ibeacon.c   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/include/net/skald.h b/sys/include/net/skald.h
index 4583341c53..ce5e0131ac 100644
--- a/sys/include/net/skald.h
+++ b/sys/include/net/skald.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    net_skald Skald, who advertises to the world
- * @ingroup     net
+ * @defgroup    ble_skald Skald, who advertises to the world
+ * @ingroup     ble
  * @brief       Skald, a minimalistic BLE advertising stack
  *
  * # About
diff --git a/sys/include/net/skald/eddystone.h b/sys/include/net/skald/eddystone.h
index 9c8ddd6365..f45cccd2c3 100644
--- a/sys/include/net/skald/eddystone.h
+++ b/sys/include/net/skald/eddystone.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    net_skald_eddystone Skald meets Eddy
- * @ingroup     net_skald
+ * @defgroup    ble_skald_eddystone Skald meets Eddy
+ * @ingroup     ble_skald
  * @brief       Skald's Eddystone implementation
  *
  * # About
diff --git a/sys/include/net/skald/ibeacon.h b/sys/include/net/skald/ibeacon.h
index 0f87430068..174a192978 100644
--- a/sys/include/net/skald/ibeacon.h
+++ b/sys/include/net/skald/ibeacon.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    net_skald_ibeacon Skald about iBeacon
- * @ingroup     net_skald
+ * @defgroup    ble_skald_ibeacon Skald about iBeacon
+ * @ingroup     ble_skald
  * @brief       Skald's simple iBeacon abstraction
  *
  * # About
diff --git a/sys/net/ble/skald/skald.c b/sys/net/ble/skald/skald.c
index 858f8b03a5..58151bb82b 100644
--- a/sys/net/ble/skald/skald.c
+++ b/sys/net/ble/skald/skald.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     net_skald
+ * @ingroup     ble_skald
  * @{
  *
  * @file
diff --git a/sys/net/ble/skald/skald_eddystone.c b/sys/net/ble/skald/skald_eddystone.c
index 847d6f09d8..cb55df2f33 100644
--- a/sys/net/ble/skald/skald_eddystone.c
+++ b/sys/net/ble/skald/skald_eddystone.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     net_skald_eddystone
+ * @ingroup     ble_skald_eddystone
  * @{
  *
  * @file
diff --git a/sys/net/ble/skald/skald_ibeacon.c b/sys/net/ble/skald/skald_ibeacon.c
index 7d67eb7da2..966b5a6b38 100644
--- a/sys/net/ble/skald/skald_ibeacon.c
+++ b/sys/net/ble/skald/skald_ibeacon.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     net_skald_ibeacon
+ * @ingroup     ble_skald_ibeacon
  * @{
  *
  * @file