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/qemuppc/ChangeLog b/c/src/lib/libbsp/powerpc/qemuppc/ChangeLog
index 97f43c39f8..99cf993d47 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/qemuppc/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-10-29	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* Makefile.am: add cache.rel
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index cdbc9f6861..838d088d94 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -45,8 +45,7 @@ console_SOURCES = ../../shared/console-polled.c console/console-io.c
 
 # irq
 include_bsp_HEADERS = irq/irq.h \
-    ../../shared/include/irq-generic.h \
-    irq/irq-config.h
+    ../../shared/include/irq-generic.h
 
 irq_SOURCES = irq/irq_init.c \
 	../../shared/src/irq-generic.c \
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq-config.h b/c/src/lib/libbsp/powerpc/qemuppc/irq/irq-config.h
deleted file mode 100644
index a7b8bac1e7..0000000000
--- a/c/src/lib/libbsp/powerpc/qemuppc/irq/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_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 */
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h b/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h
index 9325d8a339..2ef6f0a8be 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h
@@ -58,6 +58,10 @@
    */
 #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> */
 
 #ifdef __cplusplus
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am b/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
index 306733fc24..3e36f430af 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
@@ -77,7 +77,3 @@ $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJE
 	$(INSTALL_DATA) $< $(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
-