commit 0eca5eaf4ffb7a2641f7d60a7f4b8d38128b471b
author Kevin Peng <kevin.peng@arm.com> Fri Jul 21 17:32:31 2023 +0800
committer Kevin Peng <kevin.peng@arm.com> Mon Jul 31 14:52:01 2023 +0800
tree 4da3efb9b1f2b1fd5758a910b43cba142ed06506
parent 7f78a8f384397d36998c88196be257706812ff85

RPC: Merge RPC PSA Client APIs

Originally, connection-based APIs are optional, depends on whether the
TF-M provides any.
So the RPC APIs are also separated so that they can be selected.

Later, the APIs are always provided with returning NOT SUPPORTED in case
of no connection-based APIs.
And the RPC test framework followed up by always building all the APIs.

This patch makes it further by merging all the APIs.

Change-Id: I923c24e5e83cae4e3d8f4774d776dbe8d07610c2
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

erpc/server/CMakeLists.txt

diff --git a/erpc/server/CMakeLists.txt b/erpc/server/CMakeLists.txt
index 0562f7f..8e43295 100644
--- a/erpc/server/CMakeLists.txt
+++ b/erpc/server/CMakeLists.txt
@@ -37,8 +37,7 @@
         ${ERPC_REPO_PATH}/erpc_c/setup/erpc_setup_mbf_dynamic.cpp
         ${ERPC_REPO_PATH}/erpc_c/setup/erpc_server_setup.cpp
         # Generated files
-        ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_client_api_server.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_connection_api_server.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_server.cpp
 )
 
 target_include_directories(erpc_server

erpc/server/erpc_server_start.c

diff --git a/erpc/server/erpc_server_start.c b/erpc/server/erpc_server_start.c
index 4d27876..ca3b6e9 100644
--- a/erpc/server/erpc_server_start.c
+++ b/erpc/server/erpc_server_start.c
@@ -9,14 +9,12 @@
 
 #include "erpc_mbf_setup.h"
 #include "erpc_server_setup.h"
-#include "tfm_erpc_psa_client_api_server.h"
-#include "tfm_erpc_psa_connection_api_server.h"
+#include "tfm_erpc_server.h"
 
 void erpc_server_start(erpc_transport_t transport)
 {
     erpc_server_init(transport, erpc_mbf_dynamic_init());
     erpc_add_service_to_server(create_psa_client_api_service());
-    erpc_add_service_to_server(create_psa_connection_api_service());
 
     erpc_server_run();
 

erpc/server/erpc_server_wrapper.c

diff --git a/erpc/server/erpc_server_wrapper.c b/erpc/server/erpc_server_wrapper.c
index 8215c9a..b27a1da 100644
--- a/erpc/server/erpc_server_wrapper.c
+++ b/erpc/server/erpc_server_wrapper.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include "psa/client.h"
-#include "tfm_erpc_psa_client_api.h"
+#include "tfm_erpc.h"
 
 psa_status_t erpc_psa_call(psa_handle_t handle, int32_t t,
                            const list_binary_1_t *erpc_in_vec,