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.
	* include/irq.h: Moved defines from 'include/irq-config.h'.
This commit is contained in:
Sebastian Huber
2010-04-30 12:34:37 +00:00
parent b01a769e70
commit 16d58e8315
20 changed files with 41 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/powerpc/mbx8xx/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.
* include/irq.h: Moved defines from 'include/irq-config.h'.
2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* console/console.c, ide/pcmcia_ide.c, startup/bspstart.c, * console/console.c, ide/pcmcia_ide.c, startup/bspstart.c,

1
c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
View File

@@ -22,7 +22,6 @@ noinst_PROGRAMS =
include_HEADERS += include/coverhd.h include_HEADERS += include/coverhd.h
include_bsp_HEADERS = include/mbx.h include/commproc.h include/8xx_immap.h \ include_bsp_HEADERS = include/mbx.h include/commproc.h include/8xx_immap.h \
irq/irq.h \ irq/irq.h \
include/irq-config.h \
../../shared/include/irq-generic.h \ ../../shared/include/irq-generic.h \
../../shared/include/irq-info.h ../../shared/include/irq-info.h

47
c/src/lib/libbsp/powerpc/mbx8xx/include/irq-config.h
View File

@@ -1,47 +0,0 @@
/**
* @file
*
* @ingroup bsp_interrupt
*
* @brief BSP 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_POWERPC_MBX8XX_IRQ_CONFIG_H
#define LIBBSP_POWERPC_MBX8XX_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
/** @} */
#endif /* LIBBSP_POWERPC_MBX8XX_IRQ_CONFIG_H */

3
c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
View File

@@ -135,6 +135,9 @@ extern volatile unsigned int ppc_cached_irq_mask;
*/ */
#define BSP_DECREMENTER BSP_PROCESSOR_IRQ_LOWEST_OFFSET #define BSP_DECREMENTER BSP_PROCESSOR_IRQ_LOWEST_OFFSET
#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET
#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET
#define CPM_INTERRUPT #define CPM_INTERRUPT

4
c/src/lib/libbsp/powerpc/mbx8xx/preinstall.am
View File

@@ -68,10 +68,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/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
$(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) $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h

6
c/src/lib/libbsp/powerpc/mpc8260ads/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.
* include/irq.h: Moved defines from 'include/irq-config.h'.
2009-11-03 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> 2009-11-03 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* start/start.S: checked and removed boot_card warning * start/start.S: checked and removed boot_card warning

1
c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
View File

@@ -37,7 +37,6 @@ libbsp_a_SOURCES += ../shared/clock/clock.c
libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += console/console.c
include_bsp_HEADERS = irq/irq.h \ include_bsp_HEADERS = irq/irq.h \
include/irq-config.h \
../../shared/include/irq-generic.h \ ../../shared/include/irq-generic.h \
../../shared/include/irq-info.h ../../shared/include/irq-info.h

47
c/src/lib/libbsp/powerpc/mpc8260ads/include/irq-config.h
View File

@@ -1,47 +0,0 @@
/**
* @file
*
* @ingroup bsp_interrupt
*
* @brief BSP 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_POWERPC_MBX8XX_IRQ_CONFIG_H
#define LIBBSP_POWERPC_MBX8XX_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
/** @} */
#endif /* LIBBSP_POWERPC_MBX8XX_IRQ_CONFIG_H */

3
c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
View File

@@ -143,6 +143,9 @@ extern volatile unsigned int ppc_cached_irq_mask;
#define BSP_DECREMENTER (BSP_PROCESSOR_IRQ_LOWEST_OFFSET) #define BSP_DECREMENTER (BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
#define BSP_PERIODIC_TIMER (BSP_DECREMENTER) #define BSP_PERIODIC_TIMER (BSP_DECREMENTER)
#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET
#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET
#define CPM_INTERRUPT #define CPM_INTERRUPT

4
c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
View File

@@ -69,10 +69,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/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
$(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) $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h

6
c/src/lib/libbsp/powerpc/qemuppc/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.
* include/irq.h: Moved defines from 'include/irq-config.h'.
2009-10-29 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> 2009-10-29 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* Makefile.am: add cache.rel * Makefile.am: add cache.rel

3
c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
View File

@@ -45,8 +45,7 @@ console_SOURCES = ../../shared/console-polled.c console/console-io.c
# irq # irq
include_bsp_HEADERS = irq/irq.h \ include_bsp_HEADERS = irq/irq.h \
../../shared/include/irq-generic.h \ ../../shared/include/irq-generic.h
irq/irq-config.h
irq_SOURCES = irq/irq_init.c \ irq_SOURCES = irq/irq_init.c \
../../shared/src/irq-generic.c \ ../../shared/src/irq-generic.c \

78
c/src/lib/libbsp/powerpc/qemuppc/irq/irq-config.h
View File

@@ -1,78 +0,0 @@
/**
* @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_QEMUPPC_IRQ_CONFIG_H
#define LIBBSP_POWERPC_QEMUPPC_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_QEMUPPC_IRQ_CONFIG_H */

4
c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h
View File

@@ -58,6 +58,10 @@
*/ */
#define BSP_DECREMENTER (BSP_PROCESSOR_IRQ_LOWEST_OFFSET) #define BSP_DECREMENTER (BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET
#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET
/* #include <bsp/irq_supp.h> */ /* #include <bsp/irq_supp.h> */
#ifdef __cplusplus #ifdef __cplusplus

4
c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
View File

@@ -77,7 +77,3 @@ $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJE
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
$(PROJECT_INCLUDE)/bsp/irq-config.h: irq/irq-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h

6
c/src/lib/libbsp/powerpc/tqm8xx/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.
* include/irq.h: Moved defines from 'include/irq-config.h'.
2010-01-18 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> 2010-01-18 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* configure.ac, console/console.c, include/bsp.h, irq/irq.c, * configure.ac, console/console.c, include/bsp.h, irq/irq.c,

5
c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
View File

@@ -21,7 +21,7 @@ noinst_PROGRAMS =
include_HEADERS += include/coverhd.h include_HEADERS += include/coverhd.h
include_bsp_HEADERS = include/tqm.h include/8xx_immap.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 \ ../../shared/include/irq-generic.h \
spi/spi.h spi/spi.h
@@ -42,8 +42,7 @@ noinst_LIBRARIES += libbsp.a
libbsp_a_SOURCES = libbsp_a_SOURCES =
# irq # irq
libbsp_a_SOURCES += include/irq-config.h \ libbsp_a_SOURCES += irq/irq.c \
irq/irq.c \
../../shared/src/irq-generic.c \ ../../shared/src/irq-generic.c \
../../shared/src/irq-legacy.c ../../shared/src/irq-legacy.c

101
c/src/lib/libbsp/powerpc/tqm8xx/include/irq-config.h
View File

@@ -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 */

4
c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h
View File

@@ -146,6 +146,10 @@ extern "C" {
#define BSP_PERIODIC_TIMER BSP_SIU_INT_IRQ_6 #define BSP_PERIODIC_TIMER BSP_SIU_INT_IRQ_6
#define BSP_FAST_ETHERNET_CTRL BSP_SIU_INT_IRQ_3 #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 #ifdef __cplusplus
} }
#endif #endif

4
c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
View File

@@ -69,10 +69,6 @@ $(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
$(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) $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h