Update RPC layer initialization in env test SP
Change ffa_call_ep to ts_rpc_endpoint_sp.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I27263372fb416b0f640b70e2f9404ce187e074d6
diff --git a/deployments/env-test/env/commonsp/env_test_sp.c b/deployments/env-test/env/commonsp/env_test_sp.c
index 35c871b..daaf50a 100644
--- a/deployments/env-test/env/commonsp/env_test_sp.c
+++ b/deployments/env-test/env/commonsp/env_test_sp.c
@@ -3,7 +3,8 @@
* Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
*/
-#include "rpc/ffarpc/endpoint/ffarpc_call_ep.h"
+#include "components/rpc/common/endpoint/rpc_service_interface.h"
+#include "components/rpc/ts_rpc/endpoint/sp/ts_rpc_endpoint_sp.h"
#include "service/test_runner/provider/test_runner_provider.h"
#include "service/test_runner/provider/serializer/packed-c/packedc_test_runner_provider_serializer.h"
#include "protocols/rpc/common/packed-c/status.h"
@@ -21,12 +22,13 @@
void __noreturn sp_main(union ffa_boot_info *boot_info)
{
struct test_runner_provider test_runner_provider = { 0 };
- struct ffa_call_ep ffarpc_call_ep = { 0 };
- struct rpc_interface *test_runner_iface = NULL;
+ struct ts_rpc_endpoint_sp rpc_endpoint = { 0 };
+ struct rpc_service_interface *test_runner_iface = NULL;
struct sp_msg req_msg = { 0 };
struct sp_msg resp_msg = { 0 };
uint16_t own_id = 0;
sp_result result = SP_RESULT_INTERNAL_ERROR;
+ rpc_status_t rpc_status = RPC_ERROR_INTERNAL;
/* Boot */
if (!sp_init(&own_id)) {
@@ -53,7 +55,17 @@
env_test_register_tests(&test_runner_provider);
- ffa_call_ep_init(&ffarpc_call_ep, test_runner_iface, own_id);
+ rpc_status = ts_rpc_endpoint_sp_init(&rpc_endpoint, 1, 16);
+ if (rpc_status != RPC_SUCCESS) {
+ EMSG("Failed to initialize RPC endpoint: %d", rpc_status);
+ goto fatal_error;
+ }
+
+ rpc_status = ts_rpc_endpoint_sp_add_service(&rpc_endpoint, test_runner_iface);
+ if (rpc_status != RPC_SUCCESS) {
+ EMSG("Failed to add service to RPC endpoint: %d", rpc_status);
+ goto fatal_error;
+ }
/* End of boot phase */
result = sp_msg_wait(&req_msg);
@@ -63,7 +75,7 @@
}
while (1) {
- ffa_call_ep_receive(&ffarpc_call_ep, &req_msg, &resp_msg);
+ ts_rpc_endpoint_sp_receive(&rpc_endpoint, &req_msg, &resp_msg);
resp_msg.source_id = req_msg.destination_id;
resp_msg.destination_id = req_msg.source_id;