LEON: replaced old BSP PCI layer with new generic libpci PCI layer

The old code used a limited PCI configuration library, which was
duplicated into LEON2 and LEON3 BSP pci.c together with respective
Host controller PCI interface.

The LEON2 BSP had support for AT697 PCI, and LEON3 for GRPCI PCI
Host controller. With this update new PCI Host drivers are added,
and all support the new generic PCI Library:
 * AT697 PCI (LEON2 only)
 * GRPCI (LEON2-GRLIB and LEON3)
 * GRPCI2 (LEON2-GRLIB and LEON3)
 * Actel PCIF GRLIB Wrapper (LEON3 only)

The LEON2 BSP is defined as big-endian PCI in bsp.h, since the
AT697 supports only big-endian PCI.

4 files changed, 663 insertions, 736 deletions

diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index e9dcfd8e75..ba98665265 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -24,7 +24,6 @@ include_HEADERS += ../../sparc/shared/include/b1553brm.h
 include_HEADERS += ../../sparc/shared/include/b1553brm_pci.h
 include_HEADERS += ../../sparc/shared/include/b1553brm_rasta.h
 include_HEADERS += ../../sparc/shared/include/debug_defs.h
-include_HEADERS += ../../sparc/shared/include/pci.h
 
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
@@ -109,7 +108,13 @@ libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
 
 # PCI
-libbsp_a_SOURCES += pci/pci.c ../../sparc/shared/pci/pcifinddevice.c
+include_HEADERS += ../../sparc/shared/include/grpci2.h
+libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
+libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
+libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_le.c
+libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_be.c
+libbsp_a_SOURCES +=  pci/at697_pci.c
+
 # RASTA Kit
 libbsp_a_SOURCES += rasta/rasta.c
 # Companion Chip Kit
