Align service client with the RPC caller
Change service client to use rpc_caller_session instead of the
rpc_caller_interface.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I117e7cf15a560130e9da7ea5a63f263c1c2bd33b
diff --git a/components/service/common/client/service_client.c b/components/service/common/client/service_client.c
index d5e8735..109c909 100644
--- a/components/service/common/client/service_client.c
+++ b/components/service/common/client/service_client.c
@@ -4,32 +4,31 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <stddef.h>
-#include <protocols/rpc/common/packed-c/status.h>
#include "service_client.h"
+#include <stddef.h>
-psa_status_t service_client_init(
- struct service_client *context,
- struct rpc_caller *caller)
+psa_status_t service_client_init(struct service_client *context,
+ struct rpc_caller_session *session)
{
- context->caller = caller;
- context->rpc_status = TS_RPC_CALL_ACCEPTED;
+ if (!context || !session)
+ return PSA_ERROR_INVALID_ARGUMENT;
+
+ context->session = session;
+ context->rpc_status = RPC_SUCCESS;
context->service_info.supported_encodings = 0;
- context->service_info.max_payload = 0;
+ context->service_info.max_payload = 4096;
return PSA_SUCCESS;
}
-void service_client_deinit(
- struct service_client *context)
+void service_client_deinit(struct service_client *context)
{
- context->caller = NULL;
+ context->session = NULL;
}
-void service_client_set_service_info(
- struct service_client *context,
- const struct service_info *service_info)
+void service_client_set_service_info(struct service_client *context,
+ const struct service_info *service_info)
{
context->service_info = *service_info;
}
diff --git a/components/service/common/client/service_client.h b/components/service/common/client/service_client.h
index df5b31b..70a6aee 100644
--- a/components/service/common/client/service_client.h
+++ b/components/service/common/client/service_client.h
@@ -9,7 +9,7 @@
#include <stddef.h>
#include <psa/error.h>
-#include <rpc_caller.h>
+#include "components/rpc/common/caller/rpc_caller_session.h"
#include <service/common/client/service_info.h>
#ifdef __cplusplus
@@ -23,11 +23,11 @@
* Includes common information about the service that will have been discovered
* in some way. The TS discovery protocol provides a way to do this. If
* service info is not available, the service_info structure stays in its
- * initialied state.
+ * initialised state.
*/
struct service_client
{
- struct rpc_caller *caller;
+ struct rpc_caller_session *session;
int rpc_status;
struct service_info service_info;
};
@@ -45,7 +45,7 @@
*/
psa_status_t service_client_init(
struct service_client *context,
- struct rpc_caller *caller);
+ struct rpc_caller_session *session);
/**
* @brief De-initialises the service client