Deleted Added
full compact
28c28
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 56686 2000-01-27 19:00:51Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 56744 2000-01-28 13:35:43Z sos $
63c63
< int32_t
---
> void
69a70,72
> /* set our most pessimistic default mode */
> scp->mode[ATA_DEV(device)] = ATA_PIO;
>
71c74
< return -1;
---
> return;
79c82
< return -1;
---
> return;
87c90
< return -1;
---
> return;
92c95
< return -1;
---
> return;
120c123
< return 0;
---
> return;
179c182
< return 0;
---
> return;
205c208
< return 0;
---
> return;
234c237
< return 0;
---
> return;
249c252
< return 0;
---
> return;
269c272
< return 0;
---
> return;
282c285
< return 0;
---
> return;
298c301
< return 0;
---
> return;
316c319
< return 0;
---
> return;
330c333
< return 0;
---
> return;
347c350
< return 0;
---
> return;
360c363
< return 0;
---
> return;
385c388
< return 0;
---
> return;
398c401
< return 0;
---
> return;
411c414
< return 0;
---
> return;
424c427
< return -1;
---
> return;
442c445
< return 0;
---
> return;
455c458
< return 0;
---
> return;
468c471
< return 0;
---
> return;
480c483
< return -1;
---
> return;
487a491,500
> /* if controller says its setup for DMA take the easy way out */
> /* the downside is we dont know what DMA mode we are in */
> if ((udmamode >= 0 || wdmamode > 1) &&
> (inb(scp->bmaddr + ATA_BMSTAT_PORT) &
> ((device==ATA_MASTER) ?
> ATA_BMSTAT_DMA_MASTER : ATA_BMSTAT_DMA_SLAVE))) {
> scp->mode[ATA_DEV(device)] = ATA_DMA;
> return;
> }
>
498c511
< return 0;
---
> return;
502,503d514
< error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
< ata_pio2mode(apiomode), ATA_C_F_SETXFER,ATA_WAIT_READY);
505,508c516
< ata_printf(scp, device, "%s setting up PIO%d mode on generic chip\n",
< (error) ? "failed" : "success",(apiomode>=0) ? apiomode : 0);
< scp->mode[ATA_DEV(device)] = ata_pio2mode(apiomode);
< return -1;
---
> ata_printf(scp, device, "using PIO mode set by BIOS\n");