From 8047e0393472f520549ee8d558373c73793d14bf Mon Sep 17 00:00:00 2001 From: sos Date: Mon, 11 Sep 2006 18:33:59 +0000 Subject: CF devices are ATA not ATAPI. --- sys/dev/ata/ata-all.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sys') diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index d76b11b..bdf1eed 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -636,7 +636,9 @@ ata_getparam(struct ata_device *atadev, int init) if (init) { sprintf(buffer, "%.40s/%.8s", atacap->model, atacap->revision); device_set_desc_copy(atadev->dev, buffer); - if (atadev->param.config & ATA_PROTO_ATAPI) { + if ((atadev->param.config & ATA_PROTO_ATAPI) && + (atadev->param.config != ATA_CFA_MAGIC1) && + (atadev->param.config != ATA_CFA_MAGIC2)) { if (atapi_dma && ch->dma && (atadev->param.config & ATA_DRQ_MASK) != ATA_DRQ_INTR && ata_umode(&atadev->param) >= ATA_UDMA2) -- cgit v1.1