summaryrefslogtreecommitdiffstats
path: root/bsps/shared
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2021-07-27 09:58:43 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-07-27 10:03:19 +0200
commitc7b4eca7fa3e311c67d5dd1e62e301b01ed45271 (patch)
tree8580e41fd1bac88af64654bde7d4bf0b340ce173 /bsps/shared
parentvalidation: Test rtems_interrupt_handler_iterate() (diff)
downloadrtems-c7b4eca7fa3e311c67d5dd1e62e301b01ed45271.tar.bz2
bsps/irq: bsp_interrupt_facility_initialize()
Do not return a status code in bsp_interrupt_facility_initialize() since this leads to unreachable code in bsp_interrupt_initialize(). Use RTEMS_DEBUG assertions in bsp_interrupt_facility_initialize() if necessary.
Diffstat (limited to 'bsps/shared')
-rw-r--r--bsps/shared/dev/irq/arm-gicv2.c3
-rw-r--r--bsps/shared/dev/irq/arm-gicv3.c3
-rw-r--r--bsps/shared/irq/irq-default.c4
-rw-r--r--bsps/shared/irq/irq-generic.c8
4 files changed, 5 insertions, 13 deletions
diff --git a/bsps/shared/dev/irq/arm-gicv2.c b/bsps/shared/dev/irq/arm-gicv2.c
index eaae6124e8..9c47a4d47b 100644
--- a/bsps/shared/dev/irq/arm-gicv2.c
+++ b/bsps/shared/dev/irq/arm-gicv2.c
@@ -208,7 +208,7 @@ static void enable_fiq(void)
#endif
}
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
{
volatile gic_cpuif *cpuif = GIC_CPUIF;
volatile gic_dist *dist = ARM_GIC_DIST;
@@ -239,7 +239,6 @@ rtems_status_code bsp_interrupt_facility_initialize(void)
dist->icddcr = GIC_DIST_ICDDCR_ENABLE_GRP_1 | GIC_DIST_ICDDCR_ENABLE;
enable_fiq();
- return RTEMS_SUCCESSFUL;
}
#ifdef RTEMS_SMP
diff --git a/bsps/shared/dev/irq/arm-gicv3.c b/bsps/shared/dev/irq/arm-gicv3.c
index ca282a378d..ea123d325e 100644
--- a/bsps/shared/dev/irq/arm-gicv3.c
+++ b/bsps/shared/dev/irq/arm-gicv3.c
@@ -388,7 +388,7 @@ static void gicv3_init_cpu_interface(void)
WRITE_SR(ICC_CTLR, 0x0);
}
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
{
volatile gic_dist *dist = ARM_GIC_DIST;
uint32_t id_count = get_id_count(dist);
@@ -423,7 +423,6 @@ rtems_status_code bsp_interrupt_facility_initialize(void)
}
gicv3_init_cpu_interface();
- return RTEMS_SUCCESSFUL;
}
#ifdef RTEMS_SMP
diff --git a/bsps/shared/irq/irq-default.c b/bsps/shared/irq/irq-default.c
index b7d9d9961e..bd93bd72c6 100644
--- a/bsps/shared/irq/irq-default.c
+++ b/bsps/shared/irq/irq-default.c
@@ -93,7 +93,7 @@ rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector)
return RTEMS_UNSATISFIED;
}
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
{
- return RTEMS_NOT_IMPLEMENTED;
+ /* Nothing to do */
}
diff --git a/bsps/shared/irq/irq-generic.c b/bsps/shared/irq/irq-generic.c
index eddb887d15..dac1ca4209 100644
--- a/bsps/shared/irq/irq-generic.c
+++ b/bsps/shared/irq/irq-generic.c
@@ -160,13 +160,7 @@ rtems_interrupt_entry *bsp_interrupt_entry_find(
void bsp_interrupt_initialize( void )
{
- rtems_status_code sc;
-
- sc = bsp_interrupt_facility_initialize();
- if ( sc != RTEMS_SUCCESSFUL ) {
- bsp_fatal( BSP_FATAL_INTERRUPT_INITIALIZATION );
- }
-
+ bsp_interrupt_facility_initialize();
bsp_interrupt_set_initialized();
}