diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2003-12-12 13:00:39 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2003-12-12 13:00:39 +0000 |
| commit | da72ba2a73f3d5f997ab2b32465bb317a1052c2a (patch) | |
| tree | d0a2d84e082ffe5c44b456d1fbf49a4780706058 | |
| parent | 7048033023755b5b4e3fbcf04e81b674a580b602 (diff) | |
nforce chip doesn't have cable check bit; noticed by hugh@ a long
time ago.
| -rw-r--r-- | sys/dev/pci/pciide.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/pciide_nforce_reg.h | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 01c1e9ca130..90050ee4d75 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.149 2003/11/07 10:16:45 jmc Exp $ */ +/* $OpenBSD: pciide.c,v 1.150 2003/12/12 13:00:37 grange Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -5931,16 +5931,6 @@ nforce_setup_channel(struct channel_softc *chp) /* Setup UltraDMA mode */ drvp->drive_flags &= ~DRIVE_DMA; - /* Check cable */ - if ((conf & NFORCE_CONF_CABLE(channel, drive)) == 0 && - drvp->UDMA_mode > 2) { - WDCDEBUG_PRINT(("%s(%s:%d:%d): 80-wire " - "cable not detected\n", drvp->drive_name, - sc->sc_wdcdev.sc_dev.dv_xname, - channel, drive), DEBUG_PROBE); - drvp->UDMA_mode = 2; - } - udmatim |= NFORCE_UDMATIM_SET(channel, drive, nforce_udma[drvp->UDMA_mode]) | NFORCE_UDMA_EN(channel, drive) | diff --git a/sys/dev/pci/pciide_nforce_reg.h b/sys/dev/pci/pciide_nforce_reg.h index c96ac8e4dd6..d0745d8e45b 100644 --- a/sys/dev/pci/pciide_nforce_reg.h +++ b/sys/dev/pci/pciide_nforce_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_nforce_reg.h,v 1.1 2003/02/13 15:39:59 grange Exp $ */ +/* $OpenBSD: pciide_nforce_reg.h,v 1.2 2003/12/12 13:00:38 grange Exp $ */ /* * Copyright (c) 2003 Alexander Yurchenko <grange@openbsd.org> @@ -29,8 +29,6 @@ #define NFORCE_CONF 0x50 #define NFORCE_CHAN_EN(chan) \ (0x00000001 << (1 - (chan))) -#define NFORCE_CONF_CABLE(chan, drive) \ - (0x00010000 << ((chan) * 2 + (drive))) /* PIO and multiword DMA timing register */ #define NFORCE_PIODMATIM 0x58 |