diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 2001-10-23 08:01:47 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 2001-10-23 08:01:47 +0000 |
| commit | 6a1f123c0cb6de00d0bfa0c1235242ee5c8521fd (patch) | |
| tree | 73045cd714068a4c0773fbf47a6637ad3e724a1d | |
| parent | 516fdf9478262766d1d546f7c681c7a057e3fbbd (diff) | |
Notes
| -rw-r--r-- | sys/dev/ata/ata-dma.c | 10 | ||||
| -rw-r--r-- | sys/dev/ata/ata-pci.c | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c index 12a2e2a8d8a6..86dcad395744 100644 --- a/sys/dev/ata/ata-dma.c +++ b/sys/dev/ata/ata-dma.c @@ -103,12 +103,13 @@ ata_dmainit(struct ata_softc *scp, int device, /* DMA engine address alignment is usually 1 word (2 bytes) */ scp->alignment = 0x1; +#if 1 if (udmamode > 2 && !ATA_PARAM(scp, device)->hwres_cblid) { ata_printf(scp, device, "DMA limited to UDMA33, non-ATA66 compliant cable\n"); udmamode = 2; } - +#endif switch (scp->chiptype) { case 0x244a8086: /* Intel ICH2 mobile */ @@ -725,17 +726,18 @@ via_82c586: case 0x4d68105a: /* Promise TX2 ATA100 controllers */ case 0x6268105a: /* Promise TX2v2 ATA100 controllers */ + case 0x4d69105a: /* Promise ATA133 controllers */ ATA_OUTB(scp->r_bmio, ATA_BMDEVSPEC_0, 0x0b); if (udmamode >= 4 && !(ATA_INB(scp->r_bmio, ATA_BMDEVSPEC_1) & 0x04)) { error = ata_command(scp, device, ATA_C_SETFEATURES, 0, - ATA_UDMA + max(udmamode, 5), ATA_C_F_SETXFER, + ATA_UDMA + udmamode, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) ata_printf(scp, device, "%s setting %s on Promise chip\n", (error) ? "failed" : "success", - ata_mode2str(ATA_UDMA + max(udmamode, 5))); + ata_mode2str(ATA_UDMA + udmamode)); if (!error) { - scp->mode[ATA_DEV(device)] = ATA_UDMA + (max(udmamode, 5)); + scp->mode[ATA_DEV(device)] = ATA_UDMA + udmamode; return; } } diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 83138744c45f..38bb4fc7fb95 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -205,6 +205,9 @@ ata_pci_match(device_t dev) case 0x6268105a: return "Promise TX2 ATA100 controller"; + case 0x4d69105a: + return "Promise ATA133 controller"; + case 0x00041103: switch (pci_get_revid(dev)) { case 0x00: @@ -444,6 +447,7 @@ ata_pci_intr(struct ata_softc *scp) case 0x4d68105a: /* Promise TX2 ATA100 */ case 0x6268105a: /* Promise TX2v2 ATA100 */ + case 0x4d69105a: /* Promise ATA133 */ ATA_OUTB(scp->r_bmio, ATA_BMDEVSPEC_0, 0x0b); if (!(ATA_INB(scp->r_bmio, ATA_BMDEVSPEC_1) & 0x20)) return 1; |