Mercurial > nand-ecoscentric
changeset 1254:29e672adfc06
* src/pci.c (cyg_pci_get_device_info): Removed check for inactive
BARs since the requirement for the BARs to be contiguous has been
relaxed in more recent versions of the PCI standard.
| author | nickg |
|---|---|
| date | Mon, 29 Sep 2003 17:12:48 +0000 |
| parents | 9ecd8873f657 |
| children | ab4f9f4b92ce |
| files | packages/io/pci/current/ChangeLog packages/io/pci/current/src/pci.c |
| diffstat | 2 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/io/pci/current/ChangeLog +++ b/packages/io/pci/current/ChangeLog @@ -1,3 +1,9 @@ +2003-09-29 Nick Garnett <nickg@balti.calivar.com> + + * src/pci.c (cyg_pci_get_device_info): Removed check for inactive + BARs since the requirement for the BARs to be contiguous has been + relaxed in more recent versions of the PCI standard. + 2003-08-08 Gary Thomas <gary@mind.be> * include/pci.h: Add CYGARC_PCI_DMA_ADDRESS() macro - used to
--- a/packages/io/pci/current/src/pci.c +++ b/packages/io/pci/current/src/pci.c @@ -150,12 +150,6 @@ cyg_pci_get_device_info ( cyg_pci_device dev_info->base_size[i] = size; dev_info->base_map[i] = 0xffffffff; - // No reason to scan beyond first inactive BAR. - if (size == 0) { - dev_info->num_bars = i; - break; - } - // Check for a 64bit memory region. if (CYG_PCI_CFG_BAR_SPACE_MEM == (size & CYG_PCI_CFG_BAR_SPACE_MASK)) { @@ -178,12 +172,6 @@ cyg_pci_get_device_info ( cyg_pci_device bar = dev_info->base_address[i]; - // No reason to scan beyond first inactive BAR. - if ((i != 0) && (bar == 0)) { - dev_info->num_bars = i; - break; - } - if ((bar & CYG_PCI_CFG_BAR_SPACE_MASK) == CYG_PCI_CFG_BAR_SPACE_IO) { dev_info->base_map[i] = (bar & CYG_PRI_CFG_BAR_IO_MASK) + HAL_PCI_PHYSICAL_IO_BASE; bar &= CYG_PRI_CFG_BAR_IO_MASK;