commit b059afa54c56caf87c0cea934efcc683ed5fd352
author Imre Kis <imre.kis@arm.com> Wed Aug 02 14:36:21 2023 +0200
committer Bálint Dobszay <balint.dobszay@arm.com> Fri Sep 08 10:55:31 2023 +0200
tree f33106e97ca6c33615a7a3ff65b04cb7f3c5fa2e
parent 9f6f1b452bdafc1817af01736c0fd3105d339903

Update ts-demo to use new RPC layer

Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I8513f40c8437da397d7b2a7bae8ce6dec937d3d3

components/app/ts-demo/test/ts-demo_tests.cpp

diff --git a/components/app/ts-demo/test/ts-demo_tests.cpp b/components/app/ts-demo/test/ts-demo_tests.cpp
index 92f7369..e78f8a2 100644
--- a/components/app/ts-demo/test/ts-demo_tests.cpp
+++ b/components/app/ts-demo/test/ts-demo_tests.cpp
@@ -16,22 +16,19 @@
 
     void setup()
     {
-        struct rpc_caller *caller;
-        int status;
-
-        m_rpc_session_handle = NULL;
+        m_rpc_session = NULL;
         m_crypto_service_context = NULL;
         m_crypto_client = NULL;
 
         service_locator_init();
 
-        m_crypto_service_context = service_locator_query("sn:trustedfirmware.org:crypto:0", &status);
+        m_crypto_service_context = service_locator_query("sn:trustedfirmware.org:crypto:0");
         CHECK(m_crypto_service_context);
 
-        m_rpc_session_handle = service_context_open(m_crypto_service_context, TS_RPC_ENCODING_PACKED_C, &caller);
-        CHECK(m_rpc_session_handle);
+        m_rpc_session = service_context_open(m_crypto_service_context);
+        CHECK(m_rpc_session);
 
-        m_crypto_client = new packedc_crypto_client(caller);
+        m_crypto_client = new packedc_crypto_client(m_rpc_session);
     }
 
     void teardown()
@@ -40,9 +37,9 @@
         m_crypto_client = NULL;
 
 	if (m_crypto_service_context) {
-	        if (m_rpc_session_handle) {
-                        service_context_close(m_crypto_service_context, m_rpc_session_handle);
-                        m_rpc_session_handle = NULL;
+	        if (m_rpc_session) {
+                        service_context_close(m_crypto_service_context, m_rpc_session);
+                        m_rpc_session = NULL;
 	        }
 
                 service_context_relinquish(m_crypto_service_context);
@@ -50,7 +47,7 @@
 	}
     }
 
-    rpc_session_handle m_rpc_session_handle;
+    struct rpc_caller_session *m_rpc_session;
     struct service_context *m_crypto_service_context;
     crypto_client *m_crypto_client;
 };

deployments/ts-demo/ts-demo.cmake

diff --git a/deployments/ts-demo/ts-demo.cmake b/deployments/ts-demo/ts-demo.cmake
index f276ca1..ce57ca2 100644
--- a/deployments/ts-demo/ts-demo.cmake
+++ b/deployments/ts-demo/ts-demo.cmake
@@ -39,7 +39,6 @@
 		"components/common/tlv"
 		"components/service/common/include"
 		"components/service/common/client"
-		"components/service/discovery/client"
 		"components/service/crypto/client/cpp"
 		"components/service/crypto/client/cpp/protocol/packed-c"
 		"protocols/service/crypto/packed-c"

deployments/ts-demo/ts-demo.cpp

diff --git a/deployments/ts-demo/ts-demo.cpp b/deployments/ts-demo/ts-demo.cpp
index 7ccd7dd..d2ee2c0 100644
--- a/deployments/ts-demo/ts-demo.cpp
+++ b/deployments/ts-demo/ts-demo.cpp
@@ -18,18 +18,17 @@
 
 	service_locator_init();
 
-	crypto_service_context = service_locator_query("sn:trustedfirmware.org:crypto:0", &status);
+	crypto_service_context = service_locator_query("sn:trustedfirmware.org:crypto:0");
 
 	if (crypto_service_context) {
 
-		struct rpc_caller *caller;
-		rpc_session_handle rpc_session_handle;
+		struct rpc_caller_session *session = NULL;
 
-		rpc_session_handle = service_context_open(crypto_service_context, TS_RPC_ENCODING_PACKED_C, &caller);
+		session = service_context_open(crypto_service_context);
 
-		if (rpc_session_handle) {
+		if (session) {
 
-			packedc_crypto_client crypto_client(caller);
+			packedc_crypto_client crypto_client(session);
 
 			status = run_ts_demo(&crypto_client, true);
 
@@ -37,7 +36,7 @@
 				printf("run_ts_demo failed\n");
 			}
 
-			service_context_close(crypto_service_context, rpc_session_handle);
+			service_context_close(crypto_service_context, session);
 		}
 		else {
 			printf("Failed to open rpc session\n");