From 7ae27751322a9b29ea9ff2adc146f064237127eb Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Fri, 17 Jul 2009 13:53:04 +0000 Subject: ARM bsp maintenance --- c/src/lib/libbsp/arm/gba/ChangeLog | 8 ++++++++ c/src/lib/libbsp/arm/gba/Makefile.am | 13 ++----------- c/src/lib/libbsp/arm/gba/irq/bsp_irq_asm.S | 6 +++--- c/src/lib/libbsp/arm/gba/irq/irq_asm.S | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) (limited to 'c/src/lib/libbsp/arm/gba') diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog index 0640987255..8e2c90abd0 100644 --- a/c/src/lib/libbsp/arm/gba/ChangeLog +++ b/c/src/lib/libbsp/arm/gba/ChangeLog @@ -4,6 +4,14 @@ RTEMS_BSP_BOOTCARD_OPTIONS. Add RTEMS_BSP_CLEANUP_OPTIONS so all BSPs have the same options. +2009-07-15 Sebastian Huber + + * startup/cpu.c, startup/cpu_asm.S: Removed files. + * Makefile.am: Removed references to deleted files 'startup/cpu.c' and + 'startup/cpu_asm.S'. + * irq/irq_asm.S, irq/bsp_irq_asm.S: Renamed ExecuteITHandler() into + bsp_interrupt_dispatch(). + 2009-05-08 Joel Sherrill * startup/bspgetworkarea.c: Switch from ssize_t to uintptr_t for diff --git a/c/src/lib/libbsp/arm/gba/Makefile.am b/c/src/lib/libbsp/arm/gba/Makefile.am index 886acb3378..642d4a77df 100644 --- a/c/src/lib/libbsp/arm/gba/Makefile.am +++ b/c/src/lib/libbsp/arm/gba/Makefile.am @@ -33,20 +33,13 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -# some objects have to be forced together to ensure they are ALWAYS -# the ones linked into the application executable. Every application -# needs startup/bspstart.c, so we will force in the others -noinst_PROGRAMS += gbaoverrides.rel -gbaoverrides_rel_SOURCES = startup/bspstart.c startup/cpu.c startup/cpu_asm.S -gbaoverrides_rel_CPPFLAGS = $(AM_CPPFLAGS) -gbaoverrides_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - # startup libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ ../../shared/bsppredriverhook.c ../../shared/bspclean.c \ startup/bspreset.c ../../shared/bootcard.c ../../shared/sbrk.c \ - ../../shared/gnatinstallhandler.c + ../../shared/gnatinstallhandler.c \ + startup/bspstart.c # clock libbsp_a_SOURCES += clock/clockdrv.c ../../../shared/clockdrv_shell.h # console @@ -60,7 +53,5 @@ include_HEADERS += irq/irq.h libbsp_a_SOURCES += irq/irq.c irq/bsp_irq_init.c irq/irq_init.c \ irq/bsp_irq_asm.S irq/irq_asm.S -libbsp_a_LIBADD = gbaoverrides.rel - include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/gba/irq/bsp_irq_asm.S b/c/src/lib/libbsp/arm/gba/irq/bsp_irq_asm.S index 3697b5e018..238b9deead 100644 --- a/c/src/lib/libbsp/arm/gba/irq/bsp_irq_asm.S +++ b/c/src/lib/libbsp/arm/gba/irq/bsp_irq_asm.S @@ -23,7 +23,7 @@ /** * Execute interrupt handler - * function void ExecuteITHandler(void) + * function void bsp_interrupt_dispatch(void) * * Look at interrupt status register to determine source. * From source, determine offset into expanded vector table @@ -34,7 +34,7 @@ .align /* .section .iwram */ -PUBLIC_ARM_FUNCTION(ExecuteITHandler) +PUBLIC_ARM_FUNCTION(bsp_interrupt_dispatch) ldr r1, =GBA_REG_IE_ADDR ldrh r1, [r1] ldr r2, =GBA_REG_IF_ADDR @@ -174,6 +174,6 @@ IRQ_NoInterrupt: /* return to the "main" interrupt handler */ mov pc, lr -LABEL_END(ExecuteITHandler) +LABEL_END(bsp_interrupt_dispatch) /* @endcond */ diff --git a/c/src/lib/libbsp/arm/gba/irq/irq_asm.S b/c/src/lib/libbsp/arm/gba/irq/irq_asm.S index 41f698aa28..1fb3586e05 100644 --- a/c/src/lib/libbsp/arm/gba/irq/irq_asm.S +++ b/c/src/lib/libbsp/arm/gba/irq/irq_asm.S @@ -57,7 +57,7 @@ PUBLIC_ARM_FUNCTION(_ISR_Handler) str r1, [r0] /* BSP specific function to INT handler */ - bl ExecuteITHandler + bl bsp_interrupt_dispatch /* one less nest level */ ldr r0, =_ISR_Nest_level -- cgit v1.2.3