commit 0e340ea916e11fbdcc981ac535d06860f9f8523b
author Kevin Peng <kevin.peng@arm.com> Tue Aug 15 17:51:44 2023 +0800
committer David Hu <david.hu@arm.com> Mon Aug 28 05:40:31 2023 +0200
tree a7a83a3b4d47bec12567c24e52adb855822b2f1c
parent c3b795f3e2b318e6072b9e5f57ad8529674060c1

Interface: Clean up the tfm_api.h header file

This file does not look like an "interface" file as it contains
some SPM internal usage definitions.

This patch:
- Moves the SPM internal definitions to spm.h.
- Use the error codes in `internal_status_code.h` instead of the
  ones in tfm_api.h.
- Removes error codes in tfm_api.h.
- Renames tfm_api.h to tfm_veneers.h to reflect what it does.
- Corresponding changes in source files.

Change-Id: Iba5d1aae6837c9f0bf52c9a0c456023d19a735ea
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

secure_fw/partitions/lib/runtime/include/service_api.h

diff --git a/secure_fw/partitions/lib/runtime/include/service_api.h b/secure_fw/partitions/lib/runtime/include/service_api.h
index 57f3e3d..3c89661 100644
--- a/secure_fw/partitions/lib/runtime/include/service_api.h
+++ b/secure_fw/partitions/lib/runtime/include/service_api.h
@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include "tfm_boot_status.h"
+#include "psa/error.h"
 
 /**
  * \brief Retrieve secure partition related data from shared memory area, which
@@ -18,8 +19,8 @@
  * \param[out] boot_data   Pointer to boot data.
  * \param[in]  len         The length of the boot data.
  */
-int32_t tfm_core_get_boot_data(uint8_t major_type,
-                               struct tfm_boot_data *boot_data,
-                               uint32_t len);
+psa_status_t tfm_core_get_boot_data(uint8_t major_type,
+                                    struct tfm_boot_data *boot_data,
+                                    uint32_t len);
 
 #endif /* __SERVICE_API_H__ */

secure_fw/partitions/lib/runtime/service_api.c

diff --git a/secure_fw/partitions/lib/runtime/service_api.c b/secure_fw/partitions/lib/runtime/service_api.c
index 3e9576d..65bb844 100644
--- a/secure_fw/partitions/lib/runtime/service_api.c
+++ b/secure_fw/partitions/lib/runtime/service_api.c
@@ -12,9 +12,9 @@
 #include "utilities.h"
 
 __attribute__((naked))
-int32_t tfm_core_get_boot_data(uint8_t major_type,
-                               struct tfm_boot_data *boot_status,
-                               uint32_t len)
+psa_status_t tfm_core_get_boot_data(uint8_t major_type,
+                                    struct tfm_boot_data *boot_status,
+                                    uint32_t len)
 {
     __ASM volatile(
         "SVC    "M2S(TFM_SVC_GET_BOOT_DATA)"               \n"