From 14cd67c08093336f448a2b1ce883f4451224ece9 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 30 Apr 2010 14:44:17 +0000 Subject: 2010-04-30 Sebastian Huber * Makefile.am, preinstall.am: Added generic interrupt support modules. * include/bsp.h: Define BSP_FEATURE_IRQ_EXTENSION. * startup/bspstart.c, network/network.c: Interrupt support changes. --- c/src/lib/libbsp/arm/csb337/ChangeLog | 6 ++++++ c/src/lib/libbsp/arm/csb337/Makefile.am | 10 ++++++++++ c/src/lib/libbsp/arm/csb337/include/bsp.h | 1 + c/src/lib/libbsp/arm/csb337/network/network.c | 2 +- c/src/lib/libbsp/arm/csb337/preinstall.am | 8 ++++++++ c/src/lib/libbsp/arm/csb337/startup/bspstart.c | 6 ++++-- 6 files changed, 30 insertions(+), 3 deletions(-) (limited to 'c/src/lib/libbsp/arm') diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 2c567f7024..e990c7dce4 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,9 @@ +2010-04-30 Sebastian Huber + + * Makefile.am, preinstall.am: Added generic interrupt support modules. + * include/bsp.h: Define BSP_FEATURE_IRQ_EXTENSION. + * startup/bspstart.c, network/network.c: Interrupt support changes. + 2010-04-30 Sebastian Huber * make/custom/csb337.cfg: Use VFP floating point model. diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 09d728afe1..c4c9932423 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -16,6 +16,8 @@ if ENABLE_LCD include_HEADERS += include/sed1356.h endif +include_bsp_HEADERS = + if ENABLE_UMON include_umondir = $(includedir)/umon include_umon_HEADERS = ../../shared/umon/cli.h @@ -60,6 +62,14 @@ libbsp_a_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c # console libbsp_a_SOURCES += ../../shared/console.c console/uarts.c +# IRQ +include_bsp_HEADERS += ../../shared/include/irq-generic.h \ + ../../shared/include/irq-info.h +libbsp_a_SOURCES += ../../shared/src/irq-generic.c \ + ../../shared/src/irq-legacy.c \ + ../../shared/src/irq-info.c \ + ../../shared/src/irq-shell.c \ + ../../shared/src/irq-server.c if ENABLE_LCD libbsp_a_SOURCES += console/sed1356.c console/fbcons.c endif diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/c/src/lib/libbsp/arm/csb337/include/bsp.h index 72e2883a10..91dddff107 100644 --- a/c/src/lib/libbsp/arm/csb337/include/bsp.h +++ b/c/src/lib/libbsp/arm/csb337/include/bsp.h @@ -26,6 +26,7 @@ extern "C" { #include #include +#define BSP_FEATURE_IRQ_EXTENSION /* What is the input clock freq in hertz? */ #define BSP_MAIN_FREQ 3686400 /* 3.6864 MHz */ diff --git a/c/src/lib/libbsp/arm/csb337/network/network.c b/c/src/lib/libbsp/arm/csb337/network/network.c index e16b646035..6f0ca619fb 100644 --- a/c/src/lib/libbsp/arm/csb337/network/network.c +++ b/c/src/lib/libbsp/arm/csb337/network/network.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include /* enable debugging of the PHY code */ diff --git a/c/src/lib/libbsp/arm/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am index bc980b7e38..f067f396e6 100644 --- a/c/src/lib/libbsp/arm/csb337/preinstall.am +++ b/c/src/lib/libbsp/arm/csb337/preinstall.am @@ -106,3 +106,11 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds +$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h + +$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h + diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c index 9546ceadbd..bc9f3ba00c 100644 --- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -24,7 +25,6 @@ #include /* Function prototypes */ -extern void rtems_irq_mngt_init(void); extern void rtems_exception_init_mngt(void); void bsp_libc_init( void *, uint32_t, int ); static void fix_mac_addr(void); @@ -65,7 +65,9 @@ void bsp_start_default( void ) /* * Init rtems interrupt management */ - rtems_irq_mngt_init(); + if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) { + _CPU_Fatal_halt(0xe); + } } /* bsp_start */ -- cgit v1.2.3