lib: flatten all loose components into one lib

lib/ was starting to get messy and inconsitent. Files being either dumped in the root or in sub-directories without a clear plan. Move all library components into one single folder and call it 'os'. Signed-off-by: Anas Nashif <[email protected]>
masz-nordic · Jan 22, 2019 · db92e5c · db92e5c
1 parent 885aaf2
commit db92e5c
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 39 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,15 +1,8 @@
-zephyr_sources(thread_entry.c work_q.c)
-zephyr_sources(fdtable.c)
-add_subdirectory(crc)
-add_subdirectory_ifdef(CONFIG_JSON_LIBRARY          json)
 if(NOT CONFIG_NATIVE_APPLICATION)
 add_subdirectory(libc)
 endif()
-add_subdirectory_if_kconfig(ring_buffer)
-add_subdirectory_if_kconfig(base64)
-add_subdirectory(mempool)
 add_subdirectory_ifdef(CONFIG_POSIX_API            posix)
 add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V1        cmsis_rtos_v1)
 add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V2        cmsis_rtos_v2)
-add_subdirectory(rbtree)
 add_subdirectory(gui)
+add_subdirectory(os)
diff --git a/lib/Kconfig b/lib/Kconfig
@@ -8,29 +8,14 @@ source "lib/libc/Kconfig"
 
 menu "Additional libraries"
 
-config JSON_LIBRARY
-	bool "Build JSON library"
-	help
-	  Build a minimal JSON parsing/encoding library. Used by sample
-	  applications such as the NATS client.
-
-config RING_BUFFER
-	bool "Enable ring buffers"
-	help
-	  Enable usage of ring buffers. This is similar to kernel FIFOs but ring
-	  buffers manage their own buffer memory and can store arbitrary data.
-	  For optimal performance, use buffer sizes that are a power of 2.
-
-config BASE64
-	bool "Enable base64 encoding and decoding"
-	help
-	  Enable base64 encoding and decoding functionality
-
-source "lib/posix/Kconfig"
-
 source "lib/cmsis_rtos_v1/Kconfig"
+
 source "lib/cmsis_rtos_v2/Kconfig"
 
 source "lib/gui/Kconfig"
 
+source "lib/os/Kconfig"
+
+source "lib/posix/Kconfig"
+
 endmenu
diff --git a/lib/base64/CMakeLists.txt b/lib/base64/CMakeLists.txt
diff --git a/lib/crc/CMakeLists.txt b/lib/crc/CMakeLists.txt
diff --git a/lib/json/CMakeLists.txt b/lib/json/CMakeLists.txt
diff --git a/lib/mempool/CMakeLists.txt b/lib/mempool/CMakeLists.txt
diff --git a/lib/os/CMakeLists.txt b/lib/os/CMakeLists.txt
@@ -0,0 +1,17 @@
+zephyr_sources_if_kconfig(base64.c)
+
+zephyr_sources(
+  crc32_sw.c
+  crc16_sw.c
+  crc8_sw.c
+  crc7_sw.c
+  fdtable.c
+  mempool.c
+  rb.c
+  thread_entry.c
+  work_q.c
+  )
+
+zephyr_sources_ifdef(CONFIG_JSON_LIBRARY json.c)
+
+zephyr_sources_if_kconfig(ring_buffer.c)
diff --git a/lib/os/Kconfig b/lib/os/Kconfig
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2016 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+menu "OS Support Library"
+
+config JSON_LIBRARY
+	bool "Build JSON library"
+	help
+	  Build a minimal JSON parsing/encoding library. Used by sample
+	  applications such as the NATS client.
+
+config RING_BUFFER
+	bool "Enable ring buffers"
+	help
+	  Enable usage of ring buffers. This is similar to kernel FIFOs but ring
+	  buffers manage their own buffer memory and can store arbitrary data.
+	  For optimal performance, use buffer sizes that are a power of 2.
+
+config BASE64
+	bool "Enable base64 encoding and decoding"
+	help
+	  Enable base64 encoding and decoding functionality
+
+endmenu
diff --git a/lib/base64/base64.c → lib/os/base64.c b/lib/base64/base64.c → lib/os/base64.c
diff --git a/lib/crc/crc16_sw.c → lib/os/crc16_sw.c b/lib/crc/crc16_sw.c → lib/os/crc16_sw.c
diff --git a/lib/crc/crc32_sw.c → lib/os/crc32_sw.c b/lib/crc/crc32_sw.c → lib/os/crc32_sw.c
diff --git a/lib/crc/crc7_sw.c → lib/os/crc7_sw.c b/lib/crc/crc7_sw.c → lib/os/crc7_sw.c
diff --git a/lib/crc/crc8_sw.c → lib/os/crc8_sw.c b/lib/crc/crc8_sw.c → lib/os/crc8_sw.c
diff --git a/lib/fdtable.c → lib/os/fdtable.c b/lib/fdtable.c → lib/os/fdtable.c
diff --git a/lib/json/json.c → lib/os/json.c b/lib/json/json.c → lib/os/json.c
diff --git a/lib/mempool/mempool.c → lib/os/mempool.c b/lib/mempool/mempool.c → lib/os/mempool.c
diff --git a/lib/rbtree/rb.c → lib/os/rb.c b/lib/rbtree/rb.c → lib/os/rb.c
diff --git a/lib/ring_buffer/ring_buffer.c → lib/os/ring_buffer.c b/lib/ring_buffer/ring_buffer.c → lib/os/ring_buffer.c
diff --git a/lib/thread_entry.c → lib/os/thread_entry.c b/lib/thread_entry.c → lib/os/thread_entry.c
diff --git a/lib/work_q.c → lib/os/work_q.c b/lib/work_q.c → lib/os/work_q.c
diff --git a/lib/rbtree/CMakeLists.txt b/lib/rbtree/CMakeLists.txt
diff --git a/lib/ring_buffer/CMakeLists.txt b/lib/ring_buffer/CMakeLists.txt
diff --git a/tests/unit/lib/crc/main.c b/tests/unit/lib/crc/main.c
@@ -6,10 +6,10 @@
 
 #include <ztest.h>
 
-#include <lib/crc/crc32_sw.c>
-#include <lib/crc/crc16_sw.c>
-#include <lib/crc/crc8_sw.c>
-#include <lib/crc/crc7_sw.c>
+#include <lib/os/crc32_sw.c>
+#include <lib/os/crc16_sw.c>
+#include <lib/os/crc8_sw.c>
+#include <lib/os/crc7_sw.c>
 
 void test_crc32_ieee(void)
 {