diff --git a/c/src/lib/libbsp/sparc/leon2/pci/at697_pci.c b/c/src/lib/libbsp/sparc/leon2/pci/at697_pci.c
new file mode 100644
index 0000000000..2387cc0bf7
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/leon2/pci/at697_pci.c
@@ -0,0 +1,656 @@
+/*  LEON2 AT697 PCI Host Driver.
+ * 
+ *  COPYRIGHT (c) 2008.
+ *  Cobham Gaisler AB.
+ *
+ *  Configures the AT697 PCI core and initialize,
+ *   - the PCI Library (pci.c)
+ *   - the general part of the PCI Bus driver (pci_bus.c)
+ *  
+ *  System interrupt assigned to PCI interrupt (INTA#..INTD#) is by
+ *  default taken from Plug and Play, but may be overridden by the 
+ *  driver resources INTA#..INTD#.
+ *
+ *  The license and distribution terms for this file may be
+ *  found in found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ */
+
+/* Configurable parameters
+ * =======================
+ *  INT[A..D]#         Select system IRQ (can be tranlated into I/O interrupt)
+ *  INT[A..D]#_PIO     Select PIO used to generate I/O interrupt
+ *
+ * Notes
+ * =====
+ *  IRQ must not be enabled before all PCI boards have been enabled, the
+ *  IRQ is therefore enabled first in init2. The init2() for this driver
+ *  is assumed to be executed earlier that all boards and their devices
+ *  driver's init2() function.
+ *
+ */
+
+#include <rtems/bspIo.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <libcpu/byteorder.h>
+#include <libcpu/access.h>
+#include <pci.h>
+#include <pci/cfg.h>
+
+#include <drvmgr/drvmgr.h>
+#include <drvmgr/pci_bus.h>
+#include <drvmgr/leon2_amba_bus.h>
+
+#include <leon.h>
+
+/* Configuration options */
+
+#define SYSTEM_MAINMEM_START	0x40000000
+#define SYSTEM_MAINMEM_START2	0x60000000
+
+/* Interrupt assignment. Set to other value than 0xff in order to 
+ * override defaults and plug&play information
+ */
+#ifndef AT697_INTA_SYSIRQ
+ #define AT697_INTA_SYSIRQ 0xff
+#endif
+#ifndef AT697_INTB_SYSIRQ
+ #define AT697_INTB_SYSIRQ 0xff
+#endif
+#ifndef AT697_INTC_SYSIRQ
+ #define AT697_INTC_SYSIRQ 0xff
+#endif
+#ifndef AT697_INTD_SYSIRQ
+ #define AT697_INTD_SYSIRQ 0xff
+#endif
+
+#ifndef AT697_INTA_PIO
+ #define AT697_INTA_PIO 0xff
+#endif
+#ifndef AT697_INTB_PIO
+ #define AT697_INTB_PIO 0xff
+#endif
+#ifndef AT697_INTC_PIO
+ #define AT697_INTC_PIO 0xff
+#endif
+#ifndef AT697_INTD_PIO
+ #define AT697_INTD_PIO 0xff
+#endif
+
+
+/* AT697 PCI */
+#define AT697_PCI_REG_ADR 0x80000100
+
+/* PCI Window used */
+#define PCI_MEM_START 0xa0000000
+#define PCI_MEM_END   0xf0000000
+#define PCI_MEM_SIZE  (PCI_MEM_END - PCI_MEM_START)
+
+/* #define DEBUG 1 */
+
+#ifdef DEBUG
+#define DBG(x...) printf(x)
+#else
+#define DBG(x...) 
+#endif
+
+#define PCI_INVALID_VENDORDEVICEID	0xffffffff
+#define PCI_MULTI_FUNCTION		0x80
+
+struct at697pci_regs {
+    volatile unsigned int pciid1;        /* 0x80000100 - PCI Device identification register 1         */
+    volatile unsigned int pcisc;         /* 0x80000104 - PCI Status & Command                         */
+    volatile unsigned int pciid2;        /* 0x80000108 - PCI Device identification register 2         */
+    volatile unsigned int pcibhlc;       /* 0x8000010c - BIST, Header type, Cache line size register  */
+    volatile unsigned int mbar1;         /* 0x80000110 - Memory Base Address Register 1               */
+    volatile unsigned int mbar2;         /* 0x80000114 - Memory Base Address Register 2               */
+    volatile unsigned int iobar3;        /* 0x80000118 - IO Base Address Register 3                   */
+    volatile unsigned int dummy1[4];     /* 0x8000011c - 0x80000128                                   */ 
+    volatile unsigned int pcisid;        /* 0x8000012c - Subsystem identification register            */
+    volatile unsigned int dummy2;        /* 0x80000130                                                */
+    volatile unsigned int pcicp;         /* 0x80000134 - PCI capabilities pointer register            */
+    volatile unsigned int dummy3;        /* 0x80000138                                                */
+    volatile unsigned int pcili;         /* 0x8000013c - PCI latency interrupt register               */
+    volatile unsigned int pcirt;         /* 0x80000140 - PCI retry, trdy config                       */
+    volatile unsigned int pcicw;         /* 0x80000144 - PCI configuration write register             */
+    volatile unsigned int pcisa;         /* 0x80000148 - PCI Initiator Start Address                  */
+    volatile unsigned int pciiw;         /* 0x8000014c - PCI Initiator Write Register                 */
+    volatile unsigned int pcidma;        /* 0x80000150 - PCI DMA configuration register               */
+    volatile unsigned int pciis;         /* 0x80000154 - PCI Initiator Status Register                */
+    volatile unsigned int pciic;         /* 0x80000158 - PCI Initiator Configuration                  */
+    volatile unsigned int pcitpa;        /* 0x8000015c - PCI Target Page Address Register             */   
+    volatile unsigned int pcitsc;        /* 0x80000160 - PCI Target Status-Command Register           */
+    volatile unsigned int pciite;        /* 0x80000164 - PCI Interrupt Enable Register                */
+    volatile unsigned int pciitp;        /* 0x80000168 - PCI Interrupt Pending Register               */
+    volatile unsigned int pciitf;        /* 0x8000016c - PCI Interrupt Force Register                 */
+    volatile unsigned int pcid;          /* 0x80000170 - PCI Data Register                            */   
+    volatile unsigned int pcibe;         /* 0x80000174 - PCI Burst End Register                       */
+    volatile unsigned int pcidmaa;       /* 0x80000178 - PCI DMA Address Register                     */
+};
+
+/* PCI Interrupt assignment. Connects an PCI interrupt pin (INTA#..INTD#)
+ * to a system interrupt number.
+ */
+unsigned char at697_pci_irq_table[4] =
+{
+	/* INTA# */	AT697_INTA_SYSIRQ,
+	/* INTB# */	AT697_INTB_SYSIRQ,
+	/* INTC# */	AT697_INTC_SYSIRQ,
+	/* INTD# */	AT697_INTD_SYSIRQ
+};
+
+/* PCI Interrupt PIO assignment. Selects which GPIO pin will be used to
+ * generate the system IRQ.
+ *
+ * PCI IRQ -> GPIO -> 4 x I/O select -> System IRQ
+ *              ^- pio_table              ^- irq_select
+ */
+unsigned char at697_pci_irq_pio_table[4] =
+{
+	/* INTA# */	AT697_INTA_PIO,
+	/* INTB# */	AT697_INTB_PIO,
+	/* INTC# */	AT697_INTC_PIO,
+	/* INTD# */	AT697_INTD_PIO
+};
+
+/* Driver private data struture */
+struct at697pci_priv {
+	struct drvmgr_dev	*dev;
+	struct at697pci_regs	*regs;
+	int			minor;
+
+	uint32_t		devVend; /* PCI Device and Vendor ID of Host */
+	uint32_t		bar1_pci_adr;
+	uint32_t		bar2_pci_adr;
+
+	struct drvmgr_map_entry	maps_up[3];
+	struct drvmgr_map_entry	maps_down[2];
+	struct pcibus_config	config;
+};
+
+struct at697pci_priv *at697pcipriv = NULL;
+static int at697pci_minor = 0;
+
+int at697pci_init1(struct drvmgr_dev *dev);
+int at697pci_init2(struct drvmgr_dev *dev);
+
+/* AT697 PCI DRIVER */
+
+struct drvmgr_drv_ops at697pci_ops = 
+{
+	.init = {at697pci_init1, at697pci_init2, NULL, NULL},
+	.remove = NULL,
+	.info = NULL
+};
+
+struct leon2_amba_dev_id at697pci_ids[] = 
+{
+	{LEON2_AMBA_AT697PCI_ID},
+	{0}		/* Mark end of table */
+};
+
+struct leon2_amba_drv_info at697pci_info =
+{
+	{
+		DRVMGR_OBJ_DRV,			/* Driver */
+		NULL,				/* Next driver */
+		NULL,				/* Device list */
+		DRIVER_LEON2_AMBA_AT697PCI,	/* Driver ID */
+		"AT697PCI_DRV",			/* Driver Name */
+		DRVMGR_BUS_TYPE_LEON2_AMBA,	/* Bus Type */
+		&at697pci_ops,
+		NULL,				/* Funcs */
+		0,				/* No devices yet */
+		sizeof(struct at697pci_priv),	/* let drvmgr alloc private */
+	},
+	&at697pci_ids[0]
+};
+
+void at697pci_register_drv(void)
+{
+	DBG("Registering AT697 PCI driver\n");
+	drvmgr_drv_register(&at697pci_info.general);
+}
+
+/*  The configuration access functions uses the DMA functionality of the
+ *  AT697 pci controller to be able access all slots
+ */
+
+int at697pci_cfg_r32(pci_dev_t dev, int offset, uint32_t *val)
+{
+	struct at697pci_regs *regs;
+	volatile unsigned int data = 0;
+	unsigned int address;
+	int bus = PCI_DEV_BUS(dev);
+	int slot = PCI_DEV_SLOT(dev);
+	int func = PCI_DEV_FUNC(dev);
+	int retval;
+
+	if (slot > 21 || (offset & ~0xfc)) {
+		*val = 0xffffffff;
+		return PCISTS_EINVAL;
+	}
+
+	regs = at697pcipriv->regs;
+
+	regs->pciitp = 0xff; /* clear interrupts */ 
+
+	if ( bus == 0 ) {
+		/* PCI Access - TYPE 0 */
+		address = (1<<(11+slot)) | (func << 8) | offset;
+	} else {
+		/* PCI access - TYPE 1 */
+		address = ((bus & 0xff) << 16) | ((slot & 0x1f) << 11) |
+				(func << 8) | offset | 1;
+	}
+	regs->pcisa = address;
+	regs->pcidma = 0xa01;
+	regs->pcidmaa = (unsigned int) &data;
+
+	while (regs->pciitp == 0)
+		;
+
+	regs->pciitp = 0xff; /* clear interrupts */ 
+
+	if (regs->pcisc & 0x20000000)  { /* Master Abort */
+		regs->pcisc |= 0x20000000;
+		*val = 0xffffffff;
+		retval = PCISTS_MSTABRT;
+	} else {
+		*val = data;
+		retval = PCISTS_OK;
+	}
+
+	DBG("pci_read - bus: %d, dev: %d, fn: %d, off: %d => addr: %x, val: %x\n",
+		bus, slot, func, offset,  address, *val); 
+
+	return retval;
+}
+
+int at697pci_cfg_r16(pci_dev_t dev, int ofs, uint16_t *val)
+{
+	uint32_t v;
+	int retval;
+
+	if (ofs & 1)
+		return PCISTS_EINVAL;
+
+	retval = at697pci_cfg_r32(dev, ofs & ~0x3, &v);
+	*val = 0xffff & (v >> (8*(ofs & 0x3)));
+
+	return retval;
+}
+
+int at697pci_cfg_r8(pci_dev_t dev, int ofs, uint8_t *val)
+{
+	uint32_t v;
+	int retval;
+
+	retval = at697pci_cfg_r32(dev, ofs & ~0x3, &v);
+
+	*val = 0xff & (v >> (8*(ofs & 3)));
+
+	return retval;
+}
+
+int at697pci_cfg_w32(pci_dev_t dev, int offset, uint32_t val)
+{
+	struct at697pci_regs *regs;
+	volatile unsigned int tmp_val = val;
+	unsigned int address;
+	int bus = PCI_DEV_BUS(dev);
+	int slot = PCI_DEV_SLOT(dev);
+	int func = PCI_DEV_FUNC(dev);
+	int retval;
+
+	if (slot > 21 || (offset & ~0xfc))
+		return PCISTS_EINVAL;
+
+	regs = at697pcipriv->regs;
+
+	regs->pciitp = 0xff; /* clear interrupts */
+
+	if ( bus == 0 ) {
+		/* PCI Access - TYPE 0 */
+		address = (1<<(11+slot)) | (func << 8) | offset;
+	} else {
+		/* PCI access - TYPE 1 */
+		address = ((bus & 0xff) << 16) | ((slot & 0x1f) << 11) |
+				(func << 8) | offset | 1;
+	}
+	regs->pcisa = address;
+	regs->pcidma = 0xb01;
+	regs->pcidmaa = (unsigned int) &tmp_val;
+
+	while (regs->pciitp == 0)
+		;
+
+	if (regs->pcisc & 0x20000000)  { /* Master Abort */
+		regs->pcisc |= 0x20000000;
+		retval = PCISTS_MSTABRT;
+	} else
+		retval = PCISTS_OK;
+
+	regs->pciitp = 0xff; /* clear interrupts */
+
+	DBG("pci_write - bus: %d, dev: %d, fn: %d, off: %d => addr: %x, val: %x\n",
+		bus, slot, func, offset, address, val);
+
+	return retval;
+}
+
+int at697pci_cfg_w16(pci_dev_t dev, int ofs, uint16_t val)
+{
+	uint32_t v;
+	int retval;
+
+	if (ofs & 1)
+		return PCISTS_EINVAL;
+
+	retval = at697pci_cfg_r32(dev, ofs & ~0x3, &v);
+	if (retval != PCISTS_OK)
+		return retval;
+
+	v = (v & ~(0xffff << (8*(ofs&3)))) | ((0xffff&val) << (8*(ofs&3)));
+
+	return at697pci_cfg_w32(dev, ofs & ~0x3, v);
+}
+
+int at697pci_cfg_w8(pci_dev_t dev, int ofs, uint8_t val)
+{
+	uint32_t v;
+
+	at697pci_cfg_r32(dev, ofs & ~0x3, &v);
+
+	v = (v & ~(0xff << (8*(ofs&3)))) | ((0xff&val) << (8*(ofs&3)));
+
+	return at697pci_cfg_w32(dev, ofs & ~0x3, v);
+}
+
+/* Return the assigned system IRQ number that corresponds to the PCI
+ * "Interrupt Pin" information from configuration space.
+ *
+ * The IRQ information is stored in the at697_pci_irq_table configurable
+ * by the user.
+ *
+ * Returns the "system IRQ" for the PCI INTA#..INTD# pin in irq_pin. Returns
+ * 0xff if not assigned.
+ */
+uint8_t at697pci_bus0_irq_map(pci_dev_t dev, int irq_pin)
+{
+	uint8_t sysIrqNr = 0; /* not assigned */
+	int irq_group;
+
+	if ( (irq_pin >= 1) && (irq_pin <= 4) ) {
+		/* Use default IRQ decoding on PCI BUS0 according slot numbering */
+		irq_group = PCI_DEV_SLOT(dev) & 0x3;
+		irq_pin = ((irq_pin - 1) + irq_group) & 0x3;
+		/* Valid PCI "Interrupt Pin" number */
+		sysIrqNr = at697_pci_irq_table[irq_pin];
+	}
+	return sysIrqNr;
+}
+
+int at697pci_translate(uint32_t *address, int type, int dir)
+{
+	/* No address translation implmented at this point */
+	return 0;
+}
+
+extern struct pci_memreg_ops pci_memreg_sparc_be_ops;
+
+/* AT697 Big-Endian PCI access routines */
+struct pci_access_drv at697pci_access_drv = {
+	.cfg =
+	{
+		at697pci_cfg_r8,
+		at697pci_cfg_r16,
+		at697pci_cfg_r32,
+		at697pci_cfg_w8,
+		at697pci_cfg_w16,
+		at697pci_cfg_w32,
+	},
+	.io =
+	{	/* AT697 only supports non-standard Big-Endian PCI Bus */
+		_ld8,
+		_ld_be16,
+		_ld_be32,
+		_st8,
+		_st_be16,
+		_st_be32,
+
+	},
+	.memreg = &pci_memreg_sparc_be_ops,
+	.translate = at697pci_translate,
+};
+
+/* Initializes the AT697PCI core hardware
+ *
+ */
+int at697pci_hw_init(struct at697pci_priv *priv)
+{
+	struct at697pci_regs *regs = priv->regs;
+	unsigned short vendor = regs->pciid1 >> 16;
+	pci_dev_t host = PCI_DEV(0, 0, 0);
+
+	/* Must match ATMEL or ESA ID */
+	if ( !((vendor == 0x1202) || (vendor == 0x1E0F)) ) {
+		/* No AT697 PCI, quit */
+		return -1;
+	}
+
+	/* Reset PCI Core */
+	regs->pciic = 0xffffffff;
+
+	/* Mask PCI interrupts */
+	regs->pciite = 0;
+
+	/* Map parts of AT697 main memory into PCI (for DMA) */
+	regs->mbar1  = priv->bar1_pci_adr;
+	regs->mbar2  = priv->bar2_pci_adr;
+	regs->pcitpa = (priv->bar1_pci_adr & 0xff000000) |
+	               ((priv->bar2_pci_adr>>16) & 0xff00);
+
+	/* Enable PCI master and target memory command response  */
+	regs->pcisc |= 0x40 | 0x6;
+
+	/* Set latency timer to 64 */
+	regs->pcibhlc = 0x00004000;
+
+	/* Set Inititator configuration so that AHB slave accesses generate memory read/write commands */
+	regs->pciic = 0x41;
+
+	/* Get the AT697PCI Host PCI ID */
+	at697pci_cfg_r32(host, PCI_VENDOR_ID, &priv->devVend);
+
+	return 0;
+}
+
+/* Initializes the AT697PCI core and driver, must be called before calling init_pci() 
+ *
+ * Return values
+ *  0             Successful initalization
+ *  -1            Error during initialization.
+ */
+int at697pci_init(struct at697pci_priv *priv)
+{
+	int pin;
+	union drvmgr_key_value *value;
+	char keyname_sysirq[6];
+	char keyname_pio[10];
+
+	/* PCI core, init private structure */
+	priv->regs = (struct at697pci_regs *) AT697_PCI_REG_ADR;
+
+	/* Init PCI interrupt assignment table to all use the interrupt routed
+	 * through the GPIO core.
+	 *
+	 * INT[A..D]# selects system IRQ (and I/O interrupt)
+	 * INT[A..D]#_PIO selects PIO used to generate I/O interrupt
+	 */
+	strcpy(keyname_sysirq, "INTX#");
+	strcpy(keyname_pio, "INTX#_PIO");
+	for (pin=1; pin<5; pin++) {
+		if ( at697_pci_irq_table[pin-1] == 0xff ) {
+			/* User may override hardcoded IRQ setup */
+			keyname_sysirq[3] = 'A' + (pin-1);
+			value = drvmgr_dev_key_get(priv->dev,
+					keyname_sysirq, KEY_TYPE_INT);
+			if ( value )
+				at697_pci_irq_table[pin-1] = value->i;
+		}
+		if ( at697_pci_irq_pio_table[pin-1] == 0xff ) {
+			/* User may override hardcoded IRQ setup */
+			keyname_pio[3] = 'A' + (pin-1);
+			value = drvmgr_dev_key_get(priv->dev,
+						keyname_pio, KEY_TYPE_INT);
+			if ( value )
+				at697_pci_irq_pio_table[pin-1] = value->i;
+		}
+	}
+
+	/* Use GRPCI target BAR1 and BAR2 to map CPU RAM to PCI, this is to
+	 * make it possible for PCI peripherals to do DMA directly to CPU memory
+	 *
+	 * Defualt is to map system RAM at pci address 0x40000000 and system
+	 * SDRAM to pci address 0x60000000
+	 */
+	value = drvmgr_dev_key_get(priv->dev, "tgtbar1", KEY_TYPE_INT);
+	if (value)
+		priv->bar1_pci_adr = value->i;
+	else
+		priv->bar1_pci_adr = SYSTEM_MAINMEM_START; /* default */
+
+	value = drvmgr_dev_key_get(priv->dev, "tgtbar2", KEY_TYPE_INT);
+	if (value)
+		priv->bar2_pci_adr = value->i;
+	else
+		priv->bar2_pci_adr = SYSTEM_MAINMEM_START2; /* default */
+
+	/* Init the PCI Core */
+	if ( at697pci_hw_init(priv) ) {
+		return -3;
+	}
+
+	/* Down streams translation table */
+	priv->maps_down[0].name = "AMBA -> PCI MEM Window";
+	priv->maps_down[0].size = 0xF0000000 - 0xA0000000;
+	priv->maps_down[0].from_adr = (void *)0xA0000000;
+	priv->maps_down[0].to_adr = (void *)0xA0000000;
+	/* End table */
+	priv->maps_down[1].size = 0;
+
+	/* Up streams translation table, 2x16Mb mapped 1:1  */
+	priv->maps_up[0].name = "Target BAR0 -> AMBA";
+	priv->maps_up[0].size = 0x01000000; /* 16Mb BAR1 */
+	priv->maps_up[0].from_adr = (void *)priv->bar1_pci_adr;
+	priv->maps_up[0].to_adr = (void *)priv->bar1_pci_adr;
+	priv->maps_up[1].name = "Target BAR1 -> AMBA";
+	priv->maps_up[1].size = 0x01000000; /* 16Mb BAR2 */
+	priv->maps_up[1].from_adr = (void *)priv->bar2_pci_adr;
+	priv->maps_up[1].to_adr = (void *)priv->bar2_pci_adr;
+	/* End table */
+	priv->maps_up[2].size = 0;
+
+	return 0;
+}
+
+/* Called when a core is found with the AMBA device and vendor ID 
+ * given in at697pci_ids[].
+ */
+int at697pci_init1(struct drvmgr_dev *dev)
+{
+	struct at697pci_priv *priv;
+	struct pci_auto_setup at697pci_auto_cfg;
+
+	DBG("AT697PCI[%d] on bus %s\n", dev->minor_drv,
+		dev->parent->dev->name);
+
+	if ( at697pci_minor != 0 ) {
+		DBG("Driver only supports one PCI core\n");
+		return DRVMGR_FAIL;
+	}
+
+	at697pcipriv = priv = dev->priv;
+	if ( !priv )
+		return DRVMGR_NOMEM;
+
+	priv->dev = dev;
+	priv->minor = at697pci_minor++;
+
+	if (at697pci_init(priv)) {
+		DBG("Failed to initialize at697pci driver\n");
+		return DRVMGR_FAIL;
+	}
+
+	/* Host is always Big-Endian */
+	pci_endian = PCI_BIG_ENDIAN;
+
+	if (pci_access_drv_register(&at697pci_access_drv)) {
+		/* Access routines registration failed */
+		return DRVMGR_FAIL;
+	}
+
+	/* Prepare memory MAP */
+	at697pci_auto_cfg.options = 0;
+	at697pci_auto_cfg.mem_start = 0;
+	at697pci_auto_cfg.mem_size = 0;
+	at697pci_auto_cfg.memio_start = PCI_MEM_START;
+	at697pci_auto_cfg.memio_size = PCI_MEM_SIZE;
+	at697pci_auto_cfg.io_start = 0;
+	at697pci_auto_cfg.io_size = 0;
+	at697pci_auto_cfg.irq_map = at697pci_bus0_irq_map;
+	at697pci_auto_cfg.irq_route = NULL; /* use standard routing */
+	pci_config_register(&at697pci_auto_cfg);
+
+	if (pci_config_init()) {
+		/* PCI configuration failed */
+		return DRVMGR_FAIL;
+	}
+
+	priv->config.maps_down = &priv->maps_down[0];
+	priv->config.maps_up = &priv->maps_up[0];
+	return pcibus_register(dev, &priv->config);
+}
+
+int at697pci_init2(struct drvmgr_dev *dev)
+{
+#if 0
+	struct at697pci_priv *priv = dev->priv;
+#endif
+	int pin, irq, pio, ioport;
+	LEON_Register_Map *regs = (LEON_Register_Map *)0x80000000;
+
+	/* Enable interrupts now that init1 has been reached for all devices
+	 * on the bus.
+	 */
+
+	for (pin=1; pin<5; pin++) {
+		irq = at697_pci_irq_table[pin-1];
+		pio = at697_pci_irq_pio_table[pin-1];
+		if ( (pio < 16) && (irq >= 4) && (irq <= 7) ) {
+			/* AT697 I/O IRQ, we know how to set up this 
+			 *
+			 * IRQ 4 -> I/O 0
+			 * IRQ 5 -> I/O 1
+			 * IRQ 6 -> I/O 2
+			 * IRQ 7 -> I/O 3
+			 */
+			ioport = irq - 4;
+
+			/* First disable interrupts */
+			regs->PIO_Interrupt &= ~(0xff << (ioport * 8));
+			/* Set PIO as input pin */
+			regs->PIO_Direction &= ~(1 << pio);
+			/* Set Low Level sensitivity */
+			regs->PIO_Interrupt |= ((0x80 | pio) << (ioport * 8));
+		}
+	}
+
+	/* Unmask Interrupt */
+	/*priv->regs->pciite = 0xff;*/
+
+	return DRVMGR_OK;
+}
diff --git a/c/src/lib/libbsp/sparc/leon2/pci/pci.c b/c/src/lib/libbsp/sparc/leon2/pci/pci.c
deleted file mode 100644
index bf1cd32def..0000000000
--- a/c/src/lib/libbsp/sparc/leon2/pci/pci.c
+++ /dev/null
@@ -1,730 +0,0 @@
-/**
- * @file
- * @ingroup sparc_leon2
- * @brief Basic PCI Io functions
- */
-
-/*
- * pci.c :  this file contains basic PCI Io functions.
- *
- *  Copyright (C) 1999 valette@crf.canon.fr
- *
- *  This code is heavily inspired by the public specification of STREAM V2
- *  that can be found at :
- *
- *      <http://www.chorus.com/Documentation/index.html> by following
- *  the STREAM API Specification Document link.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- *
- *  Till Straumann, <strauman@slac.stanford.edu>, 1/2002
- *   - separated bridge detection code out of this file
- *
- *  Adapted to LEON2 AT697 PCI
- *  Copyright (C) 2006 Gaisler Research
- *
- */
-
-#include <pci.h>
-#include <rtems/bspIo.h>
-#include <stdlib.h>
-
-/* Define PCI_INFO to get a listing of configured devices at boot time */
-#define PCI_INFO 1
-
-/* #define DEBUG 1 */
-
-#ifdef DEBUG
-#define DBG(x...) printk(x)
-#else
-#define DBG(x...)
-#endif
-
-/* allow for overriding these definitions */
-#ifndef PCI_CONFIG_ADDR
-#define PCI_CONFIG_ADDR      0xcf8
-#endif
-#ifndef PCI_CONFIG_DATA
-#define PCI_CONFIG_DATA      0xcfc
-#endif
-
-/* define a shortcut */
-#define pci  BSP_pci_configuration
-
-/*
- * Bit encode for PCI_CONFIG_HEADER_TYPE register
- */
-unsigned char ucMaxPCIBus;
-
-typedef struct {
-  /* 0x80000100 - PCI Device identification register 1         */
-    volatile unsigned int pciid1;
-    /* 0x80000104 - PCI Status & Command                         */
-    volatile unsigned int pcisc;
-    /* 0x80000108 - PCI Device identification register 2         */
-    volatile unsigned int pciid2;
-    /* 0x8000010c - BIST, Header type, Cache line size register  */
-    volatile unsigned int pcibhlc;
-    /* 0x80000110 - Memory Base Address Register 1               */
-    volatile unsigned int mbar1;
-    /* 0x80000114 - Memory Base Address Register 2               */
-    volatile unsigned int mbar2;
-    /* 0x80000118 - IO Base Address Register 3                   */
-    volatile unsigned int iobar3;
-    /* 0x8000011c - 0x80000128                                   */
-    volatile unsigned int dummy1[4];
-    /* 0x8000012c - Subsystem identification register            */
-    volatile unsigned int pcisid;
-    /* 0x80000130                                                */
-    volatile unsigned int dummy2;
-    /* 0x80000134 - PCI capabilities pointer register            */
-    volatile unsigned int pcicp;
-    /* 0x80000138                                                */
-    volatile unsigned int dummy3;
-    /* 0x8000013c - PCI latency interrupt register               */
-    volatile unsigned int pcili;
-    /* 0x80000140 - PCI retry, trdy config                       */
-    volatile unsigned int pcirt;
-    /* 0x80000144 - PCI configuration write register             */
-    volatile unsigned int pcicw;
-    /* 0x80000148 - PCI Initiator Start Address                  */
-    volatile unsigned int pcisa;
-    /* 0x8000014c - PCI Initiator Write Register                 */
-    volatile unsigned int pciiw;
-    /* 0x80000150 - PCI DMA configuration register               */
-    volatile unsigned int pcidma;
-    /* 0x80000154 - PCI Initiator Status Register                */
-    volatile unsigned int pciis;
-    /* 0x80000158 - PCI Initiator Configuration                  */
-    volatile unsigned int pciic;
-    /* 0x8000015c - PCI Target Page Address Register             */
-    volatile unsigned int pcitpa;
-    /* 0x80000160 - PCI Target Status-Command Register           */
-    volatile unsigned int pcitsc;
-    /* 0x80000164 - PCI Interrupt Enable Register                */
-    volatile unsigned int pciite;
-    /* 0x80000168 - PCI Interrupt Pending Register               */
-    volatile unsigned int pciitp;
-    /* 0x8000016c - PCI Interrupt Force Register                 */
-    volatile unsigned int pciitf;
-    /* 0x80000170 - PCI Data Register                            */
-    volatile unsigned int pcid;
-    /* 0x80000174 - PCI Burst End Register                       */
-    volatile unsigned int pcibe;
-    /* 0x80000178 - PCI DMA Address Register                     */
-    volatile unsigned int pcidmaa;
-} AT697_PCI_Map;
-
-AT697_PCI_Map *pcic = (AT697_PCI_Map *) 0x80000100;
-
-#define PCI_MEM_START 0xa0000000
-#define PCI_MEM_END   0xf0000000
-#define PCI_MEM_SIZE  (PCI_MEM_START - PCI_MEM_END)
-
-
-struct pci_res {
-    unsigned int size;
-    unsigned char bar;
-    unsigned char devfn;
-};
-
-/*  The configuration access functions uses the DMA functionality of the
- *  AT697 pci controller to be able access all slots
- */
-
-static int
-BSP_pci_read_config_dword(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, uint32_t *val) {
-
-    volatile uint32_t data;
-
-    if (offset & 3) return PCIBIOS_BAD_REGISTER_NUMBER;
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-    pcic->pcisa = (  1<<(11+slot) ) | ((function & 7)<<8) |  (offset&0x3f);
-    pcic->pcidma = 0xa01;
-    pcic->pcidmaa = (unsigned int) &data;
-
-    while (pcic->pciitp == 0)
-        ;
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-    if (pcic->pcisc & 0x20000000)  { /* Master Abort */
-        pcic->pcisc |= 0x20000000;
-        *val = 0xffffffff;
-    }
-    else
-        *val = data;
-
-    DBG("pci_read - bus: %d, dev: %d, fn: %d, off: %d => addr: %x, val: %x\n",
-        bus, slot, function, offset,
-        (1<<(11+slot) ) | ((function & 7)<<8) |  (offset&0x3f), *val);
-
-    return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int
-BSP_pci_read_config_word(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, unsigned short *val) {
-    uint32_t v;
-
-    if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER;
-
-    pci_read_config_dword(bus, slot, function, offset&~3, &v);
-    *val = 0xffff & (v >> (8*(offset & 3)));
-
-    return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int
-BSP_pci_read_config_byte(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, unsigned char *val) {
-    uint32_t v;
-
-    pci_read_config_dword(bus, slot, function, offset&~3, &v);
-
-    *val = 0xff & (v >> (8*(offset & 3)));
-
-    return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int
-BSP_pci_write_config_dword(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, uint32_t val) {
-
-    if (offset & 3) return PCIBIOS_BAD_REGISTER_NUMBER;
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-    pcic->pcisa = (  1<<(11+slot) ) | ((function & 7)<<8) |  (offset&0x3f);
-    pcic->pcidma = 0xb01;
-    pcic->pcidmaa = (unsigned int) &val;
-
-    while (pcic->pciitp == 0)
-        ;
-
-    if (pcic->pcisc & 0x20000000)  { /* Master Abort */
-        pcic->pcisc |= 0x20000000;
-    }
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-/*  DBG("pci write - bus: %d, dev: %d, fn: %d, off: %d => addr: %x, val: %x\n",
-    bus, slot, function, offset,
-    (1<<(11+slot) ) | ((function & 7)<<8) |  (offset&0x3f), val); */
-
-    return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int
-BSP_pci_write_config_word(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, unsigned short val) {
-    uint32_t v;
-
-    if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER;
-
-    pci_read_config_dword(bus, slot, function, offset&~3, &v);
-
-    v = (v & ~(0xffff << (8*(offset&3)))) | ((0xffff&val) << (8*(offset&3)));
-
-    return pci_write_config_dword(bus, slot, function, offset&~3, v);
-}
-
-
-static int
-BSP_pci_write_config_byte(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, unsigned char val) {
-    uint32_t v;
-
-    pci_read_config_dword(bus, slot, function, offset&~3, &v);
-
-    v = (v & ~(0xff << (8*(offset&3)))) | ((0xff&val) << (8*(offset&3)));
-
-    return pci_write_config_dword(bus, slot, function, offset&~3, v);
-}
-
-
-
-const pci_config_access_functions pci_access_functions = {
-    BSP_pci_read_config_byte,
-    BSP_pci_read_config_word,
-    BSP_pci_read_config_dword,
-    BSP_pci_write_config_byte,
-    BSP_pci_write_config_word,
-    BSP_pci_write_config_dword
-};
-
-rtems_pci_config_t BSP_pci_configuration = {
-    (volatile unsigned char*)PCI_CONFIG_ADDR,
-    (volatile unsigned char*)PCI_CONFIG_DATA,
-    &pci_access_functions 
-};
-
-
-static void init_at697_pci(void) {
-
-    /* Reset */
-    pcic->pciic = 0xffffffff;
-
-    /* Map system RAM at pci address 0x40000000
-       and system SDRAM to pci address 0x60000000  */
-    pcic->mbar1  = 0x40000000;
-    pcic->mbar2  = 0x60000000;
-    pcic->pcitpa = 0x40006000;
-
-    /* Enable PCI master and target memory command response  */
-    pcic->pcisc |= 0x40 | 0x6;
-
-    /* Set latency timer to 64 */
-    pcic->pcibhlc = 0x00004000;
-
-    /* Set Inititator configuration so that AHB slave accesses
-       generate memory read/write commands */
-    pcic->pciic = 0x41;
-
-    pcic->pciite = 0xff;
-
-}
-
-/* May not pass a 1k boundary */
-static int dma_from_pci_1k(
-  unsigned int addr, unsigned int paddr, unsigned char len) {
-
-    int retval = 0;
-
-    if (addr & 3) {
-        return -1;
-    }
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-    pcic->pcisa = paddr;
-    pcic->pcidma = 0xc00 | len;
-    pcic->pcidmaa = addr;
-
-    while (pcic->pciitp == 0)
-        ;
-
-    if (pcic->pciitp & 0x7F) {
-        retval = -1;
-    }
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-    if (pcic->pcisc & 0x20000000)  { /* Master Abort */
-        pcic->pcisc |= 0x20000000;
-        retval = -1;
-    }
-
-    return retval;
-}
-
-/* May not pass a 1k boundary */
-static int dma_to_pci_1k(
-  unsigned int addr, unsigned int paddr, unsigned char len) {
-
-    int retval = 0;
-
-    if (addr & 3) return -1;
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-    pcic->pcisa = paddr;
-    pcic->pcidma = 0x700 | len;
-    pcic->pcidmaa = addr;
-
-    while (pcic->pciitp == 0)
-        ;
-
-    if (pcic->pciitp & 0x7F) retval = -1;
-
-    pcic->pciitp = 0xff; /* clear interrupts */
-
-    if (pcic->pcisc & 0x20000000)  { /* Master Abort */
-        pcic->pcisc |= 0x20000000;
-        retval =  -1;
-    }
-
-    return retval;
-}
-
-/* Transfer len number of words from addr to paddr */
-int dma_to_pci(unsigned int addr, unsigned int paddr, unsigned int len) {
-
-    int tmp_len;
-
-    /* Align to 1k boundary */
-    tmp_len = ((addr + 1024)  & 0xfffffc00) - addr;
-
-    tmp_len = (tmp_len/4 < len) ? tmp_len : (len*4);
-
-    if (dma_to_pci_1k(addr, paddr, tmp_len/4) < 0)
-        return -1;
-
-    addr += tmp_len;
-    paddr += tmp_len;
-    len -= tmp_len/4;
-
-    /* Transfer all 1k blocks */
-    while (len >= 128) {
-
-        if (dma_to_pci_1k(addr, paddr, 128) < 0)
-            return -1;
-
-        addr += 512;
-        paddr += 512;
-        len -= 128;
-
-    }
-
-    /* Transfer last words */
-    if (len) return dma_to_pci_1k(addr, paddr, len);
-
-    return 0;
-}
-
-/* Transfer len number of words from paddr to addr */
-int dma_from_pci(unsigned int addr, unsigned int paddr, unsigned int len) {
-
-    int tmp_len;
-
-    /* Align to 1k boundary */
-    tmp_len = ((addr + 1024)  & 0xfffffc00) - addr;
-
-    tmp_len = (tmp_len/4 < len) ? tmp_len : (len*4);
-
-    if (dma_from_pci_1k(addr, paddr, tmp_len/4) < 0)
-        return -1;
-
-    addr += tmp_len;
-    paddr += tmp_len;
-    len -= tmp_len/4;
-
-    /* Transfer all 1k blocks */
-    while (len >= 128) {
-
-        if (dma_from_pci_1k(addr, paddr, 128) < 0)
-            return -1;
-        addr += 512;
-        paddr += 512;
-        len -= 128;
-
-    }
-
-    /* Transfer last words */
-    if (len) return dma_from_pci_1k(addr, paddr, len);
-
-    return 0;
-}
-
-void pci_mem_enable(unsigned char bus, unsigned char slot,
-    unsigned char function) {
-    uint32_t data;
-
-    pci_read_config_dword(0, slot, function, PCI_COMMAND, &data);
-    pci_write_config_dword(0, slot, function, PCI_COMMAND,
-        data | PCI_COMMAND_MEMORY);
-
-}
-
-void pci_master_enable(unsigned char bus, unsigned char slot,
-    unsigned char function) {
-    uint32_t data;
-
-    pci_read_config_dword(0, slot, function, PCI_COMMAND, &data);
-    pci_write_config_dword(0, slot, function, PCI_COMMAND,
-        data | PCI_COMMAND_MASTER);
-
-}
-
-static inline void swap_res(struct pci_res **p1, struct pci_res **p2) {
-
-    struct pci_res *tmp = *p1;
-    *p1 = *p2;
-    *p2 = tmp;
-
-}
-
-/* pci_allocate_resources
- *
- * This function scans the bus and assigns PCI addresses to all devices. It
- * handles both single function and multi function devices. All allocated
- * devices are enabled and latency timers are set to 40.
- *
- * NOTE that it only allocates PCI memory space devices. IO spaces are
- * not enabled. Also, it does not handle pci-pci bridges. They are left
- * disabled.
- *
- */
-static void pci_allocate_resources(void) {
-
-    uint32_t slot, numfuncs, func, id, pos, size, tmp;
-    unsigned int i, swapped, addr, dev, fn;
-    unsigned char header;
-    struct pci_res **res;
-
-    res = (struct pci_res **) malloc(sizeof(struct pci_res *)*32*8*6);
-
-    for (i = 0; i < 32*8*6; i++) {
-        res[i] = (struct pci_res *) malloc(sizeof(struct pci_res));
-        res[i]->size = 0;
-        res[i]->devfn = i;
-    }
-
-    for(slot = 0; slot< PCI_MAX_DEVICES; slot++) {
-
-        pci_read_config_dword(0, slot, 0, PCI_VENDOR_ID, &id);
-
-        if(id == PCI_INVALID_VENDORDEVICEID || id == 0) {
-            /*
-             * This slot is empty
-             */
-            continue;
-        }
-
-        pci_read_config_byte(0, slot, 0, PCI_HEADER_TYPE, &header);
-
-        if(header & PCI_HEADER_TYPE_MULTI_FUNCTION)  {
-            numfuncs = PCI_MAX_FUNCTIONS;
-        }
-        else {
-            numfuncs = 1;
-        }
-
-        for(func = 0; func < numfuncs; func++) {
-
-            pci_read_config_dword(0, slot, func, PCI_VENDOR_ID, &id);
-            if(id == PCI_INVALID_VENDORDEVICEID || id == 0) {
-                continue;
-            }
-
-            pci_read_config_dword(0, slot, func, PCI_CLASS_REVISION, &tmp);
-            tmp >>= 16;
-            if (tmp == PCI_CLASS_BRIDGE_PCI) {
-                continue;
-            }
-
-            for (pos = 0; pos < 6; pos++) {
-                pci_write_config_dword(0, slot, func,
-                    PCI_BASE_ADDRESS_0 + (pos<<2), 0xffffffff);
-                pci_read_config_dword(0, slot, func,
-                    PCI_BASE_ADDRESS_0 + (pos<<2), &size);
-
-                if (size == 0 || size == 0xffffffff || (size & 0xff) != 0) {
-                    pci_write_config_dword(0, slot, func,
-                        PCI_BASE_ADDRESS_0 + (pos<<2), 0);
-                    continue;
-                }
-
-                else {
-                    res[slot*8*6+func*6+pos]->size  = ~size+1;
-                    res[slot*8*6+func*6+pos]->devfn = slot*8 + func;
-                    res[slot*8*6+func*6+pos]->bar   = pos;
-
-                    DBG("Slot: %d, function: %d, bar%d size: %x\n",
-                        slot, func, pos, ~size+1);
-                }
-            }
-        }
-    }
-
-
-    /* Sort the resources in descending order */
-
-    swapped = 1;
-    while (swapped == 1) {
-        swapped = 0;
-        for (i = 0; i < 32*8*6-1; i++) {
-            if (res[i]->size < res[i+1]->size) {
-                swap_res(&res[i], &res[i+1]);
-                swapped = 1;
-            }
-        }
-        i++;
-    }
-
-    /* Assign the BARs */
-
-    addr = PCI_MEM_START;
-    for (i = 0; i < 32*8*6; i++) {
-
-        if (res[i]->size == 0) {
-            goto done;
-        }
-        if ( (addr + res[i]->size) > PCI_MEM_END) {
-            printk("Out of PCI memory space, all devices not configured.\n");
-            goto done;
-        }
-
-        dev = res[i]->devfn >> 3;
-        fn  = res[i]->devfn & 7;
-
-        DBG("Assigning PCI addr %x to device %d, function %d, bar %d\n",
-            addr, dev, fn, res[i]->bar);
-        pci_write_config_dword(0, dev, fn,
-            PCI_BASE_ADDRESS_0+res[i]->bar*4, addr);
-        addr += res[i]->size;
-
-        /* Set latency timer to 64 */
-        pci_read_config_dword(0, dev, fn, 0xC, &tmp);
-        pci_write_config_dword(0, dev, fn, 0xC, tmp|0x4000);
-
-        pci_mem_enable(0, dev, fn);
-
-    }
-
-
-
-done:
-
-#ifdef PCI_INFO
-    printk("\nPCI devices found and configured:\n");
-    for (slot = 0; slot < PCI_MAX_DEVICES; slot++) {
-
-        pci_read_config_byte(0, slot, 0, PCI_HEADER_TYPE, &header);
-
-        if(header & PCI_HEADER_TYPE_MULTI_FUNCTION)  {
-            numfuncs = PCI_MAX_FUNCTIONS;
-        }
-        else {
-            numfuncs = 1;
-        }
-
-        for (func = 0; func < numfuncs; func++) {
-
-            pci_read_config_dword(0, slot, func, PCI_COMMAND, &tmp);
-
-            if (tmp & PCI_COMMAND_MEMORY) {
-
-                pci_read_config_dword(0, slot, func, PCI_VENDOR_ID,  &id);
-
-                if (id == PCI_INVALID_VENDORDEVICEID || id == 0) continue;
-
-                printk("\nSlot %d function: %d\nVendor id: 0x%x, "
-                    "device id: 0x%x\n", slot, func, id & 0xffff, id>>16);
-
-                for (pos = 0; pos < 6; pos++) {
-                    pci_read_config_dword(0, slot, func,
-                        PCI_BASE_ADDRESS_0 + pos*4, &tmp);
-
-                    if (tmp != 0 && tmp != 0xffffffff && (tmp & 0xff) == 0) {
-
-                        printk("\tBAR %d: %x\n", pos, tmp);
-                    }
-
-                }
-                printk("\n");
-
-            }
-
-        }
-     }
-    printk("\n");
-#endif
-
-    for (i = 0; i < 1536; i++) {
-        free(res[i]);
-    }
-    free(res);
-}
-
-
-
-
-
-
-
-/*
- * This routine determines the maximum bus number in the system
- */
-int init_pci(void)
-{
-    unsigned char ucSlotNumber, ucFnNumber, ucNumFuncs;
-    unsigned char ucHeader;
-    unsigned char ucMaxSubordinate;
-    uint32_t      ulClass, ulDeviceID;
-
-    init_at697_pci();
-    pci_allocate_resources();
-
-/*
- * Scan PCI bus 0 looking for PCI-PCI bridges
- */
-    for(ucSlotNumber=0;ucSlotNumber<PCI_MAX_DEVICES;ucSlotNumber++) {
-        (void)pci_read_config_dword(0,
-                                    ucSlotNumber,
-                                    0,
-                                    PCI_VENDOR_ID,
-                                    &ulDeviceID);
-        if(ulDeviceID==PCI_INVALID_VENDORDEVICEID) {
-/*
- * This slot is empty
- */
-            continue;
-        }
-        (void)pci_read_config_byte(0,
-                                   ucSlotNumber,
-                                   0,
-                                   PCI_HEADER_TYPE,
-                                   &ucHeader);
-        if(ucHeader&PCI_HEADER_TYPE_MULTI_FUNCTION)  {
-            ucNumFuncs=PCI_MAX_FUNCTIONS;
-        }
-        else {
-            ucNumFuncs=1;
-        }
-        for(ucFnNumber=0;ucFnNumber<ucNumFuncs;ucFnNumber++) {
-            (void)pci_read_config_dword(0,
-                                        ucSlotNumber,
-                                        ucFnNumber,
-                                        PCI_VENDOR_ID,
-                                        &ulDeviceID);
-            if(ulDeviceID==PCI_INVALID_VENDORDEVICEID) {
-/*
- * This slot/function is empty
- */
-                continue;
-            }
-
-/*
- * This slot/function has a device fitted.
- */
-            (void)pci_read_config_dword(0,
-                                        ucSlotNumber,
-                                        ucFnNumber,
-                                        PCI_CLASS_REVISION,
-                                        &ulClass);
-            ulClass >>= 16;
-            if (ulClass == PCI_CLASS_BRIDGE_PCI) {
-/*
- * We have found a PCI-PCI bridge
- */
-                (void)pci_read_config_byte(0,
-                                           ucSlotNumber,
-                                           ucFnNumber,
-                                           PCI_SUBORDINATE_BUS,
-                                           &ucMaxSubordinate);
-                if(ucMaxSubordinate>ucMaxPCIBus) {
-                    ucMaxPCIBus=ucMaxSubordinate;
-                }
-            }
-        }
-    }
-    return 0;
-}
-
-/*
- * Return the number of PCI busses in the system
- */
-unsigned char BusCountPCI(void)
-{
-    return(ucMaxPCIBus+1);
-}
diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am
index 10a0bbcd1f..01b2ab9acc 100644
--- a/c/src/lib/libbsp/sparc/leon2/preinstall.am
+++ b/c/src/lib/libbsp/sparc/leon2/preinstall.am
@@ -109,10 +109,6 @@ $(PROJECT_INCLUDE)/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/debug_defs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/debug_defs.h
 
-$(PROJECT_INCLUDE)/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h
-
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h