diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2007-11-30 22:12:01 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2007-11-30 22:12:01 +0000 |
| commit | a58ff1c3b7eb00ee3d2719d44bc251af3420fb6d (patch) | |
| tree | ea5345511273d36838eb6340022d284cb4051103 /c/src/lib/libbsp/powerpc | |
| parent | 2007-11-30 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-a58ff1c3b7eb00ee3d2719d44bc251af3420fb6d.tar.bz2 | |
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
* irq/irq.h, irq/no_pic.c: some more changes to let
using shared/irq/irq.c work.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/irq/irq.h | 14 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/irq/no_pic.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/preinstall.am | 4 |
4 files changed, 23 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index aa0623d081..2f47753145 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,5 +1,10 @@ 2007-11-30 Till Straumann <strauman@slac.stanford.edu> + * irq/irq.h, irq/no_pic.c: some more changes to let + using shared/irq/irq.c work. + +2007-11-30 Till Straumann <strauman@slac.stanford.edu> + * Makefile.am, irq/irq.h, irq/no_pic.c: install and use new <irq/irq_supp.h> header. diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq.h b/c/src/lib/libbsp/powerpc/psim/irq/irq.h index 5a88614a1d..d240c1ed94 100644 --- a/c/src/lib/libbsp/powerpc/psim/irq/irq.h +++ b/c/src/lib/libbsp/powerpc/psim/irq/irq.h @@ -22,10 +22,12 @@ #define LIBBSP_POWERPC_IRQ_H #define BSP_SHARED_HANDLER_SUPPORT 1 -#include <rtems/irq.h> #ifndef ASM +#include <rtems/irq.h> + + /* * Symblolic IRQ names and related definitions. */ @@ -48,5 +50,15 @@ #include <bsp/irq_supp.h> +#ifdef __cplusplus +extern "C" { +#endif + +void BSP_rtems_irq_mng_init(unsigned cpuId); + +#ifdef __cplusplus +} +#endif + #endif #endif diff --git a/c/src/lib/libbsp/powerpc/psim/irq/no_pic.c b/c/src/lib/libbsp/powerpc/psim/irq/no_pic.c index c36cbb36db..4418f2027e 100644 --- a/c/src/lib/libbsp/powerpc/psim/irq/no_pic.c +++ b/c/src/lib/libbsp/powerpc/psim/irq/no_pic.c @@ -25,7 +25,7 @@ static rtems_irq_connect_data *rtems_hdl_tbl; /* * High level IRQ handler called from shared_raw_irq_code_entry */ -void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) +void C_dispatch_irq_handler (struct _BSP_Exception_frame *frame, unsigned int excNum) { register unsigned msr; register unsigned new_msr; diff --git a/c/src/lib/libbsp/powerpc/psim/preinstall.am b/c/src/lib/libbsp/powerpc/psim/preinstall.am index f757b0a604..b5739c3282 100644 --- a/c/src/lib/libbsp/powerpc/psim/preinstall.am +++ b/c/src/lib/libbsp/powerpc/psim/preinstall.am @@ -69,6 +69,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h +$(PROJECT_INCLUDE)/bsp/irq_supp.h: ../shared/irq/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h + $(PROJECT_INCLUDE)/bsp/vectors.h: ../../powerpc/shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h |