Skip to content

Commit 69966dd

Browse files
Joshua Lillynashif
Joshua Lilly
authored andcommitted
lib: hashmap: Move hash table files lib/hashmap
Moves the hashmap related files into their own directory Signed-off-by: Joshua Lilly <[email protected]>
1 parent 8333b12 commit 69966dd

13 files changed

+17
-10
lines changed

lib/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ add_subdirectory(libc)
55
add_subdirectory(posix)
66
endif()
77
add_subdirectory_ifdef(CONFIG_CPP cpp)
8+
add_subdirectory(hash)
89
add_subdirectory(os)
910
add_subdirectory(util)
1011
add_subdirectory_ifdef(CONFIG_SMF smf)

lib/Kconfig

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ source "lib/cpp/Kconfig"
77

88
menu "Additional libraries"
99

10+
source "lib/hash/Kconfig"
11+
1012
source "lib/os/Kconfig"
1113

1214
source "lib/posix/Kconfig"

lib/hash/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright (c) 2022 Meta
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_DJB2 hash_func32_djb2.c)
5+
zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_MURMUR3 hash_func32_murmur3.c)
6+
7+
zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_SC hash_map_sc.c)
8+
zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_OA_LP hash_map_oa_lp.c)
9+
zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_CXX hash_map_cxx.cpp)

lib/hash/Kconfig

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copyright (c) 2022 Meta
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
rsource "Kconfig.hash_func"
5+
rsource "Kconfig.hash_map"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

lib/os/CMakeLists.txt

-7
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ zephyr_sources_ifdef(CONFIG_SYS_MEM_BLOCKS mem_blocks.c)
6464

6565
zephyr_sources_ifdef(CONFIG_WINSTREAM winstream.c)
6666

67-
zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_DJB2 hash_func32_djb2.c)
68-
zephyr_sources_ifdef(CONFIG_SYS_HASH_FUNC32_MURMUR3 hash_func32_murmur3.c)
69-
70-
zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_SC hash_map_sc.c)
71-
zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_OA_LP hash_map_oa_lp.c)
72-
zephyr_sources_ifdef(CONFIG_SYS_HASH_MAP_CXX hash_map_cxx.cpp)
73-
7467
zephyr_library_include_directories(
7568
${ZEPHYR_BASE}/kernel/include
7669
${ZEPHYR_BASE}/arch/${ARCH}/include

lib/os/Kconfig

-3
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,4 @@ rsource "Kconfig.cbprintf"
176176

177177
rsource "Kconfig.heap"
178178

179-
rsource "Kconfig.hash_func"
180-
rsource "Kconfig.hash_map"
181-
182179
endmenu

0 commit comments

Comments
 (0)