28c28
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 84419 2001-10-03 11:36:25Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 84584 2001-10-06 11:07:04Z sos $
106c106
< if (udmamode > 2 && !ATA_PARAM(scp, device)->cblid) {
---
> if (udmamode > 2 && !ATA_PARAM(scp, device)->hwres_cblid) {
122c122
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
152c152
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
181c181
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
221c221
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
270c270
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
292c292
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
313c313
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
334c334
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
359c359
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
380c380
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
396c396
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
414c414
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
427c427
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
440c440
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
456c456
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
469c469
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
486c486
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
501c501
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
519c519
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
532c532
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
551c551
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
571c571
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
588c588
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
610c610
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
628c628
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
646c646
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
658c658
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
669,670c669,670
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
< ata_pio2mode(apiomode), ATA_C_F_SETXFER,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
> ATA_PIO0 + apiomode, ATA_C_F_SETXFER,
675,677c675,677
< ata_mode2str(ata_pio2mode(apiomode)));
< cyrix_timing(scp, devno, ata_pio2mode(apiomode));
< scp->mode[ATA_DEV(device)] = ata_pio2mode(apiomode);
---
> ata_mode2str(ATA_PIO0 + apiomode));
> cyrix_timing(scp, devno, ATA_PIO0 + apiomode);
> scp->mode[ATA_DEV(device)] = ATA_PIO0 + apiomode;
682c682
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
703c703
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
730c730
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
743c743
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
754c754
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
770c770
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
787c787
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
803c803
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
816c816
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
828,829c828,829
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
< ata_pio2mode(apiomode),
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
> ATA_PIO0 + apiomode,
836,837c836,837
< promise_timing(scp, devno, ata_pio2mode(apiomode));
< scp->mode[ATA_DEV(device)] = ata_pio2mode(apiomode);
---
> promise_timing(scp, devno, ATA_PIO0 + apiomode);
> scp->mode[ATA_DEV(device)] = ATA_PIO0 + apiomode;
844c844
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
858c858
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
871c871
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
884c884
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
896,897c896,897
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
< ata_pio2mode(apiomode),
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
> ATA_PIO0 + apiomode,
903,904c903,904
< hpt_timing(scp, devno, ata_pio2mode(apiomode));
< scp->mode[ATA_DEV(device)] = ata_pio2mode(apiomode);
---
> hpt_timing(scp, devno, ATA_PIO0 + apiomode);
> scp->mode[ATA_DEV(device)] = ATA_PIO0 + apiomode;
925c925
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0,
937,938c937,938
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
< ata_pio2mode(apiomode), ATA_C_F_SETXFER,ATA_WAIT_READY);
---
> error = ata_command(scp, device, ATA_C_SETFEATURES, 0, ATA_PIO0 + apiomode,
> ATA_C_F_SETXFER,ATA_WAIT_READY);
943c943
< scp->mode[ATA_DEV(device)] = ata_pio2mode(apiomode);
---
> scp->mode[ATA_DEV(device)] = ATA_PIO0 + apiomode;