commit 7c2a744b3712f481b9dc7ab89bcc0ef5cb30f5fa
author David Hu <david.hu@arm.com> Thu Apr 01 16:34:30 2021 +0800
committer David Hu <david.hu@arm.com> Thu Apr 29 08:56:18 2021 +0200
tree 300e04d87a0abc5ae4090bc9074076a6da8f4d39
parent cd22d1bd7f96ece9f88df87445f7be138de380b3

Interface: Fix veneer function naming

Some veneer functions are named with "tfm_tfm_" prefix. It is confusing
and unfriendly to NS integration.

This patch unifies the prefix of all the veneer function as "tfm_"
- Fix the duplicated "tfm_" prefixes by checking secure function prefix
  in tfm_veneer template.
- Replace all the "tfm_tfm_" prefixes with "tfm_".

Change-Id: Id658486f49f4a6f1f22fd3897be27865889474ae
Signed-off-by: David Hu <david.hu@arm.com>

interface/src/tfm_audit_func_api.c

diff --git a/interface/src/tfm_audit_func_api.c b/interface/src/tfm_audit_func_api.c
index 4141970..e433dff 100644
--- a/interface/src/tfm_audit_func_api.c
+++ b/interface/src/tfm_audit_func_api.c
@@ -11,17 +11,17 @@
 #include "tfm_ns_interface.h"
 
 #define API_DISPATCH(sfn_name)                                    \
-    tfm_ns_interface_dispatch((veneer_fn)tfm_##sfn_name##_veneer, \
+    tfm_ns_interface_dispatch((veneer_fn)sfn_name##_veneer,       \
         (uint32_t)in_vec, IOVEC_LEN(in_vec),                      \
         (uint32_t)out_vec, IOVEC_LEN(out_vec))
 
 #define API_DISPATCH_NO_INVEC(sfn_name)                           \
-    tfm_ns_interface_dispatch((veneer_fn)tfm_##sfn_name##_veneer, \
+    tfm_ns_interface_dispatch((veneer_fn)sfn_name##_veneer,       \
         (uint32_t)NULL, 0,                                        \
         (uint32_t)out_vec, IOVEC_LEN(out_vec))
 
 #define API_DISPATCH_NO_OUTVEC(sfn_name)                          \
-    tfm_ns_interface_dispatch((veneer_fn)tfm_##sfn_name##_veneer, \
+    tfm_ns_interface_dispatch((veneer_fn)sfn_name##_veneer,       \
         (uint32_t)in_vec, IOVEC_LEN(in_vec),                      \
         (uint32_t)NULL, 0)
 
@@ -41,7 +41,7 @@
         {.base = buffer, .len = buffer_size},
     };
 
-    status = API_DISPATCH(audit_core_retrieve_record);
+    status = API_DISPATCH(tfm_audit_core_retrieve_record);
 
     *record_size = out_vec[0].len;
 
@@ -56,7 +56,7 @@
         {.base = size, .len = sizeof(uint32_t)},
     };
 
-    status = API_DISPATCH_NO_INVEC(audit_core_get_info);
+    status = API_DISPATCH_NO_INVEC(tfm_audit_core_get_info);
 
     return status;
 }
@@ -72,7 +72,7 @@
         {.base = size, .len = sizeof(uint32_t)},
     };
 
-    status = API_DISPATCH(audit_core_get_record_info);
+    status = API_DISPATCH(tfm_audit_core_get_record_info);
 
     return status;
 }
@@ -87,7 +87,7 @@
         {.base = token, .len = token_size},
     };
 
-    status = API_DISPATCH_NO_OUTVEC(audit_core_delete_record);
+    status = API_DISPATCH_NO_OUTVEC(tfm_audit_core_delete_record);
 
     return status;
 }