include/sdfw_services: Move into include/sdfw/sdfw_services

Also, fix #include statements after move. Ref: NCSDK-24470 Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
D-Triveni · Apr 12, 2024 · 250fec8 · 250fec8
1 parent 555ece9
commit 250fec8
Show file tree

Hide file tree

Showing 24 changed files with 40 additions and 40 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -100,7 +100,7 @@ Kconfig*                                  @tejlmand
 /include/mpsl/                            @nrfconnect/ncs-dragoon
 /include/net/                             @rlubos
 /include/nfc/                             @anangl @grochu
-/include/sdfw_services/                   @anhmolt @hakonfam @jonathannilsen
+/include/sdfw/                            @anhmolt @hakonfam @jonathannilsen
 /include/shell/                           @nordic-krch
 /lib/bin/                                 @rlubos @lemrey
 /lib/adp536x/                             @nrfconnect/ncs-cia

diff --git a/include/sdfw_services/echo_service.h → include/sdfw/sdfw_services/echo_service.h b/include/sdfw_services/echo_service.h → include/sdfw/sdfw_services/echo_service.h
@@ -9,7 +9,7 @@
 
 #include <stddef.h>
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 /** .. include_startingpoint_echo_header_rst */
 /**

diff --git a/include/sdfw_services/extmem_remote.h → include/sdfw/sdfw_services/extmem_remote.h b/include/sdfw_services/extmem_remote.h → include/sdfw/sdfw_services/extmem_remote.h
diff --git a/include/sdfw_services/prng_service.h → include/sdfw/sdfw_services/prng_service.h b/include/sdfw_services/prng_service.h → include/sdfw/sdfw_services/prng_service.h
diff --git a/include/sdfw_services/reset_evt_service.h → ...de/sdfw/sdfw_services/reset_evt_service.h b/include/sdfw_services/reset_evt_service.h → ...de/sdfw/sdfw_services/reset_evt_service.h
@@ -10,7 +10,7 @@
 #include <stdint.h>
 
 #include <nrfx.h>
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 /** Error code in response from server if it failed to register or deregister
  *  the requested subscription.

diff --git a/include/sdfw_services/sdfw_update_service.h → .../sdfw/sdfw_services/sdfw_update_service.h b/include/sdfw_services/sdfw_update_service.h → .../sdfw/sdfw_services/sdfw_update_service.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 /* Error code in response from server if an error occurred when performing the request. */
 #define SSF_SDFW_UPDATE_FAILED 0x3dfc0001

