summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c')
-rw-r--r--c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c114
1 files changed, 48 insertions, 66 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c b/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c
index 791500083b..61be6b78ef 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c
@@ -23,7 +23,7 @@
#include <bsp/vectors.h>
#include <stdlib.h>
-#include <rtems/bspIo.h> /* for printk */
+#include <rtems/bspIo.h>
#define RAVEN_INTR_ACK_REG 0xfeff0030
#ifdef BSP_PCI_ISA_BRIDGE_IRQ
@@ -41,28 +41,31 @@ rtems_i8259_masks irq_mask_or_tbl[BSP_IRQ_NUMBER];
/*
* default handler connected on each irq after bsp initialization
*/
-static rtems_irq_connect_data default_rtems_entry;
+static rtems_irq_connect_data default_rtems_entry;
+static rtems_irq_connect_data* rtems_hdl_tbl;
-static rtems_irq_connect_data* rtems_hdl_tbl;
-
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
/*
* Check if IRQ is an ISA IRQ
*/
static inline int is_isa_irq(const rtems_irq_number irqLine)
{
- return (((int) irqLine <= BSP_ISA_IRQ_MAX_OFFSET) &
+ if ( BSP_ISA_IRQ_NUMBER == 0 )
+ return FALSE;
+
+ return (((int) irqLine <= BSP_ISA_IRQ_MAX_OFFSET) &&
((int) irqLine >= BSP_ISA_IRQ_LOWEST_OFFSET)
);
}
-#endif
/*
* Check if IRQ is an OPENPIC IRQ
*/
static inline int is_pci_irq(const rtems_irq_number irqLine)
{
- return (((int) irqLine <= BSP_PCI_IRQ_MAX_OFFSET) &
+ if ( BSP_PCI_IRQ_NUMBER == 0 )
+ return FALSE;
+
+ return (((int) irqLine <= BSP_PCI_IRQ_MAX_OFFSET) &&
((int) irqLine >= BSP_PCI_IRQ_LOWEST_OFFSET)
);
}
@@ -98,46 +101,34 @@ static void compute_i8259_masks_from_prio (rtems_irq_global_settings* config)
}
#endif
-void
-BSP_enable_irq_at_pic(const rtems_irq_number name)
+void BSP_enable_irq_at_pic(const rtems_irq_number name)
{
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
- if (is_isa_irq(name)) {
- /*
- * Enable interrupt at PIC level
- */
-printk("ERROR BSP_irq_enable_at_i8259s Being Called for %d\n", (int)name);
- BSP_irq_enable_at_i8259s ((int) name);
- }
-#endif
-
- if (is_pci_irq(name)) {
- /*
- * Enable interrupt at OPENPIC level
- */
-printk(" openpic_enable_irq %d\n", (int)name );
- openpic_enable_irq ((int) name);
- }
+ if (is_isa_irq(name)) {
+ printk("BSP_enable_irq_at_pic: called with isa irq\n");
+ }
+ if (is_pci_irq(name)) {
+ /*
+ * enable interrupt at OPENPIC level.
+ */
+ openpic_enable_irq ( ((int)name - BSP_PCI_IRQ_LOWEST_OFFSET) + 16 );
+ }
}
-int
-BSP_disable_irq_at_pic(const rtems_irq_number name)
+int BSP_disable_irq_at_pic(const rtems_irq_number name)
{
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
if (is_isa_irq(name)) {
/*
* disable interrupt at PIC level
*/
- return BSP_irq_disable_at_i8259s ((int) name);
+ printk("BSP_disable_irq_at_pic: called with isa irq\n");
}
-#endif
if (is_pci_irq(name)) {
/*
* disable interrupt at OPENPIC level
*/
- return openpic_disable_irq ((int) name );
+ return openpic_disable_irq (((int) name - BSP_PCI_IRQ_LOWEST_OFFSET) + 16 );
}
- return -1;
+ return -1;
}
/*
@@ -146,23 +137,23 @@ BSP_disable_irq_at_pic(const rtems_irq_number name)
int BSP_setup_the_pic(rtems_irq_global_settings* config)
{
int i;
+
/*
* Store various code accelerators
*/
default_rtems_entry = config->defaultEntry;
- rtems_hdl_tbl = config->irqHdlTbl;
-
+ rtems_hdl_tbl = config->irqHdlTbl;
+
/*
* set up internal tables used by rtems interrupt prologue
*/
-#if 0
#ifdef BSP_PCI_ISA_BRIDGE_IRQ
/*
* start with ISA IRQ
*/
compute_i8259_masks_from_prio (config);
- for (i=BSP_ISA_IRQ_LOWEST_OFFSET; i < BSP_ISA_IRQ_LOWEST_OFFSET + BSP_ISA_IRQ_NUMBER; i++) {
+ for (i=BSP_ISA_IRQ_LOWEST_OFFSET; (i < (BSP_ISA_IRQ_LOWEST_OFFSET + BSP_ISA_IRQ_NUMBER)); i++) {
if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
BSP_irq_enable_at_i8259s (i);
}
@@ -178,7 +169,6 @@ int BSP_setup_the_pic(rtems_irq_global_settings* config)
BSP_irq_enable_at_i8259s (2);
}
#endif
-#endif
/*
* continue with PCI IRQ
@@ -190,27 +180,26 @@ int BSP_setup_the_pic(rtems_irq_global_settings* config)
openpic_set_source_priority(i - BSP_PCI_IRQ_LOWEST_OFFSET,
config->irqPrioTbl[i]);
if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
- openpic_enable_irq ((int) i );
+ openpic_enable_irq ((int) i - BSP_PCI_IRQ_LOWEST_OFFSET);
}
else {
- openpic_disable_irq ((int) i );
+ openpic_disable_irq ((int) i - BSP_PCI_IRQ_LOWEST_OFFSET);
}
}
#ifdef BSP_PCI_ISA_BRIDGE_IRQ
if ( BSP_ISA_IRQ_NUMBER > 0 ) {
- /*
- * Must enable PCI/ISA bridge IRQ
- */
- openpic_enable_irq (0);
+ /*
+ * Must enable PCI/ISA bridge IRQ
+ */
+ openpic_enable_irq (0);
}
#endif
-
+
return 1;
}
int _BSP_vme_bridge_irq = -1;
-
unsigned BSP_spuriousIntr = 0;
/*
@@ -224,29 +213,24 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
register unsigned oldMask = 0; /* old isa pic masks */
register unsigned newMask; /* new isa pic masks */
#endif
-
if (excNum == ASM_DEC_VECTOR) {
-/* printk("ASM_DEC_VECTOR\n"); */
- bsp_irq_dispatch_list(rtems_hdl_tbl, BSP_DECREMENTER, default_rtems_entry.hdl);
-
+ bsp_irq_dispatch_list_base(rtems_hdl_tbl, BSP_DECREMENTER, default_rtems_entry.hdl);
return 0;
}
irq = openpic_irq(0);
if (irq == OPENPIC_VEC_SPURIOUS) {
-/* printk("OPENPIC_VEC_SPURIOUS interrupt %d\n", OPENPIC_VEC_SPURIOUS ); */
- ++BSP_spuriousIntr;
+ printk("OPENPIC_VEC_SPURIOUS interrupt %d\n", OPENPIC_VEC_SPURIOUS );
+ ++BSP_spuriousIntr;
return 0;
}
/* some BSPs might want to use a different numbering... */
- irq = irq - OPENPIC_VEC_SOURCE + BSP_PCI_IRQ_LOWEST_OFFSET;
-/* printk("OpenPic Irq: %d\n", irq); */
+ irq = irq - OPENPIC_VEC_SOURCE ;
#ifdef BSP_PCI_ISA_BRIDGE_IRQ
isaIntr = (irq == BSP_PCI_ISA_BRIDGE_IRQ);
if (isaIntr) {
-/* printk("BSP_PCI_ISA_BRIDGE_IRQ\n"); */
/*
* Acknowledge and read 8259 vector
*/
@@ -264,30 +248,28 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
}
#endif
-
/* dispatch handlers */
-/* printk("dispatch\n"); */
-irq -=16;
- bsp_irq_dispatch_list(rtems_hdl_tbl, irq, default_rtems_entry.hdl);
-/* printk("Back from dispatch\n"); */
+ bsp_irq_dispatch_list_base(rtems_hdl_tbl, irq, default_rtems_entry.hdl);
#ifdef BSP_PCI_ISA_BRIDGE_IRQ
- if (isaIntr) {\
+ if (isaIntr) {
i8259s_cache = oldMask;
outport_byte(PIC_MASTER_IMR_IO_PORT, i8259s_cache & 0xff);
outport_byte(PIC_SLAVE_IMR_IO_PORT, ((i8259s_cache & 0xff00) >> 8));
}
else
#endif
+
{
#ifdef BSP_PCI_VME_DRIVER_DOES_EOI
- /* leave it to the VME bridge driver to do EOI, so
+ /* leave it to the VME bridge driver to do EOI, so
* it can re-enable the openpic while handling
* VME interrupts (-> VME priorities in software)
- */
- if (_BSP_vme_bridge_irq != irq)
+ */
+ if (_BSP_vme_bridge_irq != irq)
#endif
- openpic_eoi(0);
+ openpic_eoi(0);
}
return 0;
+
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 11:21:28 +0000