aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Kay <chris.kay@arm.com>2020-05-29 20:23:37 +0100
committerChris Kay <chris@cjkay.com>2020-06-05 19:16:35 +0100
commit1d377b08beab1e4a4a4d98d37ff71f20f1eb558e (patch)
tree348718a0713eb97f84571269e4e277a74a10a59e
parent547978c94e0908e79352278d878052eb3627ec38 (diff)
arch: Apply `const` to interrupt driver pointers
The driver is not intended to be modified at runtime. Change-Id: I440121b8e11a47837c458e1d7e257a990640abc8 Signed-off-by: Chris Kay <chris.kay@arm.com>
-rw-r--r--arch/src/arm_main.c4
-rw-r--r--arch/src/host.c2
-rw-r--r--framework/include/fwk_arch.h2
-rw-r--r--framework/src/fwk_arch.c6
-rw-r--r--framework/test/test_fwk_arch.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/arch/src/arm_main.c b/arch/src/arm_main.c
index 998fcdef..333f9b7d 100644
--- a/arch/src/arm_main.c
+++ b/arch/src/arm_main.c
@@ -16,7 +16,7 @@
#include <stdbool.h>
#include <stdint.h>
-extern int arch_nvic_init(struct fwk_arch_interrupt_driver **driver);
+extern int arch_nvic_init(const struct fwk_arch_interrupt_driver **driver);
extern int arch_mm_init(struct fwk_arch_mm_data *data);
#if defined(__ARMCC_VERSION)
@@ -52,7 +52,7 @@ void _exit(int status)
}
#endif
-static struct fwk_arch_init_driver arch_init_driver = {
+static const struct fwk_arch_init_driver arch_init_driver = {
.mm = arch_mm_init,
.interrupt = arch_nvic_init,
};
diff --git a/arch/src/host.c b/arch/src/host.c
index 81613223..5e319dc3 100644
--- a/arch/src/host.c
+++ b/arch/src/host.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
-extern int arch_interrupt_init(struct fwk_arch_interrupt_driver **driver);
+extern int arch_interrupt_init(const struct fwk_arch_interrupt_driver **driver);
/*
* Catches early failures in the initialization.
diff --git a/framework/include/fwk_arch.h b/framework/include/fwk_arch.h
index 4de5b456..25619b43 100644
--- a/framework/include/fwk_arch.h
+++ b/framework/include/fwk_arch.h
@@ -226,7 +226,7 @@ struct fwk_arch_init_driver {
* \retval FWK_E_PARAM The parameter received by the handler is invalid.
* \retval FWK_E_PANIC Unrecoverable initialization error.
*/
- int (*interrupt)(struct fwk_arch_interrupt_driver **driver);
+ int (*interrupt)(const struct fwk_arch_interrupt_driver **driver);
};
/*!
diff --git a/framework/src/fwk_arch.c b/framework/src/fwk_arch.c
index 8789596c..8ab47631 100644
--- a/framework/src/fwk_arch.c
+++ b/framework/src/fwk_arch.c
@@ -38,11 +38,11 @@ static int mm_init(int (*mm_init_handler)(struct fwk_arch_mm_data *data))
return FWK_SUCCESS;
}
-static int interrupt_init(
- int (*interrupt_init_handler)(struct fwk_arch_interrupt_driver **driver))
+static int interrupt_init(int (*interrupt_init_handler)(
+ const struct fwk_arch_interrupt_driver **driver))
{
int status;
- struct fwk_arch_interrupt_driver *driver;
+ const struct fwk_arch_interrupt_driver *driver;
/*
* Retrieve a pointer to the interrupt management driver from the
diff --git a/framework/test/test_fwk_arch.c b/framework/test/test_fwk_arch.c
index ff12c1b2..b1497f77 100644
--- a/framework/test/test_fwk_arch.c
+++ b/framework/test/test_fwk_arch.c
@@ -37,7 +37,7 @@ int __wrap_fwk_interrupt_init(const struct fwk_arch_interrupt_driver *driver)
return fwk_interrupt_init_return_val;
}
-int interrupt_init_handler(struct fwk_arch_interrupt_driver **driver)
+int interrupt_init_handler(const struct fwk_arch_interrupt_driver **driver)
{
return interrupt_init_handler_return_val;
}