diff --git a/include/sdfw_services/ssf_client.h → include/sdfw/sdfw_services/ssf_client.h b/include/sdfw_services/ssf_client.h → include/sdfw/sdfw_services/ssf_client.h
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 /**
  * @brief       Structure to hold a raw request or response.

diff --git a/include/sdfw_services/ssf_client_notif.h → ...ude/sdfw/sdfw_services/ssf_client_notif.h b/include/sdfw_services/ssf_client_notif.h → ...ude/sdfw/sdfw_services/ssf_client_notif.h
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 /**
  * @brief       SSF notification decode function prototype.

diff --git a/include/sdfw_services/ssf_errno.h → include/sdfw/sdfw_services/ssf_errno.h b/include/sdfw_services/ssf_errno.h → include/sdfw/sdfw_services/ssf_errno.h
diff --git a/samples/sdfw/ssf_client/README.rst b/samples/sdfw/ssf_client/README.rst
@@ -23,7 +23,7 @@ Overview
 ********
 
 The sample shows how to use Secure Domain services by invoking some of the available services.
-Available Secure Domain Services can be found in :file:`nrf/include/sdfw_services`.
+Available Secure Domain Services can be found in :file:`nrf/include/sdfw/sdfw_services`.
 The service source files are located in :file:`nrf/subsys/sdfw_services/services`.
 
 

diff --git a/samples/sdfw/ssf_client/src/main.c b/samples/sdfw/ssf_client/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <sdfw_services/echo_service.h>
-#include <sdfw_services/prng_service.h>
-#include <sdfw_services/reset_evt_service.h>
-#include <sdfw_services/sdfw_update_service.h>
+#include <sdfw/sdfw_services/echo_service.h>
+#include <sdfw/sdfw_services/prng_service.h>
+#include <sdfw/sdfw_services/reset_evt_service.h>
+#include <sdfw/sdfw_services/sdfw_update_service.h>
 
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>

diff --git a/subsys/sdfw_services/os/ssf_client_os.h b/subsys/sdfw_services/os/ssf_client_os.h
@@ -7,7 +7,7 @@
 #ifndef SSF_CLIENT_OS_H__
 #define SSF_CLIENT_OS_H__
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 #if defined(__ZEPHYR__)
 #include "ssf_client_zephyr.h"

diff --git a/subsys/sdfw_services/os/ssf_client_zephyr.c b/subsys/sdfw_services/os/ssf_client_zephyr.c
@@ -6,8 +6,8 @@
 
 #include "ssf_client_zephyr.h"
 
-#include <sdfw_services/ssf_client.h>
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 #include "ssf_client_os.h"
 
 #include <errno.h>

diff --git a/subsys/sdfw_services/services/echo/echo_service.c b/subsys/sdfw_services/services/echo/echo_service.c
@@ -9,12 +9,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sdfw_services/echo_service.h>
+#include <sdfw/sdfw_services/echo_service.h>
 
 #include "echo_service_decode.h"
 #include "echo_service_encode.h"
 #include "echo_service_types.h"
-#include <sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client.h>
 #include "ssf_client_os.h"
 
 SSF_CLIENT_SERVICE_DEFINE(echo_srvc, ECHO, cbor_encode_echo_service_req,

diff --git a/subsys/sdfw_services/services/extmem/extmem_remote.c b/subsys/sdfw_services/services/extmem/extmem_remote.c
@@ -8,10 +8,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sdfw_services/extmem_remote.h>
+#include <sdfw/sdfw_services/extmem_remote.h>
 
-#include <sdfw_services/ssf_client.h>
-#include <sdfw_services/ssf_client_notif.h>
+#include <sdfw/sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client_notif.h>
 #include "extmem_service_decode.h"
 #include "extmem_service_encode.h"
 #include "extmem_service_types.h"

diff --git a/subsys/sdfw_services/services/prng/prng_service.c b/subsys/sdfw_services/services/prng/prng_service.c
@@ -8,12 +8,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sdfw_services/prng_service.h>
+#include <sdfw/sdfw_services/prng_service.h>
 
 #include "prng_service_decode.h"
 #include "prng_service_encode.h"
 #include "prng_service_types.h"
-#include <sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client.h>
 #include "ssf_client_os.h"
 
 SSF_CLIENT_SERVICE_DEFINE(prng_srvc, PRNG, cbor_encode_prng_req, cbor_decode_prng_rsp);

diff --git a/subsys/sdfw_services/services/reset_evt/reset_evt_service.c b/subsys/sdfw_services/services/reset_evt/reset_evt_service.c
@@ -8,14 +8,14 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <sdfw_services/reset_evt_service.h>
+#include <sdfw/sdfw_services/reset_evt_service.h>
 
 #include "reset_evt_service_decode.h"
 #include "reset_evt_service_encode.h"
 #include "reset_evt_service_types.h"
-#include <sdfw_services/ssf_client.h>
-#include <sdfw_services/ssf_client_notif.h>
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client_notif.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 #include "ssf_client_os.h"
 
 SSF_CLIENT_LOG_REGISTER(reset_evt_service, CONFIG_SSF_RESET_EVT_SERVICE_LOG_LEVEL);

diff --git a/subsys/sdfw_services/services/sdfw_update/sdfw_update_service.c b/subsys/sdfw_services/services/sdfw_update/sdfw_update_service.c
@@ -7,12 +7,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <sdfw_services/sdfw_update_service.h>
+#include <sdfw/sdfw_services/sdfw_update_service.h>
 
 #include "sdfw_update_service_decode.h"
 #include "sdfw_update_service_encode.h"
 #include "sdfw_update_service_types.h"
-#include <sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client.h>
 #include "ssf_client_os.h"
 
 SSF_CLIENT_LOG_REGISTER(sdfw_update_service, CONFIG_SSF_SDFW_UPDATE_SERVICE_LOG_LEVEL);

diff --git a/subsys/sdfw_services/ssf_client.c b/subsys/sdfw_services/ssf_client.c
@@ -9,10 +9,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client.h>
 
-#include <sdfw_services/ssf_client_notif.h>
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_client_notif.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 #include "ssf_client_os.h"
 #include "ssf_client_transport.h"
 

diff --git a/subsys/sdfw_services/ssf_client_notif.c b/subsys/sdfw_services/ssf_client_notif.c
@@ -8,9 +8,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <sdfw_services/ssf_client_notif.h>
+#include <sdfw/sdfw_services/ssf_client_notif.h>
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 #include "ssf_client_os.h"
 #include "ssf_client_transport.h"
 

diff --git a/subsys/sdfw_services/transport/nrf_rpc/ssf_client_nrf_rpc.c b/subsys/sdfw_services/transport/nrf_rpc/ssf_client_nrf_rpc.c
@@ -9,7 +9,7 @@
 
 #include "ssf_client_transport.h"
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 #include "ssf_client_os.h"
 #include "ssf_nrf_rpc_common.h"
 #include <nrf_rpc/nrf_rpc_ipc.h>

diff --git a/subsys/sdfw_services/transport/nrf_rpc/ssf_nrf_rpc_common.h b/subsys/sdfw_services/transport/nrf_rpc/ssf_nrf_rpc_common.h
@@ -7,7 +7,7 @@
 #ifndef SSF_NRF_RPC_COMMON_H__
 #define SSF_NRF_RPC_COMMON_H__
 
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 #include <nrf_rpc_errno.h>
 

diff --git a/tests/subsys/sdfw_services/client/src/ssf_client_test.c b/tests/subsys/sdfw_services/client/src/ssf_client_test.c
@@ -8,9 +8,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sdfw_services/ssf_client.h>
-#include <sdfw_services/ssf_client_notif.h>
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client_notif.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 #include <nrf_rpc_errno.h>
 #include <zcbor_common.h>

diff --git a/tests/subsys/sdfw_services/client_notif/src/ssf_client_notif_test.c b/tests/subsys/sdfw_services/client_notif/src/ssf_client_notif_test.c
@@ -8,9 +8,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sdfw_services/ssf_client.h>
-#include <sdfw_services/ssf_client_notif.h>
-#include <sdfw_services/ssf_errno.h>
+#include <sdfw/sdfw_services/ssf_client.h>
+#include <sdfw/sdfw_services/ssf_client_notif.h>
+#include <sdfw/sdfw_services/ssf_errno.h>
 
 #include <zcbor_common.h>
 #include <zephyr/toolchain.h>