RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-03-25 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
PR 349/bsps
	* irq/irq.c, vme/VME.h, vme/vmeconfig.c: Fixes library dependency
	on the vmeUniverse driver. It is now possible to use the ppc/shared/irq
	code on non-VME BSPs without triggering linkage of the vmeUniverse
	driver.
This commit is contained in:
Joel Sherrill
2003-03-25 16:46:01 +00:00
parent c960a72529
commit a3ef256740
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/lib/libbsp/powerpc/shared/ChangeLog
View File

@@ -1,3 +1,11 @@
2003-03-25 Till Straumann <strauman@slac.stanford.edu>
PR 349/bsps
* irq/irq.c, vme/VME.h, vme/vmeconfig.c: Fixes library dependency
on the vmeUniverse driver. It is now possible to use the ppc/shared/irq
code on non-VME BSPs without triggering linkage of the vmeUniverse
driver.
2003-03-18 Till Straumann <strauman@slac.stanford.edu>
PR 356/bsps

4
c/src/lib/libbsp/powerpc/shared/irq/irq.c
View File

@@ -315,6 +315,8 @@ int BSP_rtems_irq_mngt_get(rtems_irq_global_settings** config)
return 0;
}
int _BSP_vme_bridge_irq = -1;
static unsigned spuriousIntr = 0;
/*
* High level IRQ handler called from shared_raw_irq_code_entry
@@ -381,7 +383,7 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum)
* it can re-enable the openpic while handling
* VME interrupts (-> VME priorities in software)
*/
if (BSP_PCI_VME_BRIDGE_IRQ!=irq)
if (_BSP_vme_bridge_irq != irq)
#endif
openpic_eoi(0);
}

3
c/src/lib/libbsp/powerpc/shared/vme/VME.h
View File

@@ -88,11 +88,10 @@ typedef void (*BSP_VME_ISR_t)(void *usrArg, unsigned long vector);
* must be omitted.
*/
#define BSP_PCI_VME_DRIVER_DOES_EOI
extern int _BSP_vme_bridge_irq;
/* don't reference vmeUniverse0PciIrqLine directly here - leave it up to
* bspstart() to set BSP_vme_bridge_irq. That way, we can generate variants
* of the BSP with / without the universe driver...
*/
#define BSP_PCI_VME_BRIDGE_IRQ _BSP_vme_bridge_irq
extern int _BSP_vme_bridge_irq;
#endif

2
c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c
View File

@@ -24,8 +24,6 @@
void BSP_vme_config(void) __attribute__ (( weak, alias("__BSP_default_vme_config") ));
int _BSP_vme_bridge_irq = -1;
SPR_RO(DBAT0U)
void