diff options
| author | mav <mav@FreeBSD.org> | 2011-06-12 18:52:39 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2011-06-12 18:52:39 +0000 |
| commit | ee628d4978ff89cbd55dfe07804276f1f1c5f76a (patch) | |
| tree | e1d3fbbbd293b9403b58ead53a51dde1909f6035 /sys/cam | |
| parent | abfa1c12cccf2764b50b308667229630534ac780 (diff) | |
| download | FreeBSD-src-ee628d4978ff89cbd55dfe07804276f1f1c5f76a.zip FreeBSD-src-ee628d4978ff89cbd55dfe07804276f1f1c5f76a.tar.gz | |
Do not report CFA devices as ATAPI, even though IDENTIFY data look alike.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ata/ata_all.c | 1 | ||||
| -rw-r--r-- | sys/cam/ata/ata_xpt.c | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/cam/ata/ata_all.c b/sys/cam/ata/ata_all.c index 3737e8f..560eef4 100644 --- a/sys/cam/ata/ata_all.c +++ b/sys/cam/ata/ata_all.c @@ -270,6 +270,7 @@ ata_print_ident(struct ata_params *ident_data) sizeof(revision)); printf("<%s %s> %s-%d", product, revision, + (ident_data->config == ATA_PROTO_CFA) ? "CFA" : (ident_data->config & ATA_PROTO_ATAPI) ? "ATAPI" : "ATA", ata_version(ident_data->version_major)); if (ident_data->satacapabilities && ident_data->satacapabilities != 0xffff) { diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 9e236a4..d02b36f 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -1583,12 +1583,14 @@ ata_device_transport(struct cam_path *path) cts.proto_specific.valid = 0; if (ident_buf) { if (path->device->transport == XPORT_ATA) { - cts.xport_specific.ata.atapi = + cts.xport_specific.ata.atapi = + (ident_buf->config == ATA_PROTO_CFA) ? 0 : ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_16) ? 16 : ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_12) ? 12 : 0; cts.xport_specific.ata.valid = CTS_ATA_VALID_ATAPI; } else { - cts.xport_specific.sata.atapi = + cts.xport_specific.sata.atapi = + (ident_buf->config == ATA_PROTO_CFA) ? 0 : ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_16) ? 16 : ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_12) ? 12 : 0; cts.xport_specific.sata.valid = CTS_SATA_VALID_ATAPI; @@ -1638,7 +1640,9 @@ ata_action(union ccb *start_ccb) uint16_t p = device->ident_data.config & ATA_PROTO_MASK; - maxlen = (p == ATA_PROTO_ATAPI_16) ? 16 : + maxlen = + (device->ident_data.config == ATA_PROTO_CFA) ? 0 : + (p == ATA_PROTO_ATAPI_16) ? 16 : (p == ATA_PROTO_ATAPI_12) ? 12 : 0; } if (start_ccb->csio.cdb_len > maxlen) { |
