2009-05-05 Jennifer Averett <jennifer.averett@OARcorp.com>

	* Makefile.am, configure.ac, preinstall.am, PCI_bus/PCI.c,
	PCI_bus/PCI.h, PCI_bus/flash.c, PCI_bus/universe.c, console/85c30.c,
	console/85c30.h, console/console.c, console/consolebsp.h,
	console/tbl85c30.c, include/bsp.h, include/gen2.h,
	include/irq-config.h, include/tm27.h, irq/FPGA.c, irq/irq.h,
	irq/irq_init.c, start/start.S, startup/Hwr_init.c,
	startup/bspstart.c, startup/linkcmds, timer/timer.c, tod/tod.c,
	vme/VMEConfig.h: Updated and tested with latest interrupt source.
	Modified with latest memory allocation, but this needs testing.
	* irq/no_pic.c: New file.

4 files changed, 20 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
index 52af53887b..7fec04a76e 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
@@ -1,7 +1,8 @@
 /*
- *  COPYRIGHT (c) 1989-2008
+ *
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
- *  
+ *
  *  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.
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
index 0c5a762a2a..ffa894a79f 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
@@ -1,17 +1,17 @@
-/*
+/*  PCI.h
+ *
  *  This include file contains prototypes for chips attached to the
  *  PCI bus.
  *
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
+ *  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.
  *
- *  $Id$
+ *  $Id:
  */
-
 #ifndef __PCI_h
 #define __PCI_h
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
index a264ae1559..2f08d5f265 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
@@ -1,8 +1,8 @@
 /*
  *
- *  COPYRIGHT (c) 1989-2008
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
- *  
+ *
  *  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.
@@ -13,9 +13,12 @@
 #include <rtems.h>
 #include <assert.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 #include <bsp.h>
+#include <bsp/irq.h>
 #include "PCI.h"
+
 /*PAGE
  *
  *  SCORE603e_FLASH_Disable
@@ -34,7 +37,7 @@ unsigned int SCORE603e_FLASH_Disable(
   return RTEMS_SUCCESSFUL;
 }
 
-unsigned int SCORE603e_FLASH_verify_enable()
+unsigned int SCORE603e_FLASH_verify_enable( void )
 {
   volatile uint8_t         *Ctrl_Status_Register =
            (void *)SCORE603E_BOARD_CTRL_REG;
@@ -77,7 +80,7 @@ unsigned int SCORE603e_FLASH_pci_reset_reg(
   Write_pci_device_register( reg, pci_value );
   value = Read_pci_device_register(  reg );
   if (value != pci_value) {
-    printf("Error PCI %x wrote %x read %x\n", reg, pci_value, value);
+    printf("Error PCI 0x%2"PRIX8" wrote 0x%8"PRIX32" read %8"PRIX32"\n", reg, pci_value, value);
   }
   return RTEMS_SUCCESSFUL;
 }
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
index 3e8c6513be..a27bb38f57 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
@@ -1,7 +1,7 @@
 /*
- *  COPYRIGHT (c) 1989-2008
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
- *  
+ *
  *  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.
@@ -229,7 +229,7 @@ void set_vme_base_address (
 /*
  * Gets the VME base address
  */
-uint32_t         get_vme_base_address ()
+uint32_t         get_vme_base_address (void)
 {
   volatile uint32_t         temp;
 
@@ -238,7 +238,7 @@ uint32_t         get_vme_base_address ()
   return (temp);
 }
 
-uint32_t         get_vme_slave_size()
+uint32_t         get_vme_slave_size(void)
 {
   volatile uint32_t         temp;
   temp  =  PCI_bus_read( &UNIVERSE->VSI0_BD);