From 5b0e355ed75de33e9fe0d9dacd1fde4353537d42 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 20 Mar 2024 15:54:33 +0100
Subject: bsps: Move declarations to <bsp/irq-generic.h>

Move declarations of bsp_interrupt_get_affinity() and
bsp_interrupt_set_affinity() to <bsp/irq-generic.h>.  Canonicalize the
<bsp/irq.h> includes.

Implement bsp_interrupt_get_affinity() and bsp_interrupt_set_affinity() only if
needed (usually RTEMS_SMP).

Provide stub implementations for i386 to fix build errors.
---
 bsps/shared/dev/irq/arm-gicv2.c | 3 ++-
 bsps/shared/dev/irq/arm-gicv3.c | 3 ++-
 bsps/shared/irq/irq-affinity.c  | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'bsps/shared')

diff --git a/bsps/shared/dev/irq/arm-gicv2.c b/bsps/shared/dev/irq/arm-gicv2.c
index 8dc0895956..3cd27b2fa6 100644
--- a/bsps/shared/dev/irq/arm-gicv2.c
+++ b/bsps/shared/dev/irq/arm-gicv2.c
@@ -36,7 +36,6 @@
 #include <dev/irq/arm-gic.h>
 #include <dev/irq/arm-gic-arch.h>
 
-#include <bsp/irq.h>
 #include <bsp/irq-generic.h>
 #include <bsp/start.h>
 
@@ -328,6 +327,7 @@ rtems_status_code arm_gic_irq_get_group(
   return sc;
 }
 
+#ifdef RTEMS_SMP
 rtems_status_code bsp_interrupt_set_affinity(
   rtems_vector_number vector,
   const Processor_mask *affinity
@@ -387,6 +387,7 @@ rtems_status_code bsp_interrupt_get_affinity(
   _Processor_mask_From_uint32_t(affinity, targets, 0);
   return RTEMS_SUCCESSFUL;
 }
+#endif
 
 void arm_gic_trigger_sgi(rtems_vector_number vector, uint32_t targets)
 {
diff --git a/bsps/shared/dev/irq/arm-gicv3.c b/bsps/shared/dev/irq/arm-gicv3.c
index 108d64348a..f85582ccff 100644
--- a/bsps/shared/dev/irq/arm-gicv3.c
+++ b/bsps/shared/dev/irq/arm-gicv3.c
@@ -27,7 +27,6 @@
 
 #include <dev/irq/arm-gicv3.h>
 
-#include <bsp/irq.h>
 #include <bsp/irq-generic.h>
 #include <bsp/start.h>
 
@@ -242,6 +241,7 @@ rtems_status_code arm_gic_irq_get_priority(
   return sc;
 }
 
+#ifdef RTEMS_SMP
 rtems_status_code bsp_interrupt_set_affinity(
   rtems_vector_number vector,
   const Processor_mask *affinity
@@ -274,6 +274,7 @@ rtems_status_code bsp_interrupt_get_affinity(
   _Processor_mask_From_uint32_t(affinity, targets, 0);
   return RTEMS_SUCCESSFUL;
 }
+#endif
 
 void arm_gic_trigger_sgi(rtems_vector_number vector, uint32_t targets)
 {
diff --git a/bsps/shared/irq/irq-affinity.c b/bsps/shared/irq/irq-affinity.c
index 6c1522f77f..7e9250a948 100644
--- a/bsps/shared/irq/irq-affinity.c
+++ b/bsps/shared/irq/irq-affinity.c
@@ -36,7 +36,6 @@
 
 #include <bsp/irq-generic.h>
 
-#include <rtems/score/processormask.h>
 #include <rtems/score/smpimpl.h>
 
 rtems_status_code rtems_interrupt_set_affinity(
-- 
cgit v1.2.3