treewide: restructure libraries, subsystems and drivers

Restructure libraries, subsystems and drivers including headers.

Signed-off-by: Eivind Jølsgard <[email protected]>

Author: eivindj-nordic

CODEOWNERS

@@ -36,27 +36,25 @@
 # Drivers
 /drivers/clock_control/                   @nrfconnect/ncs-bm
 /drivers/console/                         @nrfconnect/ncs-bm
-/drivers/lpuarte/                         @nrfconnect/ncs-bm
+/drivers/bm_lpuarte/                      @nrfconnect/ncs-bm
 
 # Include
 /include/*.h                              @nrfconnect/ncs-bm
 /include/bm/                              @nrfconnect/ncs-bm
 /include/bm/bluetooth/                    @nrfconnect/ncs-bm
 
 # Libraries
-/lib/bm_zms/                              @nrfconnect/ncs-bm @rghaddab
-/lib/ble_adv/                             @nrfconnect/ncs-bm
-/lib/ble_conn_params/                     @nrfconnect/ncs-bm
-/lib/ble_conn_state/                      @nrfconnect/ncs-bm
-/lib/ble_gq/                              @nrfconnect/ncs-bm
-/lib/ble_qwr/                             @nrfconnect/ncs-bm
-/lib/ble_racp/                            @nrfconnect/ncs-bm
+/lib/bluetooth/ble_adv/                   @nrfconnect/ncs-bm
+/lib/bluetooth/ble_conn_params/           @nrfconnect/ncs-bm
+/lib/bluetooth/ble_conn_state/            @nrfconnect/ncs-bm
+/lib/bluetooth/ble_gq/                    @nrfconnect/ncs-bm
+/lib/bluetooth/ble_qwr/                   @nrfconnect/ncs-bm
+/lib/bluetooth/ble_racp/                  @nrfconnect/ncs-bm
+/lib/bluetooth/peer_manager/              @nrfconnect/ncs-bm
 /lib/bm_buttons/                          @nrfconnect/ncs-bm
-/lib/bm_storage/                          @nrfconnect/ncs-bm
 /lib/bm_timer/                            @nrfconnect/ncs-bm
 /lib/boot_banner/                         @nrfconnect/ncs-bm
 /lib/event_scheduler/                     @nrfconnect/ncs-bm
-/lib/peer_manager/                        @nrfconnect/ncs-bm
 /lib/sensorsim/                           @nrfconnect/ncs-bm
 /lib/zephyr_queue/                        @nrfconnect/ncs-eris
 
@@ -79,23 +77,25 @@
 # Subsystems
 /subsys/bluetooth/                        @nrfconnect/ncs-bm
 /subsys/bm_installs/                      @nrfconnect/ncs-eris
+/subsys/fs/bm_zms/                        @nrfconnect/ncs-bm @rghaddab
 /subsys/logging/                          @nrfconnect/ncs-bm
 /subsys/mgmt/mcumgr/                      @nrfconnect/ncs-eris
 /subsys/softdevice/                       @nrfconnect/ncs-bm
 /subsys/softdevice_handler/               @nrfconnect/ncs-bm
+/subsys/storage/bm_storage/               @nrfconnect/ncs-bm
 /subsys/storage/flash_map/                @nrfconnect/ncs-eris
 
 # Sysbuild
 /sysbuild/                                @nrfconnect/ncs-co-build-system
 
 # Tests
-/tests/lib/bm_zms/                        @nrfconnect/ncs-bm @rghaddab
-/tests/lib/ble_conn_state/                @nrfconnect/ncs-bm
-/tests/lib/ble_qwr/                       @nrfconnect/ncs-bm
-/tests/lib/ble_racp/                      @nrfconnect/ncs-bm
-/tests/lib/ble_adv/                       @nrfconnect/ncs-bm-test
-/tests/lib/bm_storage/                    @nrfconnect/ncs-bm
+/tests/lib/bluetooth/ble_conn_state/      @nrfconnect/ncs-bm
+/tests/lib/bluetooth/ble_qwr/             @nrfconnect/ncs-bm
+/tests/lib/bluetooth/ble_racp/            @nrfconnect/ncs-bm
+/tests/lib/bluetooth/ble_adv/             @nrfconnect/ncs-bm-test
 /tests/subsys/bluetooth/services/         @nrfconnect/ncs-bm @nrfconnect/ncs-bm-test
+/tests/subsys/fs/bm_zms/                  @nrfconnect/ncs-bm @rghaddab
+/tests/subsys/storage/bm_storage/         @nrfconnect/ncs-bm
 
 # Zephyr module
 /zephyr/                                  @nrfconnect/ncs-co-build-system

applications/firmware_loader/ble_mcumgr/src/main.c

@@ -10,8 +10,8 @@
 #include <string.h>
 #include <ble_gap.h>
 #include <nrf_soc.h>
-#include <bm/nrf_sdh.h>
-#include <bm/nrf_sdh_ble.h>
+#include <bm/softdevice_handler/nrf_sdh.h>
+#include <bm/softdevice_handler/nrf_sdh_ble.h>
 #include <bm/bluetooth/ble_adv.h>
 #include <bm/bluetooth/ble_conn_params.h>
 #include <bm/bluetooth/ble_conn_params.h>

doc/nrf-bm/doxygen/nrf-bm.doxyfile

@@ -957,8 +957,13 @@ WARN_LOGFILE           =
 
 INPUT                  = ../../../include/ \
                          ../../../include/bm/ \
+                         ../../../include/bm/bluetooth \
                          ../../../include/bm/bluetooth/services \
                          ../../../include/bm/bluetooth/peer_manager \
+                         ../../../include/bm/drivers \
+                         ../../../include/bm/fs \
+                         ../../../include/bm/softdevice_handler \
+                         ../../../include/bm/storage \
                          mainpage.dox
 
 # This tag can be used to specify the character encoding of the source files

doc/nrf-bm/libraries/bm_zms.rst

@@ -10,4 +10,4 @@ add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>)
 add_subdirectory_ifdef(CONFIG_CONSOLE console)
 add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control)
 add_subdirectory_ifdef(CONFIG_FLASH flash)
-add_subdirectory_ifdef(CONFIG_BM_SW_LPUARTE lpuarte)
+add_subdirectory_ifdef(CONFIG_BM_SW_LPUARTE bm_lpuarte)

drivers/CMakeLists.txt

@@ -8,7 +8,7 @@ menu "Device Drivers"
 # zephyr-keep-sorted-start
 rsource "console/Kconfig"
 rsource "flash/Kconfig"
-rsource "lpuarte/Kconfig"
+rsource "bm_lpuarte/Kconfig"
 # zephyr-keep-sorted-stop
 
 endmenu

drivers/Kconfig

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <bm/bm_lpuarte.h>
+#include <bm/drivers/bm_lpuarte.h>
 #include <nrfx_gpiote.h>
 #include <nrfx_uarte.h>
 #include <zephyr/logging/log.h>

drivers/lpuarte/CMakeLists.txt renamed to drivers/bm_lpuarte/CMakeLists.txt

@@ -15,8 +15,8 @@
 #include <zephyr/sys/barrier.h>
 #include <hal/nrf_rramc.h>
 #include <nrf_soc.h>
-#include <bm/nrf_sdh.h>
-#include <bm/nrf_sdh_soc.h>
+#include <bm/softdevice_handler/nrf_sdh.h>
+#include <bm/softdevice_handler/nrf_sdh_soc.h>
 
 /* Note that it is supported to compile this driver for both secure
  * and non-secure images, but non-secure images cannot call