commit cc4c6163f9d8d32371b323c5343a7dab7d42d457
author Edison Ai <edison.ai@arm.com> Fri Jun 21 13:52:49 2019 +0800
committer Ken Liu <ken.liu@arm.com> Fri Jul 19 10:14:51 2019 +0000
tree a17cb5b22f89f393b9ea369071137529bce23599
parent b892dfe77a29a217ba76a8301b03dad458b230ba

Crypto: Use macros generated by tools

- Use the SID and service version defined in sid.h.
- Use signal defined in tfm_crypto.h.
- Remove manual definitions in tfm_crypto_defs.h.
- Remove tfm_crypto_signal.h.

Change-Id: I465fbd867e57d82ca61ad23054d019a9656faf77
Signed-off-by: Edison Ai <edison.ai@arm.com>

interface/src/tfm_crypto_api.c

diff --git a/interface/src/tfm_crypto_api.c b/interface/src/tfm_crypto_api.c
index 19bc52c..152d785 100644
--- a/interface/src/tfm_crypto_api.c
+++ b/interface/src/tfm_crypto_api.c
@@ -9,6 +9,9 @@
 #include "tfm_crypto_defs.h"
 #include "psa/crypto.h"
 #include "tfm_ns_lock.h"
+#ifdef TFM_PSA_API
+#include "psa_manifest/sid.h"
+#endif
 
 #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
@@ -21,7 +24,7 @@
 
 #define PSA_CONNECT(service)                                    \
     psa_handle_t ipc_handle;                                    \
-    ipc_handle = psa_connect(service##_SID, service##_MIN_VER); \
+    ipc_handle = psa_connect(service##_SID, service##_VERSION); \
     if (!PSA_IS_HANDLE_VALID(ipc_handle)) {                     \
         return PSA_ERROR_GENERIC_ERROR;                         \
     }                                                           \