diff options
| author | sos <sos@FreeBSD.org> | 2004-08-01 12:31:38 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2004-08-01 12:31:38 +0000 |
| commit | 12d6bd37430a1e1df664a04408e16b3f01486e11 (patch) | |
| tree | 3c3af611b8bbc907504a5f1bea03a38a3f14f0a0 /sys/dev/ata/ata-all.c | |
| parent | ef9866e04f7d7045051fa0cad21621feec1adeee (diff) | |
| download | FreeBSD-src-12d6bd37430a1e1df664a04408e16b3f01486e11.zip FreeBSD-src-12d6bd37430a1e1df664a04408e16b3f01486e11.tar.gz | |
Change the default to switch on DMA on ATAPI devices if they can
do UDMA2 (ATA33) mode and beyond.
Diffstat (limited to 'sys/dev/ata/ata-all.c')
| -rw-r--r-- | sys/dev/ata/ata-all.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index bf705a2..3028a88 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -84,7 +84,7 @@ int ata_wc = 1; /* local vars */ static int ata_dma = 1; -static int atapi_dma = 0; +static int atapi_dma = 1; /* sysctl vars */ SYSCTL_NODE(_hw, OID_AUTO, ata, CTLFLAG_RD, 0, "ATA driver parameters"); @@ -682,7 +682,8 @@ ata_identify_devices(struct ata_channel *ch) if (ch->device[MASTER].param) { ch->device[MASTER].setmode(&ch->device[MASTER], ATA_PIO_MAX); if ((((ch->devices & ATA_ATAPI_MASTER) && atapi_dma && - (ch->device[MASTER].param->config&ATA_DRQ_MASK) != ATA_DRQ_INTR)|| + (ch->device[MASTER].param->config&ATA_DRQ_MASK) != ATA_DRQ_INTR && + ata_umode(ch->device[MASTER].param) >= ATA_UDMA2) || ((ch->devices & ATA_ATA_MASTER) && ata_dma)) && ch->dma) ch->device[MASTER].setmode(&ch->device[MASTER], ATA_DMA_MAX); @@ -690,7 +691,8 @@ ata_identify_devices(struct ata_channel *ch) if (ch->device[SLAVE].param) { ch->device[SLAVE].setmode(&ch->device[SLAVE], ATA_PIO_MAX); if ((((ch->devices & ATA_ATAPI_SLAVE) && atapi_dma && - (ch->device[SLAVE].param->config&ATA_DRQ_MASK) != ATA_DRQ_INTR) || + (ch->device[SLAVE].param->config&ATA_DRQ_MASK) != ATA_DRQ_INTR && + ata_umode(ch->device[SLAVE].param) >= ATA_UDMA2) || ((ch->devices & ATA_ATA_SLAVE) && ata_dma)) && ch->dma) ch->device[SLAVE].setmode(&ch->device[SLAVE], ATA_DMA_MAX); } |
