28c28
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 107562 2002-12-03 20:20:44Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 108931 2003-01-08 10:03:31Z sos $
1512a1513,1525
> switch(ch->chiptype) {
> case 0x0d38105a: /* Promise Fasttrak 66 */
> case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */
> case 0x0d30105a: /* Promise OEM ATA 100 */
> case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */
> ATA_OUTB(ch->r_bmio, 0x11,
> ATA_INB(ch->r_bmio, 0x11) | (atadev->unit ? 0x08 : 0x02));
>
> ATA_OUTL(ch->r_bmio, (atadev->unit ? 0x24 : 0x20),
> (dir ? 0x05000000 : 0x06000000) | (count >> 1));
> break;
> }
>
1524,1526c1537
< ds->flags = ATA_DS_ACTIVE;
< if (dir)
< ds->flags |= ATA_DS_READ;
---
> ds->flags = dir ? (ATA_DS_ACTIVE | ATA_DS_READ) : ATA_DS_ACTIVE;
1531,1532c1542,1543
< (ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) |
< (ATA_BMSTAT_INTERRUPT | ATA_BMSTAT_ERROR)));
---
> (ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) |
> (ATA_BMSTAT_INTERRUPT | ATA_BMSTAT_ERROR)));
1534c1545
< ATA_INB(ch->r_bmio, ATA_BMCMD_PORT) | ATA_BMCMD_START_STOP);
---
> ATA_INB(ch->r_bmio, ATA_BMCMD_PORT) | ATA_BMCMD_START_STOP);
1541,1542c1552,1553
< struct ata_channel *ch;
< struct ata_dmastate *ds;
---
> struct ata_channel *ch = atadev->channel;
> struct ata_dmastate *ds = &atadev->dmastate;
1545,1546c1556,1566
< ch = atadev->channel;
< ds = &atadev->dmastate;
---
> switch(ch->chiptype) {
> case 0x0d38105a: /* Promise Fasttrak 66 */
> case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */
> case 0x0d30105a: /* Promise OEM ATA 100 */
> case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */
> ATA_OUTL(ch->r_bmio, (atadev->unit ? 0x24 : 0x20), 0);
> ATA_OUTB(ch->r_bmio, 0x11,
> ATA_INB(ch->r_bmio, 0x11) & ~(atadev->unit ? 0x08 : 0x02));
> break;
> }
>
1550c1570
<
---
>