28c28
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 52918 1999-11-06 16:50:21Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 53029 1999-11-08 21:36:00Z sos $
103c103
< ATA_UDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_UDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
142c142
< ATA_WDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_WDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
182,209c182,186
< /* the Aladdin has to be setup specially for ATAPI devices */
< if ((device == ATA_MASTER && scp->devices & ATA_ATAPI_MASTER) ||
< (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE)) {
< int8_t word53 = pci_read_config(scp->dev, 0x53, 1);
<
< /* 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);
< }
---
> /* the Aladdin doesn't support ATAPI DMA on both master & slave */
> 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;
215c192
< ATA_UDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_UDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
224a202,204
> pci_write_config(scp->dev, 0x53,
> pci_read_config(scp->dev, 0x53, 1) | 0x03, 1);
> scp->flags |= ATA_ATAPI_DMA_RO;
231c211
< ATA_WDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_WDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
237a218,220
> pci_write_config(scp->dev, 0x53,
> pci_read_config(scp->dev, 0x53, 1) | 0x03, 1);
> scp->flags |= ATA_ATAPI_DMA_RO;
254c237
< ATA_UDMA4, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);
268c251
< ATA_UDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_UDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
281c264
< ATA_WDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_WDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
309c292
< ATA_UDMA4, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);
322c305
< ATA_UDMA3, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_UDMA3, ATA_C_F_SETXFER, ATA_WAIT_READY);
335c318
< ATA_UDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_UDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
348c331
< ATA_WDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_WDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);
379c362
< ATA_WDMA2, ATA_C_FEA_SETXFER, ATA_WAIT_READY);
---
> ATA_WDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY);