diff options
| author | scottl <scottl@FreeBSD.org> | 2002-12-01 07:52:35 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2002-12-01 07:52:35 +0000 |
| commit | 0428f86e148ea23110a9ef8b1f51e2bf2c85214f (patch) | |
| tree | a158d2cfc993fb380e20b5af182d028fbb67fdff /sys/dev/aic7xxx | |
| parent | 47a5fb032f7b94b3f08244d614c49ea4c6db89ad (diff) | |
| download | FreeBSD-src-0428f86e148ea23110a9ef8b1f51e2bf2c85214f.zip FreeBSD-src-0428f86e148ea23110a9ef8b1f51e2bf2c85214f.tar.gz | |
Remove redundant check for chip type being PCI-X.
PCI-X only workarounds are automatically masked out
if we are operating in PCI mode.
Make use of ahd_pci_test_register_access()
Approved by: re (blanket)
Diffstat (limited to 'sys/dev/aic7xxx')
| -rw-r--r-- | sys/dev/aic7xxx/ahd_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c index 67b5459..6268d5b 100644 --- a/sys/dev/aic7xxx/ahd_pci.c +++ b/sys/dev/aic7xxx/ahd_pci.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#7 $ + * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#9 $ * * $FreeBSD$ */ @@ -157,8 +157,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd) regs_type = 0; regs_id = 0; if ((command & PCIM_CMD_MEMEN) != 0 - && ((ahd->chip & AHD_BUS_MASK) != AHD_PCIX - || (ahd->bugs & AHD_PCIX_MMAPIO_BUG) == 0)) { + && (ahd->bugs & AHD_PCIX_MMAPIO_BUG) == 0) { regs_type = SYS_RES_MEMORY; regs_id = AHD_PCI_MEMADDR; @@ -178,7 +177,8 @@ ahd_pci_map_registers(struct ahd_softc *ahd) * Do a quick test to see if memory mapped * I/O is functioning correctly. */ - if (error != 0 || ahd_inb(ahd, HCNTRL) == 0xFF) { + if (error != 0 + || ahd_pci_test_register_access(ahd) != 0) { device_printf(ahd->dev_softc, "PCI Device %d:%d:%d failed memory " "mapped test. Using PIO.\n", |
