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>
diff --git a/erpc/generated_files/tfm_erpc_server.h b/erpc/generated_files/tfm_erpc_server.h
new file mode 100644
index 0000000..b8162a4
--- /dev/null
+++ b/erpc/generated_files/tfm_erpc_server.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2023, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+/*
+ * Generated by erpcgen 1.9.1 on Fri Jul 21 17:28:31 2023.
+ *
+ * AUTOGENERATED - DO NOT EDIT
+ */
+
+
+#if !defined(_tfm_erpc_server_h_)
+#define _tfm_erpc_server_h_
+
+#ifdef __cplusplus
+#include "erpc_server.h"
+#include "erpc_codec.h"
+extern "C"
+{
+#include "tfm_erpc.h"
+#include <stdint.h>
+#include <stdbool.h>
+}
+
+#if 10901 != ERPC_VERSION_NUMBER
+#error "The generated shim code version is different to the rest of eRPC code."
+#endif
+
+
+/*!
+ * @brief Service subclass for psa_client_api.
+ */
+class psa_client_api_service : public erpc::Service
+{
+public:
+    psa_client_api_service() : Service(kpsa_client_api_service_id) {}
+
+    /*! @brief Call the correct server shim based on method unique ID. */
+    virtual erpc_status_t handleInvocation(uint32_t methodId, uint32_t sequence, erpc::Codec * codec, erpc::MessageBufferFactory *messageFactory);
+
+private:
+    /*! @brief Server shim for psa_framework_version of psa_client_api interface. */
+    erpc_status_t psa_framework_version_shim(erpc::Codec * codec, erpc::MessageBufferFactory *messageFactory, uint32_t sequence);
+
+    /*! @brief Server shim for psa_version of psa_client_api interface. */
+    erpc_status_t psa_version_shim(erpc::Codec * codec, erpc::MessageBufferFactory *messageFactory, uint32_t sequence);
+
+    /*! @brief Server shim for erpc_psa_call of psa_client_api interface. */
+    erpc_status_t erpc_psa_call_shim(erpc::Codec * codec, erpc::MessageBufferFactory *messageFactory, uint32_t sequence);
+
+    /*! @brief Server shim for psa_connect of psa_client_api interface. */
+    erpc_status_t psa_connect_shim(erpc::Codec * codec, erpc::MessageBufferFactory *messageFactory, uint32_t sequence);
+
+    /*! @brief Server shim for psa_close of psa_client_api interface. */
+    erpc_status_t psa_close_shim(erpc::Codec * codec, erpc::MessageBufferFactory *messageFactory, uint32_t sequence);
+};
+
+extern "C" {
+#else
+#include "tfm_erpc.h"
+#endif // __cplusplus
+
+typedef void * erpc_service_t;
+
+erpc_service_t create_psa_client_api_service(void);
+
+#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
+void destroy_psa_client_api_service(erpc_service_t service);
+#elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
+void destroy_psa_client_api_service(void);
+#else
+#warning "Unknown eRPC allocation policy!"
+#endif
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+#endif // _tfm_erpc_server_h_