From ea5e371383349d66cfd7b6917cfa5797fe82b006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Mon, 25 May 2015 21:01:51 +0200
Subject: [PATCH] sys/universal_address: separate universal_address from fib
---
Makefile.dep | 1 +
sys/Makefile | 3 +++
sys/include/net/ng_fib/ng_fib_table.h | 2 +-
.../ng_fib/ng_universal_address.h => universal_address.h} | 7 +++++--
sys/universal_address/Makefile | 3 +++
.../fib => universal_address}/universal_address.c | 4 ++--
tests/unittests/tests-fib/tests-fib.c | 2 +-
7 files changed, 16 insertions(+), 6 deletions(-)
rename sys/include/{net/ng_fib/ng_universal_address.h => universal_address.h} (97%)
create mode 100644 sys/universal_address/Makefile
rename sys/{net/network_layer/fib => universal_address}/universal_address.c (99%)
diff --git a/Makefile.dep b/Makefile.dep
index c0241ca9cd..2c12c27b7d 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -317,6 +317,7 @@ ifneq (,$(filter nhdp,$(USEMODULE)))
endif
ifneq (,$(filter fib,$(USEMODULE)))
+ USEMODULE += universal_address
USEMODULE += timex
USEMODULE += vtimer
USEMODULE += net_help
diff --git a/sys/Makefile b/sys/Makefile
index d4db3fb425..883321b7a4 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -167,6 +167,9 @@ endif
ifneq (,$(filter ng_netdev_eth,$(USEMODULE)))
DIRS += net/link_layer/ng_netdev_eth
endif
+ifneq (,$(filter universal_address,$(USEMODULE)))
+ DIRS += universal_address
+endif
DIRS += $(dir $(wildcard $(addsuffix /Makefile, ${USEMODULE})))
diff --git a/sys/include/net/ng_fib/ng_fib_table.h b/sys/include/net/ng_fib/ng_fib_table.h
index de280ee988..0477a0e01a 100644
--- a/sys/include/net/ng_fib/ng_fib_table.h
+++ b/sys/include/net/ng_fib/ng_fib_table.h
@@ -22,7 +22,7 @@
#include <stdint.h>
#include "vtimer.h"
-#include "ng_universal_address.h"
+#include "universal_address.h"
#ifdef __cplusplus
extern "C" {
diff --git a/sys/include/net/ng_fib/ng_universal_address.h b/sys/include/universal_address.h
similarity index 97%
rename from sys/include/net/ng_fib/ng_universal_address.h
rename to sys/include/universal_address.h
index 91e55d74ac..0afe5fb228 100644
--- a/sys/include/net/ng_fib/ng_universal_address.h
+++ b/sys/include/universal_address.h
@@ -7,8 +7,8 @@
*/
/**
- * @defgroup net_universal_address Universal Address Container
- * @ingroup net
+ * @defgroup sys_universal_address Universal Address Container
+ * @ingroup sys
* @brief universal address container
*
* @{
@@ -25,6 +25,9 @@
extern "C" {
#endif
+#include <stdint.h>
+#include <stdlib.h>
+
#define UNIVERSAL_ADDRESS_SIZE (16) /**< size of the used addresses in bytes */
/**
diff --git a/sys/universal_address/Makefile b/sys/universal_address/Makefile
new file mode 100644
index 0000000000..c4a4c6731f
--- /dev/null
+++ b/sys/universal_address/Makefile
@@ -0,0 +1,3 @@
+MODULE = universal_address
+
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/network_layer/fib/universal_address.c b/sys/universal_address/universal_address.c
similarity index 99%
rename from sys/net/network_layer/fib/universal_address.c
rename to sys/universal_address/universal_address.c
index 8e8052f2c2..6e08081691 100644
--- a/sys/net/network_layer/fib/universal_address.c
+++ b/sys/universal_address/universal_address.c
@@ -7,7 +7,7 @@
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*
- * @ingroup fib
+ * @ingroup sys_universal_address
* @{
* @file
* @brief Functions to manage universal address container
@@ -23,7 +23,7 @@
#define ENABLE_DEBUG (0)
#include "debug.h"
-#include "ng_fib/ng_universal_address.h"
+#include "universal_address.h"
/**
* @brief Maximum number of entries handled
diff --git a/tests/unittests/tests-fib/tests-fib.c b/tests/unittests/tests-fib/tests-fib.c
index e1f0b0674d..03b86dda7d 100644
--- a/tests/unittests/tests-fib/tests-fib.c
+++ b/tests/unittests/tests-fib/tests-fib.c
@@ -17,7 +17,7 @@
#include "thread.h"
#include "ng_fib.h"
-#include "ng_fib/ng_universal_address.h"
+#include "universal_address.h"
/*
* @brief helper to fill FIB with unique entries
--
GitLab