diff options
| author | sos <sos@FreeBSD.org> | 2003-11-01 09:30:15 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2003-11-01 09:30:15 +0000 |
| commit | 4034aaaff9d1329c2e9402cb1bf8c93fcd4f6b17 (patch) | |
| tree | 8a72f998f725dc5ec25a96efa61bcbaa32664e18 /sys/dev/ata | |
| parent | 716130a6f9a9ee9967af6ade439c5ec39ba544d0 (diff) | |
| download | FreeBSD-src-4034aaaff9d1329c2e9402cb1bf8c93fcd4f6b17.zip FreeBSD-src-4034aaaff9d1329c2e9402cb1bf8c93fcd4f6b17.tar.gz | |
Fix cable detection on AMD chips.
Diffstat (limited to 'sys/dev/ata')
| -rw-r--r-- | sys/dev/ata/ata-chipset.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c index a22361f..be4dee0 100644 --- a/sys/dev/ata/ata-chipset.c +++ b/sys/dev/ata/ata-chipset.c @@ -446,7 +446,7 @@ ata_amd_ident(device_t dev) {{ ATA_AMD756, 0x00, AMDNVIDIA, 0x00, ATA_UDMA4, "AMD 756" }, { ATA_AMD766, 0x00, AMDNVIDIA, AMDCABLE|AMDBUG, ATA_UDMA5, "AMD 766" }, { ATA_AMD768, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA5, "AMD 768" }, - { ATA_AMD8111, 0x00, AMDNVIDIA, 0x00, ATA_UDMA6, "AMD 8111" }, + { ATA_AMD8111, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA6, "AMD 8111" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -1013,7 +1013,7 @@ ata_nvidia_ident(device_t dev) static struct ata_chip_id ids[] = {{ ATA_NFORCE1, 0, AMDNVIDIA, NVIDIA|AMDBUG, ATA_UDMA5, "nVidia nForce" }, { ATA_NFORCE2, 0, AMDNVIDIA, NVIDIA|AMDBUG, ATA_UDMA6, "nVidia nForce2" }, - { ATA_NFORCE3, 0, AMDNVIDIA, NVIDIA|AMDBUG, ATA_UDMA6, "nVidia nForce3" }, + { ATA_NFORCE3, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nVidia nForce3" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -2182,9 +2182,10 @@ ata_via_family_setmode(struct ata_device *atadev, int mode) mode = ata_limit_mode(atadev, mode, ctlr->chip->max_dma); if (ctlr->chip->cfg2 & AMDCABLE) { - if (mode > ATA_UDMA2 && !pci_read_config(parent, 0x42, 1) & (1<<devno)){ - ata_prtdev(atadev, - "DMA limited to UDMA33, non-ATA66 cable or device\n"); + if (mode > ATA_UDMA2 && + !(pci_read_config(parent, 0x42, 1) & (1 << devno))) { + ata_prtdev(atadev, + "DMA limited to UDMA33, non-ATA66 cable or device\n"); mode = ATA_UDMA2; } } |
