2005-05-17 Jennifer Averett <jennifer.averett@oarcorp.com>

	* irq/irq.c, irq/irq.h: Modified to use rtems/irq.h.

9 files changed, 148 insertions, 730 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index 3d3a14b389..c976cbe774 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * irq/irq.c, irq/irq.h: Modified to use rtems/irq.h.
+
 2005-05-10	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Add -D__BSD_VISIBLE to network_CPPFLAGS.
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
index 11dd36418e..1a74a09c0b 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
@@ -41,7 +41,7 @@ static rtems_irq_connect_data*		rtems_hdl_tbl;
 /*
  * Check if symbolic IRQ name is an CPM IRQ
  */
-static inline int is_cpm_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_cpm_irq(const rtems_irq_number irqLine)
 {
 	return (((int) irqLine <= BSP_CPM_IRQ_MAX_OFFSET) &
 			((int) irqLine >= BSP_CPM_IRQ_LOWEST_OFFSET)
@@ -51,7 +51,7 @@ static inline int is_cpm_irq(const rtems_irq_symbolic_name irqLine)
 /*
  * Check if symbolic IRQ name is a Processor IRQ
  */
-static inline int is_processor_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_processor_irq(const rtems_irq_number irqLine)
 {
 	return (((int) irqLine <= BSP_PROCESSOR_IRQ_MAX_OFFSET) &
 			((int) irqLine >= BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
@@ -196,7 +196,7 @@ static int isValidInterrupt(int irq)
 	return 1;
 }
 
-int BSP_irq_enable_at_cpm(const rtems_irq_symbolic_name irqLine)
+int BSP_irq_enable_at_cpm(const rtems_irq_number irqLine)
 {
 	int cpm_irq_index;
 
@@ -211,7 +211,7 @@ int BSP_irq_enable_at_cpm(const rtems_irq_symbolic_name irqLine)
 	return 0;
 }
 
-int BSP_irq_disable_at_cpm(const rtems_irq_symbolic_name irqLine)
+int BSP_irq_disable_at_cpm(const rtems_irq_number irqLine)
 {
 	int cpm_irq_index;
 
@@ -226,7 +226,7 @@ int BSP_irq_disable_at_cpm(const rtems_irq_symbolic_name irqLine)
 	return 0;
 }
 
-int BSP_irq_enabled_at_cpm(const rtems_irq_symbolic_name irqLine)
+int BSP_irq_enabled_at_cpm(const rtems_irq_number irqLine)
 {
 	int cpm_irq_index;
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
index 2ae0586e3e..2d35c12376 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
@@ -26,8 +26,9 @@
  *  $Id$
  */
 
-#ifndef LIBBSP_POWERPC_MBX8XX_IRQ_IRQ_H
-#define LIBBSP_POWERPC_MBX8XX_IRQ_IRQ_H
+#ifndef LIBBSP_POWERPC_IRQ_H
+#define LIBBSP_POWERPC_IRQ_H
+#include <rtems/irq.h>
 
 #define BSP_ASM_IRQ_VECTOR_BASE 0x0
 
@@ -45,30 +46,29 @@ extern volatile unsigned int ppc_cached_irq_mask;
  * Symblolic IRQ names and related definitions.
  */
 
-typedef enum {
   /* Base vector for our SIU IRQ handlers. */
-  BSP_SIU_VECTOR_BASE	=	BSP_ASM_IRQ_VECTOR_BASE,
+#define BSP_SIU_VECTOR_BASE		(BSP_ASM_IRQ_VECTOR_BASE)
 
   /*
    * CPM IRQ handlers related definitions
    * CAUTION : BSP_CPM_IRQ_LOWEST_OFFSET should be equal to OPENPIC_VEC_SOURCE
    */
-  BSP_CPM_IRQ_NUMBER		=	64,
-  BSP_CPM_IRQ_LOWEST_OFFSET	=	BSP_SIU_VECTOR_BASE,
-  BSP_CPM_IRQ_MAX_OFFSET	= 	BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER - 1,
+#define BSP_CPM_IRQ_NUMBER		(64)
+#define BSP_CPM_IRQ_LOWEST_OFFSET	(BSP_SIU_VECTOR_BASE)
+#define BSP_CPM_IRQ_MAX_OFFSET		(BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER - 1)
   /*
    * PowerPc exceptions handled as interrupt where a rtems managed interrupt
    * handler might be connected
    */
-  BSP_PROCESSOR_IRQ_NUMBER	=	1,
-  BSP_PROCESSOR_IRQ_LOWEST_OFFSET = 	BSP_CPM_IRQ_MAX_OFFSET + 1,
-  BSP_PROCESSOR_IRQ_MAX_OFFSET	=	BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER - 1,
+#define BSP_PROCESSOR_IRQ_NUMBER	(1)
+#define BSP_PROCESSOR_IRQ_LOWEST_OFFSET (BSP_CPM_IRQ_MAX_OFFSET + 1)
+#define BSP_PROCESSOR_IRQ_MAX_OFFSET	(BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER - 1)
   /*
    * Summary
    */
-  BSP_IRQ_NUMBER		= 	BSP_PROCESSOR_IRQ_MAX_OFFSET + 1,
-  BSP_LOWEST_OFFSET		=	BSP_CPM_IRQ_LOWEST_OFFSET,
-  BSP_MAX_OFFSET		=	BSP_PROCESSOR_IRQ_MAX_OFFSET,
+#define BSP_IRQ_NUMBER		 	(BSP_PROCESSOR_IRQ_MAX_OFFSET + 1)
+#define BSP_LOWEST_OFFSET		(BSP_CPM_IRQ_LOWEST_OFFSET)
+#define BSP_MAX_OFFSET			(BSP_PROCESSOR_IRQ_MAX_OFFSET)
 
   /*
    * Some SIU IRQ symbolic name definition. Please note that
@@ -87,150 +87,70 @@ typedef enum {
   /*
    * Some CPM IRQ symbolic name definition
    */
-  BSP_CPM_IRQ_ERROR		=	BSP_CPM_IRQ_LOWEST_OFFSET,
-  BSP_CPM_IRQ_I2C		=	BSP_CPM_IRQ_LOWEST_OFFSET + 1,
-  BSP_CPM_IRQ_SPI		=	BSP_CPM_IRQ_LOWEST_OFFSET + 2,
-  BSP_CPM_IRQ_RISC_TIMERS	=	BSP_CPM_IRQ_LOWEST_OFFSET + 3,
-  BSP_CPM_IRQ_SMC1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 4,
-  BSP_CPM_IRQ_SMC2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 5,
-  BSP_CPM_IRQ_IDMA1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 6,
-  BSP_CPM_IRQ_IDMA2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 7,
-  BSP_CPM_IRQ_IDMA3		=	BSP_CPM_IRQ_LOWEST_OFFSET + 8,
-  BSP_CPM_IRQ_IDMA4		=	BSP_CPM_IRQ_LOWEST_OFFSET + 9,
-  BSP_CPM_IRQ_SDMA		=	BSP_CPM_IRQ_LOWEST_OFFSET + 10,
-
-  BSP_CPM_IRQ_TIMER_1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 12,
-  BSP_CPM_IRQ_TIMER_2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 13,
-  BSP_CPM_IRQ_TIMER_3		=	BSP_CPM_IRQ_LOWEST_OFFSET + 14,
-  BSP_CPM_IRQ_TIMER_4		=	BSP_CPM_IRQ_LOWEST_OFFSET + 15,
-  BSP_CPM_IRQ_TMCNT		=	BSP_CPM_IRQ_LOWEST_OFFSET + 16,
-  BSP_CPM_IRQ_PIT		=	BSP_CPM_IRQ_LOWEST_OFFSET + 17,
-
-  BSP_CPM_IRQ_IRQ1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 19,
-  BSP_CPM_IRQ_IRQ2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 20,
-  BSP_CPM_IRQ_IRQ3		=	BSP_CPM_IRQ_LOWEST_OFFSET + 21,
-  BSP_CPM_IRQ_IRQ4		=	BSP_CPM_IRQ_LOWEST_OFFSET + 22,
-  BSP_CPM_IRQ_IRQ5		=	BSP_CPM_IRQ_LOWEST_OFFSET + 23,
-  BSP_CPM_IRQ_IRQ6		=	BSP_CPM_IRQ_LOWEST_OFFSET + 24,
-  BSP_CPM_IRQ_IRQ7		=	BSP_CPM_IRQ_LOWEST_OFFSET + 25,
-
-  BSP_CPM_IRQ_FCC1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 32,
-  BSP_CPM_IRQ_FCC2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 33,
-  BSP_CPM_IRQ_FCC3		=	BSP_CPM_IRQ_LOWEST_OFFSET + 34,
-
-  BSP_CPM_IRQ_MCC1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 36,
-  BSP_CPM_IRQ_MCC2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 37,
-
-  BSP_CPM_IRQ_SCC1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 40,
-  BSP_CPM_IRQ_SCC2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 41,
-  BSP_CPM_IRQ_SCC3		=	BSP_CPM_IRQ_LOWEST_OFFSET + 42,
-  BSP_CPM_IRQ_SCC4		=	BSP_CPM_IRQ_LOWEST_OFFSET + 43,
-
-  BSP_CPM_IRQ_PC15		=	BSP_CPM_IRQ_LOWEST_OFFSET + 48,
-  BSP_CPM_IRQ_PC14		=	BSP_CPM_IRQ_LOWEST_OFFSET + 49,
-  BSP_CPM_IRQ_PC13		=	BSP_CPM_IRQ_LOWEST_OFFSET + 50,
-  BSP_CPM_IRQ_PC12		=	BSP_CPM_IRQ_LOWEST_OFFSET + 51,
-  BSP_CPM_IRQ_PC11		=	BSP_CPM_IRQ_LOWEST_OFFSET + 52,
-  BSP_CPM_IRQ_PC10		=	BSP_CPM_IRQ_LOWEST_OFFSET + 53,
-  BSP_CPM_IRQ_PC9		=	BSP_CPM_IRQ_LOWEST_OFFSET + 54,
-  BSP_CPM_IRQ_PC8		=	BSP_CPM_IRQ_LOWEST_OFFSET + 55,
-  BSP_CPM_IRQ_PC7		=	BSP_CPM_IRQ_LOWEST_OFFSET + 56,
-  BSP_CPM_IRQ_PC6		=	BSP_CPM_IRQ_LOWEST_OFFSET + 57,
-  BSP_CPM_IRQ_PC5		=	BSP_CPM_IRQ_LOWEST_OFFSET + 58,
-  BSP_CPM_IRQ_PC4		=	BSP_CPM_IRQ_LOWEST_OFFSET + 59,
-  BSP_CPM_IRQ_PC3		=	BSP_CPM_IRQ_LOWEST_OFFSET + 60,
-  BSP_CPM_IRQ_PC2		=	BSP_CPM_IRQ_LOWEST_OFFSET + 61,
-  BSP_CPM_IRQ_PC1		=	BSP_CPM_IRQ_LOWEST_OFFSET + 62,
-  BSP_CPM_IRQ_PC0		=	BSP_CPM_IRQ_LOWEST_OFFSET + 63,
+#define BSP_CPM_IRQ_ERROR		(BSP_CPM_IRQ_LOWEST_OFFSET + 0)
+#define BSP_CPM_IRQ_I2C			(BSP_CPM_IRQ_LOWEST_OFFSET + 1)
+#define BSP_CPM_IRQ_SPI			(BSP_CPM_IRQ_LOWEST_OFFSET + 2)
+#define BSP_CPM_IRQ_RISC_TIMERS		(BSP_CPM_IRQ_LOWEST_OFFSET + 3)
+#define BSP_CPM_IRQ_SMC1		(BSP_CPM_IRQ_LOWEST_OFFSET + 4)
+#define BSP_CPM_IRQ_SMC2		(BSP_CPM_IRQ_LOWEST_OFFSET + 5)
+#define BSP_CPM_IRQ_IDMA1		(BSP_CPM_IRQ_LOWEST_OFFSET + 6)
+#define BSP_CPM_IRQ_IDMA2		(BSP_CPM_IRQ_LOWEST_OFFSET + 7)
+#define BSP_CPM_IRQ_IDMA3		(BSP_CPM_IRQ_LOWEST_OFFSET + 8)
+#define BSP_CPM_IRQ_IDMA4		(BSP_CPM_IRQ_LOWEST_OFFSET + 9)
+#define BSP_CPM_IRQ_SDMA		(BSP_CPM_IRQ_LOWEST_OFFSET + 10)
+
+#define BSP_CPM_IRQ_TIMER_1		(BSP_CPM_IRQ_LOWEST_OFFSET + 12)
+#define BSP_CPM_IRQ_TIMER_2		(BSP_CPM_IRQ_LOWEST_OFFSET + 13)
+#define BSP_CPM_IRQ_TIMER_3		(BSP_CPM_IRQ_LOWEST_OFFSET + 14)
+#define BSP_CPM_IRQ_TIMER_4		(BSP_CPM_IRQ_LOWEST_OFFSET + 15)
+#define BSP_CPM_IRQ_TMCNT		(BSP_CPM_IRQ_LOWEST_OFFSET + 16)
+#define BSP_CPM_IRQ_PIT			(BSP_CPM_IRQ_LOWEST_OFFSET + 17)
+
+#define BSP_CPM_IRQ_IRQ1		(BSP_CPM_IRQ_LOWEST_OFFSET + 19)
+#define BSP_CPM_IRQ_IRQ2		(BSP_CPM_IRQ_LOWEST_OFFSET + 20)
+#define BSP_CPM_IRQ_IRQ3		(BSP_CPM_IRQ_LOWEST_OFFSET + 21)
+#define BSP_CPM_IRQ_IRQ4		(BSP_CPM_IRQ_LOWEST_OFFSET + 22)
+#define BSP_CPM_IRQ_IRQ5		(BSP_CPM_IRQ_LOWEST_OFFSET + 23)
+#define BSP_CPM_IRQ_IRQ6		(BSP_CPM_IRQ_LOWEST_OFFSET + 24)
+#define BSP_CPM_IRQ_IRQ7		(BSP_CPM_IRQ_LOWEST_OFFSET + 25)
+
+#define BSP_CPM_IRQ_FCC1		(BSP_CPM_IRQ_LOWEST_OFFSET + 32)
+#define BSP_CPM_IRQ_FCC2		(BSP_CPM_IRQ_LOWEST_OFFSET + 33)
+#define BSP_CPM_IRQ_FCC3		(BSP_CPM_IRQ_LOWEST_OFFSET + 34)
+#define BSP_CPM_IRQ_MCC1		(BSP_CPM_IRQ_LOWEST_OFFSET + 36)
+#define BSP_CPM_IRQ_MCC2		(BSP_CPM_IRQ_LOWEST_OFFSET + 37)
+
+#define BSP_CPM_IRQ_SCC1		(BSP_CPM_IRQ_LOWEST_OFFSET + 40)
+#define BSP_CPM_IRQ_SCC2		(BSP_CPM_IRQ_LOWEST_OFFSET + 41)
+#define BSP_CPM_IRQ_SCC3		(BSP_CPM_IRQ_LOWEST_OFFSET + 42)
+#define BSP_CPM_IRQ_SCC4		(BSP_CPM_IRQ_LOWEST_OFFSET + 43)
+
+#define BSP_CPM_IRQ_PC15		(BSP_CPM_IRQ_LOWEST_OFFSET + 48)
+#define BSP_CPM_IRQ_PC14		(BSP_CPM_IRQ_LOWEST_OFFSET + 49)
+#define BSP_CPM_IRQ_PC13		(BSP_CPM_IRQ_LOWEST_OFFSET + 50)
+#define BSP_CPM_IRQ_PC12		(BSP_CPM_IRQ_LOWEST_OFFSET + 51)
+#define BSP_CPM_IRQ_PC11		(BSP_CPM_IRQ_LOWEST_OFFSET + 52)
+#define BSP_CPM_IRQ_PC10		(BSP_CPM_IRQ_LOWEST_OFFSET + 53)
+#define BSP_CPM_IRQ_PC9			(BSP_CPM_IRQ_LOWEST_OFFSET + 54)
+#define BSP_CPM_IRQ_PC8			(BSP_CPM_IRQ_LOWEST_OFFSET + 55)
+#define BSP_CPM_IRQ_PC7			(BSP_CPM_IRQ_LOWEST_OFFSET + 56)
+#define BSP_CPM_IRQ_PC6			(BSP_CPM_IRQ_LOWEST_OFFSET + 57)
+#define BSP_CPM_IRQ_PC5			(BSP_CPM_IRQ_LOWEST_OFFSET + 58)
+#define BSP_CPM_IRQ_PC4			(BSP_CPM_IRQ_LOWEST_OFFSET + 59)
+#define BSP_CPM_IRQ_PC3			(BSP_CPM_IRQ_LOWEST_OFFSET + 60)
+#define BSP_CPM_IRQ_PC2			(BSP_CPM_IRQ_LOWEST_OFFSET + 61)
+#define BSP_CPM_IRQ_PC1			(BSP_CPM_IRQ_LOWEST_OFFSET + 62)
+#define BSP_CPM_IRQ_PC0			(BSP_CPM_IRQ_LOWEST_OFFSET + 63)
 
     /*
      * Some Processor exception handled as rtems IRQ symbolic name definition
      */
-  BSP_DECREMENTER		=	BSP_PROCESSOR_IRQ_LOWEST_OFFSET,
-  BSP_PERIODIC_TIMER		= 	BSP_DECREMENTER
+#define BSP_DECREMENTER			(BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
+#define BSP_PERIODIC_TIMER		(BSP_DECREMENTER)
 
-}rtems_irq_symbolic_name;
 
 #define CPM_INTERRUPT
 
-/*
- * Type definition for RTEMS managed interrupts
- */
-typedef unsigned char  rtems_irq_prio;
-struct 	__rtems_irq_connect_data__;	/* forward declaratiuon */
-
-typedef void *rtems_irq_hdl_param;
-typedef void (*rtems_irq_hdl)		(rtems_irq_hdl_param);
-typedef void (*rtems_irq_enable)	(const struct __rtems_irq_connect_data__*);
-typedef void (*rtems_irq_disable)	(const struct __rtems_irq_connect_data__*);
-typedef int  (*rtems_irq_is_enabled)	(const struct __rtems_irq_connect_data__*);
-
-typedef struct __rtems_irq_connect_data__ {
-  /*
-   * IRQ line
-   */
-  rtems_irq_symbolic_name 	name;
-  /*
-   * handler. See comment on handler properties below in function prototype.
-   */
-  rtems_irq_hdl	   		hdl;
-  /*
-   * Handler handle to store private data
-   */
-   rtems_irq_hdl_param		handle;
-  /*
-   * function for enabling interrupts at device level (ONLY!).
-   * The BSP code will automatically enable it at SIU level and CPM level.
-   * RATIONALE : anyway such code has to exist in current driver code.
-   * It is usually called immediately AFTER connecting the interrupt handler.
-   * RTEMS may well need such a function when restoring normal interrupt
-   * processing after a debug session.
-   *
-   */
-    rtems_irq_enable		on;
-  /*
-   * function for disabling interrupts at device level (ONLY!).
-   * The code will disable it at SIU and CPM level. RATIONALE : anyway
-   * such code has to exist for clean shutdown. It is usually called
-   * BEFORE disconnecting the interrupt. RTEMS may well need such
-   * a function when disabling normal interrupt processing for
-   * a debug session. May well be a NOP function.
-   */
-  rtems_irq_disable		off;
-  /*
-   * function enabling to know what interrupt may currently occur
-   * if someone manipulates the i8259s interrupt mask without care...
-   */
-    rtems_irq_is_enabled	isOn;
-} rtems_irq_connect_data;
-
-typedef struct {
-  /*
-   * size of all the table fields (*Tbl) described below.
-   */
-  unsigned int	 		irqNb;
-  /*
-   * Default handler used when disconnecting interrupts.
-   */
-  rtems_irq_connect_data	defaultEntry;
-  /*
-   * Table containing initials/current value.
-   */
-  rtems_irq_connect_data*	irqHdlTbl;
-  /*
-   * actual value of BSP_SIU_IRQ_VECTOR_BASE...
-   */
-  rtems_irq_symbolic_name	irqBase;
-  /*
-   * software priorities associated with interrupts.
-   * if irqPrio  [i]  >  intrPrio  [j]  it  means  that
-   * interrupt handler hdl connected for interrupt name i
-   * will  not be interrupted by the handler connected for interrupt j
-   * The interrupt source  will be physically masked at i8259 level.
-   */
-    rtems_irq_prio*		irqPrioTbl;
-}rtems_irq_global_settings;
-
 /*-------------------------------------------------------------------------+
 | Function Prototypes.
 +--------------------------------------------------------------------------*/
@@ -243,13 +163,13 @@ typedef struct {
  * this function, even if the device asserts the interrupt line it will
  * not be propagated further to the processor
  */
-int BSP_irq_disable_at_cpm        (const rtems_irq_symbolic_name irqLine);
+int BSP_irq_disable_at_cpm        (const rtems_irq_number irqLine);
 /*
  * function to enable a particular irq. After calling
  * this function, if the device asserts the interrupt line it will
  * be propagated further to the processor
  */
-int BSP_irq_enable_at_cpm		(const rtems_irq_symbolic_name irqLine);
+int BSP_irq_enable_at_cpm		(const rtems_irq_number irqLine);
 /*
  * function to acknoledge a particular irq. After calling
  * this function, if a device asserts an enabled interrupt line it will
@@ -257,89 +177,11 @@ int BSP_irq_enable_at_cpm		(const rtems_irq_symbolic_name irqLine);
  * writting raw handlers as this is automagically done for rtems managed
  * handlers.
  */
-int BSP_irq_ack_at_cpm              	(const rtems_irq_symbolic_name irqLine);
+int BSP_irq_ack_at_cpm              	(const rtems_irq_number irqLine);
 /*
  * function to check if a particular irq is enabled. After calling
  */
-int BSP_irq_enabled_at_cpm     	(const rtems_irq_symbolic_name irqLine);
-
-/*
- * ------------------------ RTEMS Single Irq Handler Mngt Routines ----------------
- */
-/*
- * function to connect a particular irq handler. This hanlder will NOT be called
- * directly as the result of the corresponding interrupt. Instead, a RTEMS
- * irq prologue will be called that will :
- *
- *	1) save the C scratch registers,
- *	2) switch to a interrupt stack if the interrupt is not nested,
- *	4) modify them to disable the current interrupt at  SIU level (and may
- *	be others depending on software priorities)
- *	5) aknowledge the SIU',
- *	6) demask the processor,
- *	7) call the application handler
- *
- * As a result the hdl function provided
- *
- *	a) can perfectly be written is C,
- * 	b) may also well directly call the part of the RTEMS API that can be used
- *	from interrupt level,
- *	c) It only responsible for handling the jobs that need to be done at
- *	the device level including (aknowledging/re-enabling the interrupt at device,
- *	level, getting the data,...)
- *
- *	When returning from the function, the following will be performed by
- *	the RTEMS irq epilogue :
- *
- *	1) masks the interrupts again,
- *	2) restore the original SIU interrupt masks
- *	3) switch back on the orinal stack if needed,
- *	4) perform rescheduling when necessary,
- *	5) restore the C scratch registers...
- *	6) restore initial execution flow
- *
- */
-int BSP_install_rtems_irq_handler   	(const rtems_irq_connect_data*);
-/*
- * function to get the current RTEMS irq handler for ptr->name. It enables to
- * define hanlder chain...
- */
-int BSP_get_current_rtems_irq_handler	(rtems_irq_connect_data* ptr);
-/*
- * function to get disconnect the RTEMS irq handler for ptr->name.
- * This function checks that the value given is the current one for safety reason.
- * The user can use the previous function to get it.
- */
-int BSP_remove_rtems_irq_handler    	(const rtems_irq_connect_data*);
-
-/*
- * ------------------------ RTEMS Global Irq Handler Mngt Routines ----------------
- */
-/*
- * (Re) Initialize the RTEMS interrupt management.
- *
- * The result of calling this function will be the same as if each individual
- * handler (config->irqHdlTbl[i].hdl)  different from "config->defaultEntry.hdl"
- * has been individualy connected via
- *	BSP_install_rtems_irq_handler(&config->irqHdlTbl[i])
- * And each handler currently equal to config->defaultEntry.hdl
- * has been previously disconnected via
- * 	 BSP_remove_rtems_irq_handler (&config->irqHdlTbl[i])
- *
- * This is to say that all information given will be used and not just
- * only the space.
- *
- * CAUTION : the various table address contained in config will be used
- *	     directly by the interrupt mangement code in order to save
- *	     data size so they must stay valid after the call => they should
- *	     not be modified or declared on a stack.
- */
-
-int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config);
-/*
- * (Re) get info on current RTEMS interrupt management.
- */
-int BSP_rtems_irq_mngt_get(rtems_irq_global_settings**);
+int BSP_irq_enabled_at_cpm     	(const rtems_irq_number irqLine);
 
 extern void BSP_rtems_irq_mng_init(unsigned cpuId);
 
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index 13cb061e46..da4589ac01 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * irq/irq.c, irq/irq.h: Modified to use rtems/irq.h.
+
 2005-05-11	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* include/tm27.h: Elininate unsigned32.
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq.c b/c/src/lib/libbsp/powerpc/psim/irq/irq.c
index 79d3a9a080..fcdb0ea4c9 100644
--- a/c/src/lib/libbsp/powerpc/psim/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/psim/irq/irq.c
@@ -53,7 +53,7 @@ static rtems_irq_connect_data*		rtems_hdl_tbl;
 /*
  * Check if IRQ is an ISA IRQ
  */
-static inline int is_isa_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_isa_irq(const rtems_irq_number irqLine)
 {
   return (((int) irqLine <= BSP_ISA_IRQ_MAX_OFFSET) &
 	  ((int) irqLine >= BSP_ISA_IRQ_LOWEST_OFFSET)
@@ -63,7 +63,7 @@ static inline int is_isa_irq(const rtems_irq_symbolic_name irqLine)
 /*
  * Check if IRQ is an OPENPIC IRQ
  */
-static inline int is_pci_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_pci_irq(const rtems_irq_number irqLine)
 {
   return (((int) irqLine <= BSP_PCI_IRQ_MAX_OFFSET) &
 	  ((int) irqLine >= BSP_PCI_IRQ_LOWEST_OFFSET)
@@ -73,7 +73,7 @@ static inline int is_pci_irq(const rtems_irq_symbolic_name irqLine)
 /*
  * Check if IRQ is a Porcessor IRQ
  */
-static inline int is_processor_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_processor_irq(const rtems_irq_number irqLine)
 {
   return (((int) irqLine <= BSP_PROCESSOR_IRQ_MAX_OFFSET) &
 	  ((int) irqLine >= BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq.h b/c/src/lib/libbsp/powerpc/psim/irq/irq.h
index 26a86df9b9..45eab0c561 100644
--- a/c/src/lib/libbsp/powerpc/psim/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/psim/irq/irq.h
@@ -18,9 +18,11 @@
  *  irq.h,v 1.2.4.2 2003/09/04 18:45:20 joel Exp
  */
 
-#ifndef LIBBSP_POWERPC_MCP750_IRQ_IRQ_H
-#define LIBBSP_POWERPC_MCP750_IRQ_IRQ_H
+#ifndef LIBBSP_POWERPC_IRQ_H
+#define LIBBSP_POWERPC_IRQ_H
 
+#define BSP_SHARED_HANDLER_SUPPORT      1
+#include <rtems/irq.h>
 
 /*
  * 8259 edge/level control definitions at VIA
@@ -59,280 +61,71 @@
 
 #ifndef ASM
 
-
 /*
  * Symblolic IRQ names and related definitions.
  */
 
-typedef enum {
   /* Base vector for our ISA IRQ handlers. */
-  BSP_ISA_IRQ_VECTOR_BASE	=	BSP_ASM_IRQ_VECTOR_BASE,
+#define BSP_ISA_IRQ_VECTOR_BASE		(BSP_ASM_IRQ_VECTOR_BASE)
   /*
    * ISA IRQ handler related definitions
    */
-  BSP_ISA_IRQ_NUMBER    	= 	16,
-  BSP_ISA_IRQ_LOWEST_OFFSET	= 	0,
-  BSP_ISA_IRQ_MAX_OFFSET	= 	BSP_ISA_IRQ_LOWEST_OFFSET + BSP_ISA_IRQ_NUMBER - 1,
+#define BSP_ISA_IRQ_NUMBER    	 	(16)
+#define BSP_ISA_IRQ_LOWEST_OFFSET	(0)
+#define BSP_ISA_IRQ_MAX_OFFSET	 	(BSP_ISA_IRQ_LOWEST_OFFSET + BSP_ISA_IRQ_NUMBER-1)
   /*
    * PCI IRQ handlers related definitions
    * CAUTION : BSP_PCI_IRQ_LOWEST_OFFSET should be equal to OPENPIC_VEC_SOURCE
    */
-  BSP_PCI_IRQ_NUMBER		=	16,
-  BSP_PCI_IRQ_LOWEST_OFFSET	=	BSP_ISA_IRQ_NUMBER,
-  BSP_PCI_IRQ_MAX_OFFSET	= 	BSP_PCI_IRQ_LOWEST_OFFSET + BSP_PCI_IRQ_NUMBER - 1,
+#define BSP_PCI_IRQ_NUMBER		(16)
+#define BSP_PCI_IRQ_LOWEST_OFFSET	(BSP_ISA_IRQ_NUMBER)
+#define BSP_PCI_IRQ_MAX_OFFSET	 	(BSP_PCI_IRQ_LOWEST_OFFSET+BSP_PCI_IRQ_NUMBER-1)
   /*
    * PowerPc exceptions handled as interrupt where a rtems managed interrupt
    * handler might be connected
    */
-  BSP_PROCESSOR_IRQ_NUMBER	=	1,
-  BSP_PROCESSOR_IRQ_LOWEST_OFFSET = 	BSP_PCI_IRQ_MAX_OFFSET + 1,
-  BSP_PROCESSOR_IRQ_MAX_OFFSET	=	BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER - 1,
+#define BSP_PROCESSOR_IRQ_NUMBER	(1)
+#define BSP_PROCESSOR_IRQ_LOWEST_OFFSET	(BSP_PCI_IRQ_MAX_OFFSET + 1)
+#define BSP_PROCESSOR_IRQ_MAX_OFFSET	(BSP_PROCESSOR_IRQ_LOWEST_OFFSET+BSP_PROCESSOR_IRQ_NUMBER-1)
   /* Misc vectors for OPENPIC irqs (IPI, timers)
    */
-  BSP_MISC_IRQ_NUMBER		=	8,
-  BSP_MISC_IRQ_LOWEST_OFFSET	=	BSP_PROCESSOR_IRQ_MAX_OFFSET + 1,
-  BSP_MISC_IRQ_MAX_OFFSET	=	BSP_MISC_IRQ_LOWEST_OFFSET + BSP_MISC_IRQ_NUMBER - 1,
+#define BSP_MISC_IRQ_NUMBER		(8)
+#define BSP_MISC_IRQ_LOWEST_OFFSET	(BSP_PROCESSOR_IRQ_MAX_OFFSET + 1)
+#define BSP_MISC_IRQ_MAX_OFFSET		(BSP_MISC_IRQ_LOWEST_OFFSET+BSP_MISC_IRQ_NUMBER-1)
   /*
    * Summary
    */
-  BSP_IRQ_NUMBER		= 	BSP_MISC_IRQ_MAX_OFFSET + 1,
-  BSP_LOWEST_OFFSET		=	BSP_ISA_IRQ_LOWEST_OFFSET,
-  BSP_MAX_OFFSET		=	BSP_MISC_IRQ_MAX_OFFSET,
+#define BSP_IRQ_NUMBER		 	(BSP_MISC_IRQ_MAX_OFFSET + 1)
+#define BSP_LOWEST_OFFSET		(BSP_ISA_IRQ_LOWEST_OFFSET)
+#define BSP_MAX_OFFSET			(BSP_MISC_IRQ_MAX_OFFSET)
     /*
      * Some ISA IRQ symbolic name definition
      */	       
-  BSP_ISA_PERIODIC_TIMER      	= 	0,
+#define BSP_ISA_PERIODIC_TIMER      	(0)
 
-  BSP_ISA_KEYBOARD          	= 	1,
+#define BSP_ISA_KEYBOARD          	(1)
 
-  BSP_ISA_UART_COM2_IRQ		=	3,
+#define BSP_ISA_UART_COM2_IRQ		(3)
 
-  BSP_ISA_UART_COM1_IRQ		=	4,
+#define BSP_ISA_UART_COM1_IRQ		(4)
 
-  BSP_ISA_RT_TIMER1	      	= 	8,
+#define BSP_ISA_RT_TIMER1	      	(8)
   
-  BSP_ISA_RT_TIMER3		= 	10,
+#define BSP_ISA_RT_TIMER3		(10)
     /*
      * Some PCI IRQ symbolic name definition
      */
-  BSP_PCI_IRQ0			=	BSP_PCI_IRQ_LOWEST_OFFSET,
-  BSP_PCI_ISA_BRIDGE_IRQ	=	BSP_PCI_IRQ0,
+#define BSP_PCI_IRQ0			(BSP_PCI_IRQ_LOWEST_OFFSET)
+#define BSP_PCI_ISA_BRIDGE_IRQ		(BSP_PCI_IRQ0)
     /*
      * Some Processor execption handled as rtems IRQ symbolic name definition
      */
-  BSP_DECREMENTER		=	BSP_PROCESSOR_IRQ_LOWEST_OFFSET
-  
-}rtems_irq_symbolic_name;
-
-    
+#define BSP_DECREMENTER			(BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
 
-
-/*
- * Type definition for RTEMS managed interrupts
- */
-typedef unsigned char  rtems_irq_prio;
 typedef unsigned short rtems_i8259_masks;
-
 extern  volatile rtems_i8259_masks i8259s_cache;
 
-struct 	__rtems_irq_connect_data__;	/* forward declaratiuon */
-
-typedef void *rtems_irq_hdl_param;
-typedef void (*rtems_irq_hdl)		(rtems_irq_hdl_param);
-typedef void (*rtems_irq_enable)	(const struct __rtems_irq_connect_data__*);
-typedef void (*rtems_irq_disable)	(const struct __rtems_irq_connect_data__*);
-typedef int  (*rtems_irq_is_enabled)	(const struct __rtems_irq_connect_data__*);
-
-typedef struct __rtems_irq_connect_data__ {
-      /*
-       * IRQ line
-       */
-      rtems_irq_symbolic_name 	name;
-      /*
-       * handler. See comment on handler properties below in function prototype.
-       */
-      rtems_irq_hdl	   		hdl;
-     /*
-      * Handler handle to store private data
-      */
-      rtems_irq_hdl_param               handle;
-      /*
-       * function for enabling interrupts at device level (ONLY!).
-       * The BSP code will automatically enable it at i8259s level and openpic level.
-       * RATIONALE : anyway such code has to exist in current driver code.
-       * It is usually called immediately AFTER connecting the interrupt handler.
-       * RTEMS may well need such a function when restoring normal interrupt
-       * processing after a debug session.
-       * 
-       */
-      rtems_irq_enable		on;	
-      /*
-       * function for disabling interrupts at device level (ONLY!).
-       * The code will disable it at i8259s level. RATIONALE : anyway
-       * such code has to exist for clean shutdown. It is usually called
-       * BEFORE disconnecting the interrupt. RTEMS may well need such
-       * a function when disabling normal interrupt processing for
-       * a debug session. May well be a NOP function.
-       */
-      rtems_irq_disable		off;
-      /*
-       * function enabling to know what interrupt may currently occur
-       * if someone manipulates the i8259s interrupt mask without care...
-       */
-      rtems_irq_is_enabled	isOn;
-      /*
-       *  Set to -1 for vectors forced to have only 1 handler
-       */
-      void *next_handler;
-
-}rtems_irq_connect_data;
-
-typedef struct {
-  /*
-   * size of all the table fields (*Tbl) described below.
-   */
-  unsigned int	 		irqNb;
-  /*
-   * Default handler used when disconnecting interrupts.
-   */
-  rtems_irq_connect_data	defaultEntry;
-  /*
-   * Table containing initials/current value.
-   */
-  rtems_irq_connect_data*	irqHdlTbl;
-  /*
-   * actual value of BSP_ISA_IRQ_VECTOR_BASE...
-   */
-  rtems_irq_symbolic_name	irqBase;
-  /*
-   * software priorities associated with interrupts.
-   * if irqPrio  [i]  >  intrPrio  [j]  it  means  that  
-   * interrupt handler hdl connected for interrupt name i
-   * will  not be interrupted by the handler connected for interrupt j
-   * The interrupt source  will be physically masked at i8259 level.
-   */
-    rtems_irq_prio*		irqPrioTbl;
-}rtems_irq_global_settings;
-
-
-
-
-/*-------------------------------------------------------------------------+
-| Function Prototypes.
-+--------------------------------------------------------------------------*/
-/*
- * ------------------------ Intel 8259 (or emulation) Mngt Routines -------
- */
-
-/*
- * function to disable a particular irq at 8259 level. After calling
- * this function, even if the device asserts the interrupt line it will
- * not be propagated further to the processor
- */
-int BSP_irq_disable_at_i8259s        (const rtems_irq_symbolic_name irqLine);
-/*
- * function to enable a particular irq at 8259 level. After calling
- * this function, if the device asserts the interrupt line it will
- * be propagated further to the processor
- */
-int BSP_irq_enable_at_i8259s		(const rtems_irq_symbolic_name irqLine);
-/*
- * function to acknoledge a particular irq at 8259 level. After calling
- * this function, if a device asserts an enabled interrupt line it will
- * be propagated further to the processor. Mainly usefull for people
- * writting raw handlers as this is automagically done for rtems managed
- * handlers.
- */
-int BSP_irq_ack_at_i8259s           	(const rtems_irq_symbolic_name irqLine);
-/*
- * function to check if a particular irq is enabled at 8259 level. After calling
- */
-int BSP_irq_enabled_at_i8259s        	(const rtems_irq_symbolic_name irqLine);
-/*
- * ------------------------ RTEMS Single Irq Handler Mngt Routines ----------------
- */
-/*
- * function to connect a particular irq handler. This hanlder will NOT be called
- * directly as the result of the corresponding interrupt. Instead, a RTEMS
- * irq prologue will be called that will :
- *
- *	1) save the C scratch registers,
- *	2) switch to a interrupt stack if the interrupt is not nested,
- *	3) store the current i8259s' interrupt masks
- *	4) modify them to disable the current interrupt at 8259 level (and may
- *	be others depending on software priorities)
- *	5) aknowledge the i8259s',
- *	6) demask the processor,
- *	7) call the application handler
- *
- * As a result the hdl function provided
- *
- *	a) can perfectly be written is C,
- * 	b) may also well directly call the part of the RTEMS API that can be used
- *	from interrupt level,
- *	c) It only responsible for handling the jobs that need to be done at
- *	the device level including (aknowledging/re-enabling the interrupt at device,
- *	level, getting the data,...)
- *
- *	When returning from the function, the following will be performed by
- *	the RTEMS irq epilogue :
- *
- *	1) masks the interrupts again,
- *	2) restore the original i8259s' interrupt masks
- *	3) switch back on the orinal stack if needed,
- *	4) perform rescheduling when necessary,
- *	5) restore the C scratch registers...
- *	6) restore initial execution flow
- * 
- */
-int BSP_install_rtems_irq_handler   	(const rtems_irq_connect_data*);
-int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data*);
-
-#define BSP_SHARED_HANDLER_SUPPORT      1
-
-/*
- * function to get the current RTEMS irq handler for ptr->name. It enables to
- * define hanlder chain...
- */
-int BSP_get_current_rtems_irq_handler	(rtems_irq_connect_data* ptr);
-/*
- * function to get disconnect the RTEMS irq handler for ptr->name.
- * This function checks that the value given is the current one for safety reason.
- * The user can use the previous function to get it.
- */
-int BSP_remove_rtems_irq_handler    	(const rtems_irq_connect_data*);
-
-/*
- * ------------------------ RTEMS Global Irq Handler Mngt Routines ----------------
- */
-/*
- * (Re) Initialize the RTEMS interrupt management.
- *
- * The result of calling this function will be the same as if each individual
- * handler (config->irqHdlTbl[i].hdl)  different from "config->defaultEntry.hdl"
- * has been individualy connected via
- *	BSP_install_rtems_irq_handler(&config->irqHdlTbl[i])
- * And each handler currently equal to config->defaultEntry.hdl
- * has been previously disconnected via
- * 	 BSP_remove_rtems_irq_handler (&config->irqHdlTbl[i])
- *
- * This is to say that all information given will be used and not just
- * only the space.
- *
- * CAUTION : the various table address contained in config will be used
- *	     directly by the interrupt mangement code in order to save
- *	     data size so they must stay valid after the call => they should
- *	     not be modified or declared on a stack.
- */
 
-int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config);
-/*
- * (Re) get info on current RTEMS interrupt management.
- */
-int BSP_rtems_irq_mngt_get(rtems_irq_global_settings**);
-  
-extern void BSP_rtems_irq_mng_init(unsigned cpuId);
-extern void BSP_i8259s_init(void);
 #endif
 
 #endif
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index a3d87699ca..ee1279519a 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * irq/irq.c, irq/irq.h: Modified to use rtems/irq.h.
+
 2005-05-11	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Add .data.* sections.
diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/irq.c b/c/src/lib/libbsp/powerpc/score603e/irq/irq.c
index d743bcc962..a5deb06b7b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/score603e/irq/irq.c
@@ -38,7 +38,7 @@ static rtems_irq_connect_data*		rtems_hdl_tbl;
 /*
  * Check if IRQ is an ISA IRQ
  */
-static inline int is_isa_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_isa_irq(const rtems_irq_number irqLine)
 {
   return (((int) irqLine <= BSP_ISA_IRQ_MAX_OFFSET) &
 	  ((int) irqLine >= BSP_ISA_IRQ_LOWEST_OFFSET)
@@ -48,7 +48,7 @@ static inline int is_isa_irq(const rtems_irq_symbolic_name irqLine)
 /*
  * Check if IRQ is an pci IRQ
  */
-static inline int is_pci_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_pci_irq(const rtems_irq_number irqLine)
 {
   return (((int) irqLine <= BSP_PCI_IRQ_MAX_OFFSET) &
 	  ((int) irqLine >= BSP_PCI_IRQ_LOWEST_OFFSET)
@@ -58,7 +58,7 @@ static inline int is_pci_irq(const rtems_irq_symbolic_name irqLine)
 /*
  * Check if IRQ is a Processor IRQ
  */
-static inline int is_processor_irq(const rtems_irq_symbolic_name irqLine)
+static inline int is_processor_irq(const rtems_irq_number irqLine)
 {
   return (((int) irqLine <= BSP_PROCESSOR_IRQ_MAX_OFFSET) &
 	  ((int) irqLine >= BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/irq.h b/c/src/lib/libbsp/powerpc/score603e/irq/irq.h
index 93dcf9d3c4..e7344c9bb7 100644
--- a/c/src/lib/libbsp/powerpc/score603e/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/score603e/irq/irq.h
@@ -18,8 +18,11 @@
  *  $Id$
  */
 
-#ifndef LIBBSP_POWERPC_MCP750_IRQ_IRQ_H
-#define LIBBSP_POWERPC_MCP750_IRQ_IRQ_H
+#ifndef LIBBSP_POWERPC_IRQ_H
+#define LIBBSP_POWERPC_IRQ_H
+
+#define BSP_SHARED_HANDLER_SUPPORT      1
+#include <rtems/irq.h>
 
 /*
  * 8259 edge/level control definitions at VIA
@@ -66,280 +69,48 @@ extern "C" {
  * Symbolic IRQ names and related definitions
  */
 
-typedef enum {
   /* Base vector for our ISA IRQ handlers. */
-  BSP_ISA_IRQ_VECTOR_BASE	= BSP_ASM_IRQ_VECTOR_BASE,
+#define BSP_ISA_IRQ_VECTOR_BASE		BSP_ASM_IRQ_VECTOR_BASE
   /*
    * ISA IRQ handler related definitions
    */
-  BSP_ISA_IRQ_NUMBER    	= 16,
-  BSP_ISA_IRQ_LOWEST_OFFSET	= 0,
-  BSP_ISA_IRQ_MAX_OFFSET	= BSP_ISA_IRQ_LOWEST_OFFSET + BSP_ISA_IRQ_NUMBER - 1,
+#define BSP_ISA_IRQ_NUMBER		(16)
+#define BSP_ISA_IRQ_LOWEST_OFFSET	(0)
+#define BSP_ISA_IRQ_MAX_OFFSET		(BSP_ISA_IRQ_LOWEST_OFFSET+BSP_ISA_IRQ_NUMBER-1)
   /*
    * PCI IRQ handlers related definitions
    * CAUTION : BSP_PCI_IRQ_LOWEST_OFFSET should be equal to OPENPIC_VEC_SOURCE
    */
-  BSP_PCI_IRQ_NUMBER		= 16,
-  BSP_PCI_IRQ_LOWEST_OFFSET	= BSP_ISA_IRQ_NUMBER,
-  BSP_PCI_IRQ_MAX_OFFSET	= BSP_PCI_IRQ_LOWEST_OFFSET + BSP_PCI_IRQ_NUMBER - 1,
+#define BSP_PCI_IRQ_NUMBER		(16)
+#define BSP_PCI_IRQ_LOWEST_OFFSET	(BSP_ISA_IRQ_NUMBER)
+#define BSP_PCI_IRQ_MAX_OFFSET		(BSP_PCI_IRQ_LOWEST_OFFSET+BSP_PCI_IRQ_NUMBER-1)
   /*
    * PowerPC exceptions handled as interrupt where an RTEMS managed interrupt
    * handler might be connected
    */
-  BSP_PROCESSOR_IRQ_NUMBER	= 1,
-  BSP_PROCESSOR_IRQ_LOWEST_OFFSET = BSP_PCI_IRQ_MAX_OFFSET + 1,
-  BSP_PROCESSOR_IRQ_MAX_OFFSET	= BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER - 1,
+#define BSP_PROCESSOR_IRQ_NUMBER	(1)
+#define BSP_PROCESSOR_IRQ_LOWEST_OFFSET (BSP_PCI_IRQ_MAX_OFFSET + 1)
+#define BSP_PROCESSOR_IRQ_MAX_OFFSET	(BSP_PROCESSOR_IRQ_LOWEST_OFFSET+BSP_PROCESSOR_IRQ_NUMBER-1)
   /* Misc vectors for OPENPIC irqs (IPI, timers)
    */
-  BSP_MISC_IRQ_NUMBER		= 8,
-  BSP_MISC_IRQ_LOWEST_OFFSET	= BSP_PROCESSOR_IRQ_MAX_OFFSET + 1,
-  BSP_MISC_IRQ_MAX_OFFSET	= BSP_MISC_IRQ_LOWEST_OFFSET + BSP_MISC_IRQ_NUMBER - 1,
+#define BSP_MISC_IRQ_NUMBER		(8)
+#define BSP_MISC_IRQ_LOWEST_OFFSET	(BSP_PROCESSOR_IRQ_MAX_OFFSET + 1)
+#define BSP_MISC_IRQ_MAX_OFFSET		(BSP_MISC_IRQ_LOWEST_OFFSET+BSP_MISC_IRQ_NUMBER-1)
   /*
    * Summary
    */
-  BSP_IRQ_NUMBER		= BSP_MISC_IRQ_MAX_OFFSET + 1,
-  BSP_LOWEST_OFFSET		= BSP_ISA_IRQ_LOWEST_OFFSET,
-  BSP_MAX_OFFSET		= BSP_MISC_IRQ_MAX_OFFSET,
-    /*
-     * Some ISA IRQ symbolic name definition
-     */
-  BSP_ISA_PERIODIC_TIMER      	= 0,
-  BSP_ISA_KEYBOARD          	= 1,
-  BSP_ISA_UART_COM2_IRQ		= 3,
-  BSP_ISA_UART_COM1_IRQ		= 4,
-  BSP_ISA_RT_TIMER1	      	= 8,
-  BSP_ISA_RT_TIMER3		= 10,
+#define BSP_IRQ_NUMBER			(BSP_MISC_IRQ_MAX_OFFSET + 1)
+#define BSP_LOWEST_OFFSET		(BSP_ISA_IRQ_LOWEST_OFFSET)
+#define BSP_MAX_OFFSET		        (BSP_MISC_IRQ_MAX_OFFSET)
     /*
      * Some PCI IRQ symbolic name definition
      */
-  BSP_PCI_IRQ0			= BSP_PCI_IRQ_LOWEST_OFFSET,
-  BSP_PCI_ISA_BRIDGE_IRQ	= BSP_PCI_IRQ0,
-
-#if defined(mvme2100)
-  BSP_DEC21143_IRQ                = BSP_PCI_IRQ_LOWEST_OFFSET + 1,
-  BSP_PMC_PCMIP_TYPE1_SLOT0_IRQ   = BSP_PCI_IRQ_LOWEST_OFFSET + 2,
-  BSP_PCMIP_TYPE1_SLOT1_IRQ       = BSP_PCI_IRQ_LOWEST_OFFSET + 3,
-  BSP_PCMIP_TYPE2_SLOT0_IRQ       = BSP_PCI_IRQ_LOWEST_OFFSET + 4,
-  BSP_PCMIP_TYPE2_SLOT1_IRQ       = BSP_PCI_IRQ_LOWEST_OFFSET + 5,
-  BSP_PCI_INTA_UNIVERSE_LINT0_IRQ = BSP_PCI_IRQ_LOWEST_OFFSET + 7,
-  BSP_PCI_INTB_UNIVERSE_LINT1_IRQ = BSP_PCI_IRQ_LOWEST_OFFSET + 8,
-  BSP_PCI_INTC_UNIVERSE_LINT2_IRQ = BSP_PCI_IRQ_LOWEST_OFFSET + 9,
-  BSP_PCI_INTD_UNIVERSE_LINT3_IRQ = BSP_PCI_IRQ_LOWEST_OFFSET + 10,
-  BSP_UART_COM1_IRQ               = BSP_PCI_IRQ_LOWEST_OFFSET + 13,
-  BSP_FRONT_PANEL_ABORT_IRQ       = BSP_PCI_IRQ_LOWEST_OFFSET + 14,
-  BSP_RTC_IRQ                     = BSP_PCI_IRQ_LOWEST_OFFSET + 15,
-#endif
+#define BSP_PCI_IRQ0			(BSP_PCI_IRQ_LOWEST_OFFSET)
 
     /*
      * Some Processor execption handled as RTEMS IRQ symbolic name definition
      */
-  BSP_DECREMENTER		= BSP_PROCESSOR_IRQ_LOWEST_OFFSET
-
-} rtems_irq_symbolic_name;
-
-/*
- * Type definition for RTEMS managed interrupts
- */
-typedef unsigned char  rtems_irq_prio;
-typedef unsigned short rtems_i8259_masks;
-
-extern  volatile rtems_i8259_masks i8259s_cache;
-
-struct 	__rtems_irq_connect_data__;	/* forward declaratiuon */
-
-typedef void *rtems_irq_hdl_param;
-typedef void (*rtems_irq_hdl)		(rtems_irq_hdl_param);
-typedef void (*rtems_irq_enable)	(const struct __rtems_irq_connect_data__*);
-typedef void (*rtems_irq_disable)	(const struct __rtems_irq_connect_data__*);
-typedef int  (*rtems_irq_is_enabled)	(const struct __rtems_irq_connect_data__*);
-
-typedef struct __rtems_irq_connect_data__ {
-      /*
-       * IRQ line
-       */
-      rtems_irq_symbolic_name 	name;
-      /*
-       * handler. See comment on handler properties below in function prototype.
-       */
-      rtems_irq_hdl	   		hdl;
-     /*
-      * Handler handle to store private data
-      */
-      rtems_irq_hdl_param		handle;
-      /*
-       * function for enabling interrupts at device level (ONLY!).
-       * The BSP code will automatically enable it at i8259s level and openpic level.
-       * RATIONALE : anyway such code has to exist in current driver code.
-       * It is usually called immediately AFTER connecting the interrupt handler.
-       * RTEMS may well need such a function when restoring normal interrupt
-       * processing after a debug session.
-       *
-       */
-      rtems_irq_enable		on;
-      /*
-       * function for disabling interrupts at device level (ONLY!).
-       * The code will disable it at i8259s level. RATIONALE : anyway
-       * such code has to exist for clean shutdown. It is usually called
-       * BEFORE disconnecting the interrupt. RTEMS may well need such
-       * a function when disabling normal interrupt processing for
-       * a debug session. May well be a NOP function.
-       */
-      rtems_irq_disable		off;
-      /*
-       * function enabling to know what interrupt may currently occur
-       * if someone manipulates the i8259s interrupt mask without care...
-       */
-      rtems_irq_is_enabled	isOn;
-      /*
-       *  Set to -1 for vectors forced to have only 1 handler
-       */
-      void *next_handler;
-
-}rtems_irq_connect_data;
-
-typedef struct {
-  /*
-   * size of all the table fields (*Tbl) described below.
-   */
-  unsigned int	 		irqNb;
-  /*
-   * Default handler used when disconnecting interrupts.
-   */
-  rtems_irq_connect_data	defaultEntry;
-  /*
-   * Table containing initials/current value.
-   */
-  rtems_irq_connect_data*	irqHdlTbl;
-  /*
-   * actual value of BSP_ISA_IRQ_VECTOR_BASE...
-   */
-  rtems_irq_symbolic_name	irqBase;
-  /*
-   * software priorities associated with interrupts.
-   * if (*irqPrio  [i]  >  intrPrio  [j]  it  means  that
-   * interrupt handler hdl connected for interrupt name i
-   * will  not be interrupted by the handler connected for interrupt j
-   * The interrupt source  will be physically masked at i8259 level.
-   */
-    rtems_irq_prio*		irqPrioTbl;
-}rtems_irq_global_settings;
-
-/*-------------------------------------------------------------------------+
-| Function Prototypes.
-+--------------------------------------------------------------------------*/
-/*
- * ------------------------ Intel 8259 (or emulation) Mngt Routines -------
- */
-
-/*
- * function to disable a particular irq at 8259 level. After calling
- * this function, even if the device asserts the interrupt line it will
- * not be propagated further to the processor
- */
-int BSP_irq_disable_at_i8259s        (const rtems_irq_symbolic_name irqLine);
-/*
- * function to enable a particular irq at 8259 level. After calling
- * this function, if the device asserts the interrupt line it will
- * be propagated further to the processor
- */
-int BSP_irq_enable_at_i8259s		(const rtems_irq_symbolic_name irqLine);
-/*
- * function to acknowledge a particular irq at 8259 level. After calling
- * this function, if a device asserts an enabled interrupt line it will
- * be propagated further to the processor. Mainly usefull for people
- * writing raw handlers as this is automagically done for RTEMS managed
- * handlers.
- */
-int BSP_irq_ack_at_i8259s           	(const rtems_irq_symbolic_name irqLine);
-/*
- * function to check if a particular irq is enabled at 8259 level. After calling
- */
-int BSP_irq_enabled_at_i8259s        	(const rtems_irq_symbolic_name irqLine);
-/*
- * ------------------------ RTEMS Single Irq Handler Mngt Routines ----------------
- */
-/*
- * function to connect a particular irq handler. This hanlder will NOT be called
- * directly as the result of the corresponding interrupt. Instead, a RTEMS
- * irq prologue will be called that will :
- *
- *	1) save the C scratch registers,
- *	2) switch to a interrupt stack if the interrupt is not nested,
- *	3) store the current i8259s' interrupt masks
- *	4) modify them to disable the current interrupt at 8259 level (and may
- *	be others depending on software priorities)
- *	5) acknowledge the i8259s',
- *	6) demask the processor,
- *	7) call the application handler
- *
- * As a result the hdl function provided
- *
- *	a) can perfectly be written is C,
- * 	b) may also well directly call the part of the RTEMS API that can be
- *      used from interrupt level,
- *	c) It only responsible for handling the jobs that need to be done at
- *	the device level including (aknowledging/re-enabling the interrupt
- *      at device, level, getting the data,...)
- *
- *	When returning from the function, the following will be performed by
- *	the RTEMS irq epilogue:
- *
- *	1) masks the interrupts again,
- *	2) restore the original i8259s' interrupt masks
- *	3) switch back on the orinal stack if needed,
- *	4) perform rescheduling when necessary,
- *	5) restore the C scratch registers...
- *	6) restore initial execution flow
- */
-int BSP_install_rtems_irq_handler   	(const rtems_irq_connect_data*);
-int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data*);
-
-#define BSP_SHARED_HANDLER_SUPPORT      1
-
-/*
- * function to get the current RTEMS irq handler for ptr->name. It enables to
- * define hanlder chain...
- */
-int BSP_get_current_rtems_irq_handler	(rtems_irq_connect_data* ptr);
-/*
- * function to get disconnect the RTEMS irq handler for ptr->name.
- * This function checks that the value given is the current one for safety
- * reasons.
- * The user can use the previous function to get it.
- */
-int BSP_remove_rtems_irq_handler    	(const rtems_irq_connect_data*);
-
-/*
- * ------------------------ RTEMS Global Irq Handler Mngt Routines ----------------
- */
-/*
- * (Re) Initialize the RTEMS interrupt management.
- *
- * The result of calling this function will be the same as if each individual
- * handler (config->irqHdlTbl[i].hdl)  different from "config->defaultEntry.hdl"
- * has been individualy connected via
- *	BSP_install_rtems_irq_handler(&config->irqHdlTbl[i])
- * And each handler currently equal to config->defaultEntry.hdl
- * has been previously disconnected via
- * 	 BSP_remove_rtems_irq_handler (&config->irqHdlTbl[i])
- *
- * This is to say that all information given will be used and not just
- * only the space.
- *
- * CAUTION : the various table address contained in config will be used
- *	     directly by the interrupt mangement code in order to save
- *	     data size so they must stay valid after the call => they should
- *	     not be modified or declared on a stack.
- */
-
-int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config);
-/*
- * (Re) get info on current RTEMS interrupt management.
- */
-int BSP_rtems_irq_mngt_get(rtems_irq_global_settings**);
-
-extern void BSP_rtems_irq_mng_init(unsigned cpuId);
-extern void BSP_i8259s_init(void);
+#define BSP_DECREMENTER			(BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
 
 #ifdef __cplusplus
 }