[rtems commit] bsp/leon3: Make declarations conditional

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    c173f0581a2a3672cb2f6024c7d9f35665849ec8
Changeset: http://git.rtems.org/rtems/commit/?id=c173f0581a2a3672cb2f6024c7d9f35665849ec8

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jul 28 07:47:52 2023 +0200

bsp/leon3: Make declarations conditional

The LEON3_IrqCtrl_Adev object is only defined if LEON3_IRQAMP_BASE is
not defined.

The LEON3_Timer_Adev object is only defined if LEON3_GPTIMER_BASE is not
defined.

Close #4850.

---

 bsps/sparc/leon3/include/bsp/irqimpl.h | 2 +-
 bsps/sparc/leon3/include/bsp/leon3.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bsps/sparc/leon3/include/bsp/irqimpl.h b/bsps/sparc/leon3/include/bsp/irqimpl.h
index f5b0c205e0..9a9eae51f7 100644
--- a/bsps/sparc/leon3/include/bsp/irqimpl.h
+++ b/bsps/sparc/leon3/include/bsp/irqimpl.h
@@ -90,12 +90,12 @@ extern rtems_interrupt_lock LEON3_IrqCtrl_Lock;
 #define LEON3_IrqCtrl_Regs ((irqamp *) LEON3_IRQAMP_BASE)
 #else
 extern irqamp *LEON3_IrqCtrl_Regs;
-#endif
 
 /**
  * @brief This pointer provides the IRQ(A)MP device information block.
  */
 extern struct ambapp_dev *LEON3_IrqCtrl_Adev;
+#endif
 
 /**
  * @brief This object provides the interrupt number used to multiplex extended
diff --git a/bsps/sparc/leon3/include/bsp/leon3.h b/bsps/sparc/leon3/include/bsp/leon3.h
index 476ed73647..fdb43b5817 100644
--- a/bsps/sparc/leon3/include/bsp/leon3.h
+++ b/bsps/sparc/leon3/include/bsp/leon3.h
@@ -211,12 +211,12 @@ static inline uint32_t leon3_get_cpu_count( const irqamp *regs )
 #define LEON3_Timer_Regs ((gptimer *) LEON3_GPTIMER_BASE)
 #else
 extern gptimer *LEON3_Timer_Regs;
-#endif
 
 /**
  * @brief This pointer provides the GPTIMER device information block.
  */
 extern struct ambapp_dev *LEON3_Timer_Adev;
+#endif
 
 /**
  * @brief Gets the processor local bus frequency in Hz.