diff options
| author | sos <sos@FreeBSD.org> | 2001-10-03 11:36:25 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2001-10-03 11:36:25 +0000 |
| commit | 174605ab568334f3c04545db6687e3eed90f5674 (patch) | |
| tree | f564c2825ba1e8f04f4cfee6175fd987eac624ab | |
| parent | 11010dfe79b067e7c06ceb047d8063844c8ff282 (diff) | |
| download | FreeBSD-src-174605ab568334f3c04545db6687e3eed90f5674.zip FreeBSD-src-174605ab568334f3c04545db6687e3eed90f5674.tar.gz | |
Doh! committed from the wrong tree, this is the right "stuff"...
| -rw-r--r-- | sys/dev/ata/ata-all.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/ata-dma.c | 2 | ||||
| -rw-r--r-- | sys/dev/ata/ata-pci.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h index f09a19f..69dc52e 100644 --- a/sys/dev/ata/ata-all.h +++ b/sys/dev/ata/ata-all.h @@ -144,7 +144,7 @@ #define ATA_BMSTAT_DMA_SLAVE 0x40 #define ATA_BMSTAT_DMA_SIMPLEX 0x80 -#define ATA_BDDEVSPEC_1 0x03 +#define ATA_BMDEVSPEC_1 0x03 #define ATA_BMDTP_PORT 0x04 diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c index 4062f29..a578ea9 100644 --- a/sys/dev/ata/ata-dma.c +++ b/sys/dev/ata/ata-dma.c @@ -726,7 +726,7 @@ via_82c586: case 0x4d68105a: /* Promise TX2 ATA100 controllers */ case 0x6268105a: /* Promise TX2v2 ATA100 controllers */ ATA_OUTB(scp->r_bmio, ATA_BMDEVSPEC_0, 0x0b); - if (udmamode >= 4 && (ATA_INB(scp->r_bmio, ATA_BDDEVSPEC_1) & 0x20)) { + if (udmamode >= 4 && !(ATA_INB(scp->r_bmio, ATA_BMDEVSPEC_1) & 0x04)) { error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0, ATA_UDMA + max(udmamode, 5), ATA_C_F_SETXFER, ATA_WAIT_READY); diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 98861db..8313874 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -445,7 +445,7 @@ ata_pci_intr(struct ata_softc *scp) case 0x4d68105a: /* Promise TX2 ATA100 */ case 0x6268105a: /* Promise TX2v2 ATA100 */ ATA_OUTB(scp->r_bmio, ATA_BMDEVSPEC_0, 0x0b); - if (!(ATA_INB(scp->r_bmio, ATA_BDDEVSPEC_1) & 0x20)) + if (!(ATA_INB(scp->r_bmio, ATA_BMDEVSPEC_1) & 0x20)) return 1; break; } |
