diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-12 18:25:29 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-12 18:25:29 +0000 |
| commit | 54cb48f28bffcc0cbcbd68bd7128f8df6e75445d (patch) | |
| tree | b27124f865ce149ba9bfbf17aff8ab86fe2655dc /c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c | |
| parent | 2005-05-12 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-54cb48f28bffcc0cbcbd68bd7128f8df6e75445d.tar.bz2 | |
2005-05-12 Jennifer Averett <jennifer.averett@oarcorp.com>
* README.VME, include/bsp.h, irq/irq.h, network/GT64260eth.c,
pci/detect_host_bridge.c, pci/gtpcireg.h, pci/pci.c, pci/pci.h,
pci/pci_interface.c, pci/pcifinddevice.c:
Submitted by Kate Feng <feng1@bnl.gov> as RTEMS-MVME5500 BSP v1.1 release.
Modifications made to merge this release with the current tree.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c index c36191e33e..4615464491 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c @@ -28,18 +28,18 @@ unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet) { unsigned int pcidata, pcidata1; - int PciNumber; + int PciLocal, busNumber=0; /* On the mvme5500 board, the GT64260B system controller had the MCP * signal pulled up high. Thus, the MCP signal is not used as it is * on other boards such as mvme2307. */ if (enableMCP) return(-1); - for (PciNumber=0; PciNumber<1; PciNumber++) { - PCIx_read_config_dword(PciNumber, 0, + for (PciLocal=0; PciLocal<1; PciLocal++ ) { + pci_read_config_dword(busNumber, 0, 0, - PCI0_COMMAND+(PciNumber * 0x80), + PCI_COMMAND, &pcidata); if (!quiet) @@ -52,21 +52,22 @@ unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet) pcidata1= pcidata; pcidata1 |= PCI_STATUS_CLRERR_MASK; pcidata1 |= 0x140; - PCIx_write_config_dword(PciNumber, 0, + pci_write_config_dword(busNumber, 0, 0, - PCI0_COMMAND+(PciNumber * 0x80), + PCI_COMMAND, pcidata1); - PCIx_read_config_dword(PciNumber, 0, + pci_read_config_dword(busNumber, 0, 0, - PCI0_COMMAND+(PciNumber * 0x80), + PCI_COMMAND, &pcidata1); if (!quiet) printk("After _BSP_clear_hostbridge_errors(): sts 0x%x\n", pcidata1); if (pcidata1 & HOSTBRIDGET_ERROR) printk("BSP_clear_hostbridge_errors(): unable to clear pending hostbridge errors\n"); + busNumber += BSP_MAX_PCI_BUS_ON_PCI0; } return(pcidata & HOSTBRIDGET_ERROR); } |