diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-04-30 12:34:37 +0000 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-04-30 12:34:37 +0000 |
commit | 16d58e83155fd6b84a78b641d077c74ecc77abf0 (patch) | |
tree | 4ed176ae8d5a5131faf21434ef518908571a06c1 /c/src/lib/libbsp/powerpc/tqm8xx | |
parent | 2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
download | rtems-16d58e83155fd6b84a78b641d077c74ecc77abf0.tar.bz2 |
2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* include/irq-config.h: Removed file.
* Makefile.am, preinstall.am: Reflect change above.
* include/irq.h: Moved defines from 'include/irq-config.h'.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/tqm8xx')
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/include/irq-config.h | 101 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am | 4 |
5 files changed, 12 insertions, 108 deletions
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog index 45f4d160f3..35ada5c1e1 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog @@ -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. + * include/irq.h: Moved defines from 'include/irq-config.h'. + 2010-01-18 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> * configure.ac, console/console.c, include/bsp.h, irq/irq.c, diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am index 645e2a5a91..5130bc7d24 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am @@ -21,7 +21,7 @@ noinst_PROGRAMS = include_HEADERS += include/coverhd.h include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \ - include/irq.h include/irq-config.h \ + include/irq.h \ ../../shared/include/irq-generic.h \ spi/spi.h @@ -42,8 +42,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # irq -libbsp_a_SOURCES += include/irq-config.h \ - irq/irq.c \ +libbsp_a_SOURCES += irq/irq.c \ ../../shared/src/irq-generic.c \ ../../shared/src/irq-legacy.c diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq-config.h b/c/src/lib/libbsp/powerpc/tqm8xx/include/irq-config.h deleted file mode 100644 index cdfdfa9dc0..0000000000 --- a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq-config.h +++ /dev/null @@ -1,101 +0,0 @@ -/*===============================================================*\ -| Project: RTEMS TQM8xx BSP | -+-----------------------------------------------------------------+ -| This file has been adapted to MPC8xx by | -| Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | -| Copyright (c) 2008 | -| Embedded Brains GmbH | -| Obere Lagerstr. 30 | -| D-82178 Puchheim | -| Germany | -| rtems@embedded-brains.de | -| | -| See the other copyright notice below for the original parts. | -+-----------------------------------------------------------------+ -| 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. | -| | -+-----------------------------------------------------------------+ -| this file contains the console driver | -\*===============================================================*/ -/* derived from: generic MPC83xx BSP */ -/** - * @file - * - * @ingroup bsp_interrupt - * - * @brief BSP 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_POWERPC_TQM8XX_IRQ_CONFIG_H -#define LIBBSP_POWERPC_TQM8XX_IRQ_CONFIG_H - -#include <stdint.h> - -#include <bsp/irq.h> - -/** - * @addtogroup bsp_interrupt - * - * @{ - */ - -/** - * @brief Minimum vector number. - */ -#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET - -/** - * @brief Maximum vector number. - */ -#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET - -/** - * @brief Enables the index table. - * - * If you enable the index table, you have to define a size for the handler - * table (@ref BSP_INTERRUPT_HANDLER_TABLE_SIZE) and must provide an integer - * type capable to index the complete handler table (@ref - * bsp_interrupt_handler_index_type). - */ -#undef BSP_INTERRUPT_USE_INDEX_TABLE - -/** - * @brief Disables usage of the heap. - * - * If you define this, you have to define @ref BSP_INTERRUPT_USE_INDEX_TABLE as - * well. - */ -#undef BSP_INTERRUPT_NO_HEAP_USAGE - -#ifdef BSP_INTERRUPT_USE_INDEX_TABLE - -/** - * @brief Size of the handler table. - */ -#define BSP_INTERRUPT_HANDLER_TABLE_SIZE 63 - -/** - * @brief Integer type capable to index the complete handler table. - */ -typedef uint8_t bsp_interrupt_handler_index_type; - -#endif /* BSP_INTERRUPT_USE_INDEX_TABLE */ - -/** @} */ - -#endif /* LIBBSP_POWERPC_TQM8XX_IRQ_CONFIG_H */ diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h b/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h index 6baaeafb87..645535700b 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h +++ b/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h @@ -146,6 +146,10 @@ extern "C" { #define BSP_PERIODIC_TIMER BSP_SIU_INT_IRQ_6 #define BSP_FAST_ETHERNET_CTRL BSP_SIU_INT_IRQ_3 +#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET + +#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET + #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am index d261948207..67b0f2d3ab 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am @@ -69,10 +69,6 @@ $(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 -$(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-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 |