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

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

3 files changed, 11 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
index 0c5c925b51..56620de190 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-17      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * console/rsPMCQ1.c, irq/irq.c: Modified to use rtems/irq.h.
+
 2005-05-10      Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* console/console.c, console/init68360.c, console/ns16550cfg.c
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c
index 088502e3b2..30327260c7 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c
@@ -309,7 +309,7 @@ unsigned int rsPMCQ1Init()
   int i;
   unsigned char int_vector;
   int fun;
-  int temp;
+  unsigned int temp;
   PPMCQ1BoardData       boardData;
   rtems_irq_connect_data IrqData = {0,
                                     rsPMCQ1Int,
@@ -436,7 +436,7 @@ unsigned int rsPMCQ1Init()
 #ifdef DEBUG_360
     printk("PMCQ1 int_vector %d\n", int_vector);
 #endif
-    IrqData.name  = (rtems_irq_symbolic_name)((unsigned int)BSP_PCI_IRQ0 + int_vector);
+    IrqData.name  = (rtems_irq_number)((unsigned int)BSP_PCI_IRQ0 + int_vector);
     IrqData.handle = boardData;
     if (!BSP_install_rtems_shared_irq_handler (&IrqData)) {
         printk("Error installing interrupt handler!\n");
@@ -477,8 +477,8 @@ unsigned int rsPMCQ1Commission( unsigned long busNo, unsigned long slotNo )
   unsigned int bridgeaddr = 0;
   unsigned long val;
   int i;
-  int venId1;
-  int venId2;
+  unsigned int venId1;
+  unsigned int venId2;
 
   pci_read_config_dword(busNo, slotNo, 0, PCI_VENDOR_ID, &venId1);
   pci_read_config_dword(busNo, slotNo, 0, PCI_VENDOR_ID, &venId2);
diff --git a/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c b/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c
index 5c9a6dab5c..72a3bd58e2 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c
@@ -50,7 +50,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)
@@ -60,7 +60,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)
@@ -70,7 +70,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)