diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2007-12-02 21:49:07 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2007-12-02 21:49:07 +0000 |
| commit | c10dc130f9559a0cf14432e5877eb7d33e668d4f (patch) | |
| tree | 46d68744f688ae8c80da5c7e88136a690d1390f7 /c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c | |
| parent | 2007-12-02 Till Straumann <strauman@slac.stanford.edu> (diff) | |
| download | rtems-c10dc130f9559a0cf14432e5877eb7d33e668d4f.tar.bz2 | |
2007-12-02 Till Straumann <strauman@slac.stanford.edu>
* shared/irq/i8259.c, shared/irq/irq.h, shared/irq/irq_supp.h,
shared/irq/openpic_i8259_irq.c: BSP_disable_irq_at_pic(),
openpic_disable_irq(), BSP_irq_disable_at_i8259s() now return
0/1 if irq was disabled/enabled prior to disabling.
irq_supp.h now exports a inline helper routine for scanning
a list of shared handlers; to be used by PIC drivers.
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c index edbe581db8..dcc3b645f5 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c @@ -118,7 +118,7 @@ BSP_enable_irq_at_pic(const rtems_irq_number name) } } -void +int BSP_disable_irq_at_pic(const rtems_irq_number name) { #ifdef BSP_PCI_ISA_BRIDGE_IRQ @@ -126,15 +126,16 @@ BSP_disable_irq_at_pic(const rtems_irq_number name) /* * disable interrupt at PIC level */ - BSP_irq_disable_at_i8259s ((int) name - BSP_ISA_IRQ_LOWEST_OFFSET); + return BSP_irq_disable_at_i8259s ((int) name - BSP_ISA_IRQ_LOWEST_OFFSET); } #endif if (is_pci_irq(name)) { /* * disable interrupt at OPENPIC level */ - openpic_disable_irq ((int) name - BSP_PCI_IRQ_LOWEST_OFFSET); + return openpic_disable_irq ((int) name - BSP_PCI_IRQ_LOWEST_OFFSET); } + return -1; } /* @@ -209,30 +210,6 @@ int _BSP_vme_bridge_irq = -1; unsigned BSP_spuriousIntr = 0; -static inline void -dispatch_list(unsigned int irq) -{ -register uint32_t l_orig; - - l_orig = _ISR_Get_level(); - - /* Enable all interrupts */ - _ISR_Set_level(0); - - /* rtems_hdl_tbl[irq].hdl(rtems_hdl_tbl[irq].handle); */ - { - rtems_irq_connect_data* vchain; - for( vchain = &rtems_hdl_tbl[irq]; - ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl); - vchain = (rtems_irq_connect_data*)vchain->next_handler ) - { - vchain->hdl(vchain->handle); - } - } - - /* Restore original level */ - _ISR_Set_level(l_orig); -} /* * High level IRQ handler called from shared_raw_irq_code_entry */ @@ -247,7 +224,7 @@ void C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum) if (excNum == ASM_DEC_VECTOR) { - dispatch_list(BSP_DECREMENTER); + bsp_irq_dispatch_list(rtems_hdl_tbl, BSP_DECREMENTER, default_rtems_entry.hdl); return; @@ -282,7 +259,7 @@ void C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum) #endif /* dispatch handlers */ - dispatch_list(irq); + bsp_irq_dispatch_list(rtems_hdl_tbl, irq, default_rtems_entry.hdl); #ifdef BSP_PCI_ISA_BRIDGE_IRQ if (isaIntr) { |