28c28
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 51548 1999-09-22 12:04:51Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 52067 1999-10-09 19:57:13Z sos $
49a50,54
> /* prototypes */
> static void hpt366_timing(struct ata_softc *, int32_t, int32_t);
>
> /* misc defines */
> #define MIN(a,b) ((a)>(b)?(b):(a))
55,57d59
< /* misc defines */
< #define MIN(a,b) ((a)>(b)?(b):(a))
<
73a76,86
> /* if simplex controller, only allow DMA on primary channel */
> if (scp->unit == 1) {
> outb(scp->bmaddr + ATA_BMSTAT_PORT, inb(scp->bmaddr + ATA_BMSTAT_PORT) &
> (ATA_BMSTAT_DMA_MASTER | ATA_BMSTAT_DMA_SLAVE));
> if (inb(scp->bmaddr + ATA_BMSTAT_PORT) & ATA_BMSTAT_DMA_SIMPLEX) {
> printf("ata%d: simplex device, DMA on primary channel only\n",
> scp->lun);
> return -1;
> }
> }
>
104,105c117,118
< ~mask48) | new48, 4);
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA33;
---
> ~mask48) | new48, 4);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
161c174
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
170,172c183,184
< case 0x4d33105a: /* Promise Ultra/33 / FastTrack controllers */
< case 0x4d38105a: /* Promise Ultra/66 controllers */
< /* the Promise can only do DMA on ATA disks not on ATAPI devices */
---
> case 0x522910b9: /* AcerLabs Aladdin IV/V */
> /* the Aladdin has to be setup specially for ATAPI devices */
174,175c186,187
< (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE))
< break;
---
> (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE)) {
> int8_t word53 = pci_read_config(scp->dev, 0x53, 1);
177,178c189,215
< devno = (scp->unit << 1) + ((device == ATA_MASTER) ? 0 : 1);
< if (udmamode >=4 && type == 0x4d38105a) {
---
> /* set atapi fifo, this should always work */
> pci_write_config(scp->dev, 0x53, (word53 & ~0x01) | 0x02, 1);
>
> /* if both master & slave are atapi devices dont allow DMA */
> if (scp->devices & ATA_ATAPI_MASTER &&
> scp->devices & ATA_ATAPI_SLAVE) {
> printf("ata%d: Aladdin: two atapi devices on this channel, "
> "DMA disabled\n", scp->lun);
> break;
> }
> /* if needed set atapi fifo & dma */
> if ((udmamode >=2) || (wdmamode >= 2 && apiomode >= 4)) {
> pci_write_config(scp->dev, 0x53, word53 | 0x03, 1);
> scp->flags |= ATA_ATAPI_DMA_RO;
> if (device == ATA_MASTER)
> outb(scp->bmaddr + ATA_BMSTAT_PORT,
> inb(scp->bmaddr + ATA_BMSTAT_PORT) |
> ATA_BMSTAT_DMA_MASTER);
> else
> outb(scp->bmaddr + ATA_BMSTAT_PORT,
> inb(scp->bmaddr + ATA_BMSTAT_PORT) |
> ATA_BMSTAT_DMA_SLAVE);
> }
> }
> if (udmamode >=2) {
> int32_t word54 = pci_read_config(scp->dev, 0x54, 4);
>
180c217
< ATA_UDMA4, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
---
> ATA_UDMA2, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
182c219
< printf("ata%d: %s: %s setting up UDMA4 mode on Promise chip\n",
---
> printf("ata%d: %s: %s setting up UDMA2 mode on Aladdin chip\n",
187,188c224,227
< pci_write_config(scp->dev, 0x60 + (devno << 2), 0x004117f3, 4);
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA66;
---
> word54 |= 0x5555;
> word54 |= (0x0a << (16 + (scp->unit << 3) + (device << 2)));
> pci_write_config(scp->dev, 0x54, word54, 4);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
189a229
>
191c231,252
<
---
> else if (wdmamode >= 2 && apiomode >= 4) {
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
> ATA_WDMA2, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
> if (bootverbose)
> printf("ata%d: %s: %s setting up WDMA2 mode on Aladdin chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave",
> (error) ? "failed" : "success");
> if (error)
> break;
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
> return 0;
> }
> break;
>
> case 0x4d33105a: /* Promise Ultra33 / FastTrak33 controllers */
> case 0x4d38105a: /* Promise Ultra66 / FastTrak66 controllers */
> /* the Promise can only do DMA on ATA disks not on ATAPI devices */
> if ((device == ATA_MASTER && scp->devices & ATA_ATAPI_MASTER) ||
> (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE))
> break;
>
> devno = (scp->unit << 1) + ((device == ATA_MASTER) ? 0 : 1);
202c263
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA33;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
215c276
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
226,227c287,288
< case 0x522910b9: /* AcerLabs Aladdin IV/V */
< /* the Aladdin has to be setup specially for ATAPI devices */
---
> case 0x00041103: /* HighPoint HPT366 IDE controller */
> /* punt on ATAPI devices for now */
229,230c290,291
< (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE)) {
< int8_t word53 = pci_read_config(scp->dev, 0x53, 1);
---
> (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE))
> break;
232,247c293,305
< /* if needed set atapi fifo & dma */
< if ((udmamode >=2) || (wdmamode >= 2 && apiomode >= 4)) {
< pci_write_config(scp->dev, 0x53, word53 | 0x03, 1);
< scp->flags |= ATA_ATAPI_DMA_RO;
< if (device == ATA_MASTER)
< outb(scp->bmaddr + ATA_BMSTAT_PORT,
< inb(scp->bmaddr + ATA_BMSTAT_PORT) |
< ATA_BMSTAT_DMA_MASTER);
< else
< outb(scp->bmaddr + ATA_BMSTAT_PORT,
< inb(scp->bmaddr + ATA_BMSTAT_PORT) |
< ATA_BMSTAT_DMA_SLAVE);
< }
< else {
< pci_write_config(scp->dev, 0x53, (word53 & ~0x01) | 0x02, 1);
< }
---
> devno = (device == ATA_MASTER) ? 0 : 1;
> if (udmamode >=4 && !(pci_read_config(scp->dev, 0x5a, 1) & 0x2)) {
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
> ATA_UDMA4, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
> if (bootverbose)
> printf("ata%d: %s: %s setting up UDMA4 mode on HPT366 chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave",
> (error) ? "failed" : "success");
> if (error)
> break;
> hpt366_timing(scp, device, ATA_MODE_UDMA4);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA4;
> return 0;
249,251c307
< if (udmamode >=2) {
< int32_t word54 = pci_read_config(scp->dev, 0x54, 4);
<
---
> else if (udmamode >=3) {
252a309,321
> ATA_UDMA3, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
> if (bootverbose)
> printf("ata%d: %s: %s setting up UDMA3 mode on HPT366 chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave",
> (error) ? "failed" : "success");
> if (error)
> break;
> hpt366_timing(scp, device, ATA_MODE_UDMA3);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA3;
> return 0;
> }
> else if (udmamode >=2) {
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
255c324
< printf("ata%d: %s: %s setting up UDMA2 mode on Aladdin chip\n",
---
> printf("ata%d: %s: %s setting up UDMA2 mode on HPT366 chip\n",
260,263c329,330
< word54 |= 0x5555;
< word54 |= (0x0a << (16 + (scp->unit << 3) + (device << 2)));
< pci_write_config(scp->dev, 0x54, word54, 4);
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA33;
---
> hpt366_timing(scp, device, ATA_MODE_UDMA2);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
265d331
<
271c337
< printf("ata%d: %s: %s setting up WDMA2 mode on Aladdin chip\n",
---
> printf("ata%d: %s: %s setting up WDMA2 mode on HPT366 chip\n",
276c342,343
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> hpt366_timing(scp, device, ATA_MODE_WDMA2);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
278a346,351
> else {
> if (bootverbose)
> printf("ata%d: %s: setting PIO mode on HPT366 chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave");
> hpt366_timing(scp, device, ATA_MODE_PIO);
> }
300c373
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
368c441
< ata_dmastart(struct ata_softc *scp, int32_t device)
---
> ata_dmastart(struct ata_softc *scp)
372a446
> scp->flags |= ATA_DMA_ACTIVE;
378c452
< ata_dmadone(struct ata_softc *scp, int32_t device)
---
> ata_dmadone(struct ata_softc *scp)
384a459
> scp->flags &= ~ATA_DMA_ACTIVE;
389c464
< ata_dmastatus(struct ata_softc *scp, int32_t device)
---
> ata_dmastatus(struct ata_softc *scp)
396a472,511
> static void
> hpt366_timing(struct ata_softc *scp, int32_t device, int32_t mode)
> {
> u_int32_t timing;
>
> switch (pci_read_config(scp->dev, (device == ATA_MASTER) ? 0x41 : 0x45, 1)){
> case 0x85: /* 25Mhz */
> switch (mode) {
> case ATA_MODE_PIO: timing = 0xc0ca8521; break;
> case ATA_MODE_WDMA2: timing = 0xa0ca8521; break;
> case ATA_MODE_UDMA2:
> case ATA_MODE_UDMA3: timing = 0x90cf8521; break;
> case ATA_MODE_UDMA4: timing = 0x90c98521; break;
> default: timing = 0x01208585;
> }
> break;
> default:
> case 0xa7: /* 33MHz */
> switch (mode) {
> case ATA_MODE_PIO: timing = 0xc0c8a731; break;
> case ATA_MODE_WDMA2: timing = 0xa0c8a731; break;
> case ATA_MODE_UDMA2: timing = 0x90caa731; break;
> case ATA_MODE_UDMA3: timing = 0x90cfa731; break;
> case ATA_MODE_UDMA4: timing = 0x90c9a731; break;
> default: timing = 0x0120a7a7;
> }
> break;
> case 0xd9: /* 40Mhz */
> switch (mode) {
> case ATA_MODE_PIO: timing = 0xc008d963; break;
> case ATA_MODE_WDMA2: timing = 0xa008d943; break;
> case ATA_MODE_UDMA2: timing = 0x900bd943; break;
> case ATA_MODE_UDMA3: timing = 0x900ad943; break;
> case ATA_MODE_UDMA4: timing = 0x900fd943; break;
> default: timing = 0x0120d9d9;
> }
> }
> pci_write_config(scp->dev, 0x40 + (device==ATA_MASTER ? 0 : 4), timing, 4);
> }
>
414c529
< ata_dmastart(struct ata_softc *scp, int32_t device)
---
> ata_dmastart(struct ata_softc *scp)
419c534
< ata_dmadone(struct ata_softc *scp, int32_t device)
---
> ata_dmadone(struct ata_softc *scp)
425c540
< ata_dmastatus(struct ata_softc *scp, int32_t device)
---
> ata_dmastatus(struct ata_softc *scp)
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 51548 1999-09-22 12:04:51Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 52067 1999-10-09 19:57:13Z sos $
49a50,54
> /* prototypes */
> static void hpt366_timing(struct ata_softc *, int32_t, int32_t);
>
> /* misc defines */
> #define MIN(a,b) ((a)>(b)?(b):(a))
55,57d59
< /* misc defines */
< #define MIN(a,b) ((a)>(b)?(b):(a))
<
73a76,86
> /* if simplex controller, only allow DMA on primary channel */
> if (scp->unit == 1) {
> outb(scp->bmaddr + ATA_BMSTAT_PORT, inb(scp->bmaddr + ATA_BMSTAT_PORT) &
> (ATA_BMSTAT_DMA_MASTER | ATA_BMSTAT_DMA_SLAVE));
> if (inb(scp->bmaddr + ATA_BMSTAT_PORT) & ATA_BMSTAT_DMA_SIMPLEX) {
> printf("ata%d: simplex device, DMA on primary channel only\n",
> scp->lun);
> return -1;
> }
> }
>
104,105c117,118
< ~mask48) | new48, 4);
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA33;
---
> ~mask48) | new48, 4);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
161c174
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
170,172c183,184
< case 0x4d33105a: /* Promise Ultra/33 / FastTrack controllers */
< case 0x4d38105a: /* Promise Ultra/66 controllers */
< /* the Promise can only do DMA on ATA disks not on ATAPI devices */
---
> case 0x522910b9: /* AcerLabs Aladdin IV/V */
> /* the Aladdin has to be setup specially for ATAPI devices */
174,175c186,187
< (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE))
< break;
---
> (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE)) {
> int8_t word53 = pci_read_config(scp->dev, 0x53, 1);
177,178c189,215
< devno = (scp->unit << 1) + ((device == ATA_MASTER) ? 0 : 1);
< if (udmamode >=4 && type == 0x4d38105a) {
---
> /* set atapi fifo, this should always work */
> pci_write_config(scp->dev, 0x53, (word53 & ~0x01) | 0x02, 1);
>
> /* if both master & slave are atapi devices dont allow DMA */
> if (scp->devices & ATA_ATAPI_MASTER &&
> scp->devices & ATA_ATAPI_SLAVE) {
> printf("ata%d: Aladdin: two atapi devices on this channel, "
> "DMA disabled\n", scp->lun);
> break;
> }
> /* if needed set atapi fifo & dma */
> if ((udmamode >=2) || (wdmamode >= 2 && apiomode >= 4)) {
> pci_write_config(scp->dev, 0x53, word53 | 0x03, 1);
> scp->flags |= ATA_ATAPI_DMA_RO;
> if (device == ATA_MASTER)
> outb(scp->bmaddr + ATA_BMSTAT_PORT,
> inb(scp->bmaddr + ATA_BMSTAT_PORT) |
> ATA_BMSTAT_DMA_MASTER);
> else
> outb(scp->bmaddr + ATA_BMSTAT_PORT,
> inb(scp->bmaddr + ATA_BMSTAT_PORT) |
> ATA_BMSTAT_DMA_SLAVE);
> }
> }
> if (udmamode >=2) {
> int32_t word54 = pci_read_config(scp->dev, 0x54, 4);
>
180c217
< ATA_UDMA4, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
---
> ATA_UDMA2, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
182c219
< printf("ata%d: %s: %s setting up UDMA4 mode on Promise chip\n",
---
> printf("ata%d: %s: %s setting up UDMA2 mode on Aladdin chip\n",
187,188c224,227
< pci_write_config(scp->dev, 0x60 + (devno << 2), 0x004117f3, 4);
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA66;
---
> word54 |= 0x5555;
> word54 |= (0x0a << (16 + (scp->unit << 3) + (device << 2)));
> pci_write_config(scp->dev, 0x54, word54, 4);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
189a229
>
191c231,252
<
---
> else if (wdmamode >= 2 && apiomode >= 4) {
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
> ATA_WDMA2, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
> if (bootverbose)
> printf("ata%d: %s: %s setting up WDMA2 mode on Aladdin chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave",
> (error) ? "failed" : "success");
> if (error)
> break;
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
> return 0;
> }
> break;
>
> case 0x4d33105a: /* Promise Ultra33 / FastTrak33 controllers */
> case 0x4d38105a: /* Promise Ultra66 / FastTrak66 controllers */
> /* the Promise can only do DMA on ATA disks not on ATAPI devices */
> if ((device == ATA_MASTER && scp->devices & ATA_ATAPI_MASTER) ||
> (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE))
> break;
>
> devno = (scp->unit << 1) + ((device == ATA_MASTER) ? 0 : 1);
202c263
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA33;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
215c276
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
226,227c287,288
< case 0x522910b9: /* AcerLabs Aladdin IV/V */
< /* the Aladdin has to be setup specially for ATAPI devices */
---
> case 0x00041103: /* HighPoint HPT366 IDE controller */
> /* punt on ATAPI devices for now */
229,230c290,291
< (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE)) {
< int8_t word53 = pci_read_config(scp->dev, 0x53, 1);
---
> (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE))
> break;
232,247c293,305
< /* if needed set atapi fifo & dma */
< if ((udmamode >=2) || (wdmamode >= 2 && apiomode >= 4)) {
< pci_write_config(scp->dev, 0x53, word53 | 0x03, 1);
< scp->flags |= ATA_ATAPI_DMA_RO;
< if (device == ATA_MASTER)
< outb(scp->bmaddr + ATA_BMSTAT_PORT,
< inb(scp->bmaddr + ATA_BMSTAT_PORT) |
< ATA_BMSTAT_DMA_MASTER);
< else
< outb(scp->bmaddr + ATA_BMSTAT_PORT,
< inb(scp->bmaddr + ATA_BMSTAT_PORT) |
< ATA_BMSTAT_DMA_SLAVE);
< }
< else {
< pci_write_config(scp->dev, 0x53, (word53 & ~0x01) | 0x02, 1);
< }
---
> devno = (device == ATA_MASTER) ? 0 : 1;
> if (udmamode >=4 && !(pci_read_config(scp->dev, 0x5a, 1) & 0x2)) {
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
> ATA_UDMA4, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
> if (bootverbose)
> printf("ata%d: %s: %s setting up UDMA4 mode on HPT366 chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave",
> (error) ? "failed" : "success");
> if (error)
> break;
> hpt366_timing(scp, device, ATA_MODE_UDMA4);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA4;
> return 0;
249,251c307
< if (udmamode >=2) {
< int32_t word54 = pci_read_config(scp->dev, 0x54, 4);
<
---
> else if (udmamode >=3) {
252a309,321
> ATA_UDMA3, ATA_C_FEA_SETXFER, ATA_IGNORE_INTR);
> if (bootverbose)
> printf("ata%d: %s: %s setting up UDMA3 mode on HPT366 chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave",
> (error) ? "failed" : "success");
> if (error)
> break;
> hpt366_timing(scp, device, ATA_MODE_UDMA3);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA3;
> return 0;
> }
> else if (udmamode >=2) {
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
255c324
< printf("ata%d: %s: %s setting up UDMA2 mode on Aladdin chip\n",
---
> printf("ata%d: %s: %s setting up UDMA2 mode on HPT366 chip\n",
260,263c329,330
< word54 |= 0x5555;
< word54 |= (0x0a << (16 + (scp->unit << 3) + (device << 2)));
< pci_write_config(scp->dev, 0x54, word54, 4);
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA33;
---
> hpt366_timing(scp, device, ATA_MODE_UDMA2);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_UDMA2;
265d331
<
271c337
< printf("ata%d: %s: %s setting up WDMA2 mode on Aladdin chip\n",
---
> printf("ata%d: %s: %s setting up WDMA2 mode on HPT366 chip\n",
276c342,343
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> hpt366_timing(scp, device, ATA_MODE_WDMA2);
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
278a346,351
> else {
> if (bootverbose)
> printf("ata%d: %s: setting PIO mode on HPT366 chip\n",
> scp->lun, (device == ATA_MASTER) ? "master" : "slave");
> hpt366_timing(scp, device, ATA_MODE_PIO);
> }
300c373
< scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_DMA;
---
> scp->mode[(device == ATA_MASTER) ? 0 : 1] = ATA_MODE_WDMA2;
368c441
< ata_dmastart(struct ata_softc *scp, int32_t device)
---
> ata_dmastart(struct ata_softc *scp)
372a446
> scp->flags |= ATA_DMA_ACTIVE;
378c452
< ata_dmadone(struct ata_softc *scp, int32_t device)
---
> ata_dmadone(struct ata_softc *scp)
384a459
> scp->flags &= ~ATA_DMA_ACTIVE;
389c464
< ata_dmastatus(struct ata_softc *scp, int32_t device)
---
> ata_dmastatus(struct ata_softc *scp)
396a472,511
> static void
> hpt366_timing(struct ata_softc *scp, int32_t device, int32_t mode)
> {
> u_int32_t timing;
>
> switch (pci_read_config(scp->dev, (device == ATA_MASTER) ? 0x41 : 0x45, 1)){
> case 0x85: /* 25Mhz */
> switch (mode) {
> case ATA_MODE_PIO: timing = 0xc0ca8521; break;
> case ATA_MODE_WDMA2: timing = 0xa0ca8521; break;
> case ATA_MODE_UDMA2:
> case ATA_MODE_UDMA3: timing = 0x90cf8521; break;
> case ATA_MODE_UDMA4: timing = 0x90c98521; break;
> default: timing = 0x01208585;
> }
> break;
> default:
> case 0xa7: /* 33MHz */
> switch (mode) {
> case ATA_MODE_PIO: timing = 0xc0c8a731; break;
> case ATA_MODE_WDMA2: timing = 0xa0c8a731; break;
> case ATA_MODE_UDMA2: timing = 0x90caa731; break;
> case ATA_MODE_UDMA3: timing = 0x90cfa731; break;
> case ATA_MODE_UDMA4: timing = 0x90c9a731; break;
> default: timing = 0x0120a7a7;
> }
> break;
> case 0xd9: /* 40Mhz */
> switch (mode) {
> case ATA_MODE_PIO: timing = 0xc008d963; break;
> case ATA_MODE_WDMA2: timing = 0xa008d943; break;
> case ATA_MODE_UDMA2: timing = 0x900bd943; break;
> case ATA_MODE_UDMA3: timing = 0x900ad943; break;
> case ATA_MODE_UDMA4: timing = 0x900fd943; break;
> default: timing = 0x0120d9d9;
> }
> }
> pci_write_config(scp->dev, 0x40 + (device==ATA_MASTER ? 0 : 4), timing, 4);
> }
>
414c529
< ata_dmastart(struct ata_softc *scp, int32_t device)
---
> ata_dmastart(struct ata_softc *scp)
419c534
< ata_dmadone(struct ata_softc *scp, int32_t device)
---
> ata_dmadone(struct ata_softc *scp)
425c540
< ata_dmastatus(struct ata_softc *scp, int32_t device)
---
> ata_dmastatus(struct ata_softc *scp)