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'.

5 files changed, 11 insertions, 84 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index aa14380810..28b0d16e52 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/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'.
+
 2009-11-02	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* start/start.S, irq/irq.c: call to boot_card checked, removed warning
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index de4f4c5582..104d3ad3e8 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -64,7 +64,6 @@ libbsp_a_SOURCES += ../../shared/bsplibc.c \
 libbsp_a_SOURCES += ../shared/clock/clock.c
 
 include_bsp_HEADERS = include/irq.h \
-	include/irq-config.h \
 	../../shared/include/irq-generic.h \
 	../../shared/include/irq-info.h \
 	include/hwreg_vals.h \
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/irq-config.h b/c/src/lib/libbsp/powerpc/gen83xx/include/irq-config.h
deleted file mode 100644
index d31b3ac6cc..0000000000
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/irq-config.h
+++ /dev/null
@@ -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_GEN83XX_IRQ_CONFIG_H
-#define LIBBSP_POWERPC_GEN83XX_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_GEN83XX_IRQ_CONFIG_H */
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h b/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h
index 3d6794bff0..7e7a8d97df 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h
+++ b/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h
@@ -1,7 +1,7 @@
 /*===============================================================*\
 | Project: RTEMS generic MPC83xx BSP                              |
 +-----------------------------------------------------------------+
-|                    Copyright (c) 2007                           |
+|                    Copyright (c) 2007, 2010                     |
 |                    Embedded Brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
 |                    D-82178 Puchheim                             |
@@ -129,6 +129,10 @@ extern "C" {
     BSP_IPIC_IRQ_LAST     = BSP_IPIC_IRQ_MAX_OFFSET,
   } rtems_irq_symbolic_name;
 
+#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET
+
+#define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET
+
 rtems_status_code mpc83xx_ipic_set_mask( rtems_vector_number vector, rtems_vector_number mask_vector, bool mask);
 
 #define MPC83XX_IPIC_INTERRUPT_NORMAL 0
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
index 832bf2e798..d612d00b6e 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
@@ -93,10 +93,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