[rtems commit] bsp/qoriq: Remove <rtems/irq.h> in <bsp/irq.h>

Sebastian Huber sebh at rtems.org
Tue Feb 27 13:16:21 UTC 2024


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jan 16 20:52:30 2024 +0100

bsp/qoriq: Remove <rtems/irq.h> in <bsp/irq.h>

The <rtems/irq.h> defines a legacy API.

---

 bsps/powerpc/include/bsp/tsec.h      | 6 +++---
 bsps/powerpc/qoriq/include/bsp/irq.h | 2 --
 bsps/powerpc/shared/vme/vmeTsi148.c  | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bsps/powerpc/include/bsp/tsec.h b/bsps/powerpc/include/bsp/tsec.h
index 1f66377671..c885c73598 100644
--- a/bsps/powerpc/include/bsp/tsec.h
+++ b/bsps/powerpc/include/bsp/tsec.h
@@ -376,9 +376,9 @@ typedef struct {
   char *unit_name;
   volatile tsec_registers *reg_ptr;
   volatile tsec_registers *mdio_ptr;
-  rtems_irq_number irq_num_tx;
-  rtems_irq_number irq_num_rx;
-  rtems_irq_number irq_num_err;
+  rtems_vector_number irq_num_tx;
+  rtems_vector_number irq_num_rx;
+  rtems_vector_number irq_num_err;
   int phy_default;
 } tsec_config;
 
diff --git a/bsps/powerpc/qoriq/include/bsp/irq.h b/bsps/powerpc/qoriq/include/bsp/irq.h
index f197f7ab6e..7419095438 100644
--- a/bsps/powerpc/qoriq/include/bsp/irq.h
+++ b/bsps/powerpc/qoriq/include/bsp/irq.h
@@ -37,8 +37,6 @@
 #define LIBBSP_POWERPC_QORIQ_IRQ_H
 
 #include <bsp.h>
-#include <rtems/irq.h>
-#include <rtems/irq-extension.h>
 #include <rtems/score/processormask.h>
 
 #ifdef __cplusplus
diff --git a/bsps/powerpc/shared/vme/vmeTsi148.c b/bsps/powerpc/shared/vme/vmeTsi148.c
index cb24b3c417..aaabb1b28d 100644
--- a/bsps/powerpc/shared/vme/vmeTsi148.c
+++ b/bsps/powerpc/shared/vme/vmeTsi148.c
@@ -53,6 +53,7 @@
 #include <stdlib.h>
 #include <rtems/bspIo.h>	/* printk */
 #include <rtems/error.h>	/* printk */
+#include <rtems/irq.h>
 #include <rtems/pci.h>
 #include <rtems/score/sysstate.h>
 #include <bsp.h>



More information about the vc mailing list