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

2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* include/irq-config.h: Removed file.
	* Makefile.am, preinstall.am: Reflect change above.
	* irq/irq.c: Removed superfluous parameter checks.
This commit is contained in:
Sebastian Huber
2010-04-30 13:49:15 +00:00
parent 5895c00c9b
commit 47adf3f7e9
10 changed files with 24 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/arm/lpc24xx/ChangeLog
View File

@@ -1,3 +1,9 @@
2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* 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 <sebastian.huber@embedded-brains.de> 2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* make/custom/lpc24xx.inc: Use VFP floating point model. * make/custom/lpc24xx.inc: Use VFP floating point model.

1
c/src/lib/libbsp/arm/lpc24xx/Makefile.am
View File

@@ -36,7 +36,6 @@ include_bsp_HEADERS += ../../shared/tod.h
include_bsp_HEADERS += ../shared/include/linker-symbols.h include_bsp_HEADERS += ../shared/include/linker-symbols.h
include_bsp_HEADERS += ../shared/include/start.h include_bsp_HEADERS += ../shared/include/start.h
include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.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/irq.h
include_bsp_HEADERS += include/lpc24xx.h include_bsp_HEADERS += include/lpc24xx.h
include_bsp_HEADERS += include/system-clocks.h include_bsp_HEADERS += include/system-clocks.h

26
c/src/lib/libbsp/arm/lpc24xx/include/irq-config.h
View File

@@ -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 <bsp/irq.h>
#endif /* LIBBSP_ARM_LPC24XX_IRQ_CONFIG_H */

4
c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
View File

@@ -68,18 +68,14 @@ void bsp_interrupt_dispatch(void)
rtems_status_code bsp_interrupt_vector_enable(rtems_vector_number vector) 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; return RTEMS_SUCCESSFUL;
} }
rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector) 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; return RTEMS_SUCCESSFUL;
} }

4
c/src/lib/libbsp/arm/lpc24xx/preinstall.am
View File

@@ -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 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
PREINSTALL_FILES += $(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) $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h

6
c/src/lib/libbsp/arm/lpc32xx/ChangeLog
View File

@@ -1,3 +1,9 @@
2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* 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 <sebastian.huber@embedded-brains.de> 2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* make/custom/lpc32xx_phycore.cfg: Use VFP floating point model. * make/custom/lpc32xx_phycore.cfg: Use VFP floating point model.

1
c/src/lib/libbsp/arm/lpc32xx/Makefile.am
View File

@@ -38,7 +38,6 @@ include_bsp_HEADERS += ../shared/include/linker-symbols.h
include_bsp_HEADERS += ../shared/include/start.h include_bsp_HEADERS += ../shared/include/start.h
include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.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/irq.h
include_bsp_HEADERS += include/mmu.h include_bsp_HEADERS += include/mmu.h
include_bsp_HEADERS += include/lpc32xx.h include_bsp_HEADERS += include/lpc32xx.h

27
c/src/lib/libbsp/arm/lpc32xx/include/irq-config.h
View File

@@ -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
* <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_LPC32XX_IRQ_CONFIG_H
#define LIBBSP_ARM_LPC32XX_IRQ_CONFIG_H
#include <bsp/irq.h>
#endif /* LIBBSP_ARM_LPC32XX_IRQ_CONFIG_H */

4
c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
View File

@@ -280,28 +280,24 @@ void bsp_interrupt_dispatch(void)
rtems_status_code bsp_interrupt_vector_enable(rtems_vector_number vector) 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); rtems_interrupt_disable(level);
lpc32xx_irq_set_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER); lpc32xx_irq_set_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER);
lpc32xx_irq_set_bit_in_field(vector, &lpc32xx_irq_enable); lpc32xx_irq_set_bit_in_field(vector, &lpc32xx_irq_enable);
rtems_interrupt_enable(level); rtems_interrupt_enable(level);
}
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }
rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector) 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); rtems_interrupt_disable(level);
lpc32xx_irq_clear_bit_in_field(vector, &lpc32xx_irq_enable); lpc32xx_irq_clear_bit_in_field(vector, &lpc32xx_irq_enable);
lpc32xx_irq_clear_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER); lpc32xx_irq_clear_bit_in_register(vector, LPC32XX_IRQ_OFFSET_ER);
rtems_interrupt_enable(level); rtems_interrupt_enable(level);
}
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }

4
c/src/lib/libbsp/arm/lpc32xx/preinstall.am
View File

@@ -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 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
PREINSTALL_FILES += $(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) $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h