aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Liu <Ken.Liu@arm.com>2021-08-17 16:22:54 +0800
committerKen Liu <ken.liu@arm.com>2021-09-09 05:18:11 +0200
commit3dd9256d42a399c6c57de8b7c1d3706f8094dfa3 (patch)
treeee89423850e15fdd5e8724d352341c43094747a3
parent85287b223f34d2583cff97c7710963cb702ee2a0 (diff)
SPM: Rename 'irq_defs' into 'interrupt_defs'
'irq' looks a bit constraint which is not aligned with the header file name in the same folder. Change-Id: Ib3e003bfdfa8d30d01d85cb8ba078e86c27f3703 Signed-off-by: Ken Liu <Ken.Liu@arm.com>
-rw-r--r--secure_fw/spm/cmsis_psa/spm_ipc.c2
-rw-r--r--secure_fw/spm/ffm/psa_api.c2
-rw-r--r--secure_fw/spm/include/load/interrupt_defs.h (renamed from secure_fw/spm/include/load/irq_defs.h)12
-rw-r--r--secure_fw/spm/include/load/spm_load_api.h2
-rw-r--r--tools/templates/partition_load_info.template2
5 files changed, 10 insertions, 10 deletions
diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.c b/secure_fw/spm/cmsis_psa/spm_ipc.c
index 88dc69242..12f65a075 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -34,7 +34,7 @@
#include "load/service_defs.h"
#include "load/asset_defs.h"
#include "load/spm_load_api.h"
-#include "load/irq_defs.h"
+#include "load/interrupt_defs.h"
/* Partition and service runtime data list head/runtime data table */
static struct partition_head_t partitions_listhead;
diff --git a/secure_fw/spm/ffm/psa_api.c b/secure_fw/spm/ffm/psa_api.c
index ea6a09883..4036e971b 100644
--- a/secure_fw/spm/ffm/psa_api.c
+++ b/secure_fw/spm/ffm/psa_api.c
@@ -14,7 +14,7 @@
#include "tfm_core_utils.h"
#include "load/partition_defs.h"
#include "load/service_defs.h"
-#include "load/irq_defs.h"
+#include "load/interrupt_defs.h"
#include "psa_api.h"
#include "utilities.h"
#include "tfm_wait.h"
diff --git a/secure_fw/spm/include/load/irq_defs.h b/secure_fw/spm/include/load/interrupt_defs.h
index 1540d23f6..84d3b404a 100644
--- a/secure_fw/spm/include/load/irq_defs.h
+++ b/secure_fw/spm/include/load/interrupt_defs.h
@@ -5,15 +5,15 @@
*
*/
-#ifndef __IRQ_DEFS_H__
-#define __IRQ_DEFS_H__
+#ifndef __INTERRUPT_DEFS_H__
+#define __INTERRUPT_DEFS_H__
#include "psa/service.h"
struct irq_load_info_t {
- uint32_t source; /* IRQ source (number/index) */
- uint32_t flih_func; /* FLIH function - 0 if SLIH */
- psa_signal_t signal; /* The signal assigned for IRQ */
+ uint32_t source; /* IRQ source (number/index) */
+ uint32_t flih_func; /* FLIH function - 0 if SLIH */
+ psa_signal_t signal; /* The signal assigned for IRQ */
};
-#endif /* __IRQ_DEFS_H__ */
+#endif /* __INTERRUPT_DEFS_H__ */
diff --git a/secure_fw/spm/include/load/spm_load_api.h b/secure_fw/spm/include/load/spm_load_api.h
index c768b0c30..26597b292 100644
--- a/secure_fw/spm/include/load/spm_load_api.h
+++ b/secure_fw/spm/include/load/spm_load_api.h
@@ -10,7 +10,7 @@
#define __SPM_LOAD_API_H__
#include "asset_defs.h"
-#include "irq_defs.h"
+#include "interrupt_defs.h"
#include "partition_defs.h"
#include "service_defs.h"
#include "spm_ipc.h"
diff --git a/tools/templates/partition_load_info.template b/tools/templates/partition_load_info.template
index 767d9dbae..07cd77e47 100644
--- a/tools/templates/partition_load_info.template
+++ b/tools/templates/partition_load_info.template
@@ -11,7 +11,7 @@
#include <stddef.h>
#include "region.h"
#include "spm_ipc.h"
-#include "load/irq_defs.h"
+#include "load/interrupt_defs.h"
#include "load/partition_defs.h"
#include "load/service_defs.h"
#include "load/asset_defs.h"