commit ade2e0a3a339ae1c165cbe3bfe5171636ac798a7
author Xinyu Zhang <xinyu.zhang@arm.com> Thu Mar 18 16:20:54 2021 +0800
committer Ken Liu <ken.liu@arm.com> Wed Apr 28 07:51:28 2021 +0200
tree 21da67764faa0fd19d02e01a35b4d2a02729f9b2
parent e99f95f5a0b704ae5daac9a465f008889b4f9400

Unify to use ARRAY_SIZE in TF-M codes

ARRAY_SIZE(foo) is preferred over sizeof(foo)/sizeof(foo[0]).

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I6d95ceece2edc6267491923e282e28710b68ab8d

interface/src/tfm_crypto_func_api.c

diff --git a/interface/src/tfm_crypto_func_api.c b/interface/src/tfm_crypto_func_api.c
index dd6a90a..3286997 100644
--- a/interface/src/tfm_crypto_func_api.c
+++ b/interface/src/tfm_crypto_func_api.c
@@ -5,21 +5,20 @@
  *
  */
 
+#include "psa/client.h"
 #include "tfm_veneers.h"
 #include "tfm_crypto_defs.h"
 #include "psa/crypto.h"
 #include "tfm_ns_interface.h"
 
-#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
-
 #define API_DISPATCH(sfn_name, sfn_id)                               \
         tfm_ns_interface_dispatch((veneer_fn)tfm_##sfn_name##_veneer,\
-        (uint32_t)in_vec, ARRAY_SIZE(in_vec),                        \
-        (uint32_t)out_vec, ARRAY_SIZE(out_vec))
+        (uint32_t)in_vec, IOVEC_LEN(in_vec),                         \
+        (uint32_t)out_vec, IOVEC_LEN(out_vec))
 
 #define API_DISPATCH_NO_OUTVEC(sfn_name, sfn_id)                     \
         tfm_ns_interface_dispatch((veneer_fn)tfm_##sfn_name##_veneer,\
-        (uint32_t)in_vec, ARRAY_SIZE(in_vec),                        \
+        (uint32_t)in_vec, IOVEC_LEN(in_vec),                         \
         (uint32_t)NULL, 0)
 
 psa_status_t psa_crypto_init(void)