From 47adf3f7e969a0cd7e20b4b5e31dbeb805f0c1ba Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 30 Apr 2010 13:49:15 +0000 Subject: 2010-04-30 Sebastian Huber * include/irq-config.h: Removed file. * Makefile.am, preinstall.am: Reflect change above. * irq/irq.c: Removed superfluous parameter checks. --- c/src/lib/libbsp/arm/lpc24xx/ChangeLog | 6 +++++ c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 1 - c/src/lib/libbsp/arm/lpc24xx/include/irq-config.h | 26 ---------------------- c/src/lib/libbsp/arm/lpc24xx/irq/irq.c | 8 ++----- c/src/lib/libbsp/arm/lpc24xx/preinstall.am | 4 ---- c/src/lib/libbsp/arm/lpc32xx/ChangeLog | 6 +++++ c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 1 - c/src/lib/libbsp/arm/lpc32xx/include/irq-config.h | 27 ----------------------- c/src/lib/libbsp/arm/lpc32xx/irq/irq.c | 24 +++++++++----------- c/src/lib/libbsp/arm/lpc32xx/preinstall.am | 4 ---- 10 files changed, 24 insertions(+), 83 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/lpc24xx/include/irq-config.h delete mode 100644 c/src/lib/libbsp/arm/lpc32xx/include/irq-config.h diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index 9c46c85577..bc29a40056 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,9 @@ +2010-04-30 Sebastian Huber + + * include/irq-config.h: Removed file. + * Makefile.am, preinstall.am: Reflect change above. + * irq/irq.c: Removed superfluous parameter checks. + 2010-04-30 Sebastian Huber * make/custom/lpc24xx.inc: Use VFP floating point model. diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index f10bfec9de..dd19785d09 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -36,7 +36,6 @@ include_bsp_HEADERS += ../../shared/tod.h include_bsp_HEADERS += ../shared/include/linker-symbols.h include_bsp_HEADERS += ../shared/include/start.h include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h -include_bsp_HEADERS += include/irq-config.h include_bsp_HEADERS += include/irq.h include_bsp_HEADERS += include/lpc24xx.h include_bsp_HEADERS += include/system-clocks.h diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/irq-config.h b/c/src/lib/libbsp/arm/lpc24xx/include/irq-config.h deleted file mode 100644 index eab12215bb..0000000000 --- a/c/src/lib/libbsp/arm/lpc24xx/include/irq-config.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file - * - * @ingroup bsp_interrupt - * - * @brief LPC24XX interrupt support configuration. - */ - -/* - * Copyright (c) 2008 - * Embedded Brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * rtems@embedded-brains.de - * - * The license and distribution terms for this file may be found in the file - * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE. - */ - -#ifndef LIBBSP_ARM_LPC24XX_IRQ_CONFIG_H -#define LIBBSP_ARM_LPC24XX_IRQ_CONFIG_H - -#include - -#endif /* LIBBSP_ARM_LPC24XX_IRQ_CONFIG_H */ diff --git a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c b/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c index c16bd46bd8..82164000af 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c +++ b/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c @@ -68,18 +68,14 @@ void bsp_interrupt_dispatch(void) rtems_status_code bsp_interrupt_vector_enable(rtems_vector_number vector) { - if (lpc24xx_irq_is_valid(vector)) { - VICIntEnable = 1U << vector; - } + VICIntEnable = 1U << vector; return RTEMS_SUCCESSFUL; } rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector) { - if (lpc24xx_irq_is_valid(vector)) { - VICIntEnClear = 1U << vector; - } + VICIntEnClear = 1U << vector; return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am index 3618176b8e..1b99185693 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am @@ -90,10 +90,6 @@ $(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h -$(PROJECT_INCLUDE)/bsp/irq-config.h: include/irq-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h - $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h diff --git a/c/src/lib/libbsp/arm/lpc32xx/ChangeLog b/c/src/lib/libbsp/arm/lpc32xx/ChangeLog index 6edd372429..80a921dc4e 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc32xx/ChangeLog @@ -1,3 +1,9 @@ +2010-04-30 Sebastian Huber + + * include/irq-config.h: Removed file. + * Makefile.am, preinstall.am: Reflect change above. + * irq/irq.c: Removed superfluous parameter checks. + 2010-04-30 Sebastian Huber * make/custom/lpc32xx_phycore.cfg: Use VFP floating point model. diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am index 553ef85da1..2f0d476692 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am @@ -38,7 +38,6 @@ include_bsp_HEADERS += ../shared/include/linker-symbols.h include_bsp_HEADERS += ../shared/include/start.h include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h -include_bsp_HEADERS += include/irq-config.h include_bsp_HEADERS += include/irq.h include_bsp_HEADERS += include/mmu.h include_bsp_HEADERS += include/lpc32xx.h diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/irq-config.h b/c/src/lib/libbsp/arm/lpc32xx/include/irq-config.h deleted file mode 100644 index 659e2ea56e..0000000000 --- a/c/src/lib/libbsp/arm/lpc32xx/include/irq-config.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * - * @ingroup bsp_interrupt - * - * @brief Interrupt support configuration. - */ - -/* - * Copyright (c) 2009 - * embedded brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -#ifndef LIBBSP_ARM_LPC32XX_IRQ_CONFIG_H -#define LIBBSP_ARM_LPC32XX_IRQ_CONFIG_H - -#include - -#endif /* LIBBSP_ARM_LPC32XX_IRQ_CONFIG_H */ diff --git a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c index b7baefbeee..9a569c4a76 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c +++ b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c @@ -280,28 +280,24 @@ void bsp_interrupt_dispatch(void) rtems_status_code bsp_interrupt_vector_enable(rtems_vector_number vector) { - if (lpc32xx_irq_is_valid(vector)) { - rtems_interrupt_level level; + rtems_interrupt_level level; - rtems_interrupt_disable(level); - lpc32xx_irq_set_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER); - lpc32xx_irq_set_bit_in_field(vector, &lpc32xx_irq_enable); - rtems_interrupt_enable(level); - } + rtems_interrupt_disable(level); + lpc32xx_irq_set_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER); + lpc32xx_irq_set_bit_in_field(vector, &lpc32xx_irq_enable); + rtems_interrupt_enable(level); return RTEMS_SUCCESSFUL; } rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector) { - if (lpc32xx_irq_is_valid(vector)) { - rtems_interrupt_level level; + rtems_interrupt_level level; - rtems_interrupt_disable(level); - lpc32xx_irq_clear_bit_in_field(vector, &lpc32xx_irq_enable); - lpc32xx_irq_clear_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER); - rtems_interrupt_enable(level); - } + rtems_interrupt_disable(level); + lpc32xx_irq_clear_bit_in_field(vector, &lpc32xx_irq_enable); + lpc32xx_irq_clear_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER); + rtems_interrupt_enable(level); return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am b/c/src/lib/libbsp/arm/lpc32xx/preinstall.am index 79bf68e1d4..52840cf7f6 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc32xx/preinstall.am @@ -98,10 +98,6 @@ $(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCL $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h -$(PROJECT_INCLUDE)/bsp/irq-config.h: include/irq-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h - $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -- cgit v1.2.3