Author: mav
Date: Thu Aug 8 02:25:34 2019
New Revision: 350731
URL: https://svnweb.freebsd.org/changeset/base/350731
Log:
MFC r350150: Properly report ACS revisions alike to kernel.
Modified:
stable/12/sbin/camcontrol/camcontrol.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/12/sbin/camcontrol/camcontrol.c Thu Aug 8 02:24:57 2019
(r350730)
+++ stable/12/sbin/camcontrol/camcontrol.c Thu Aug 8 02:25:34 2019
(r350731)
@@ -1497,6 +1497,7 @@ atasata(struct ata_params *parm)
static void
atacapprint(struct ata_params *parm)
{
+ const char *proto;
u_int32_t lbasize = (u_int32_t)parm->lba_size_1 |
((u_int32_t)parm->lba_size_2 << 16);
@@ -1507,7 +1508,19 @@ atacapprint(struct ata_params *parm)
printf("\n");
printf("protocol ");
- printf("ATA/ATAPI-%d", ata_version(parm->version_major));
+ proto = (parm->config == ATA_PROTO_CFA) ? "CFA" :
+ (parm->config & ATA_PROTO_ATAPI) ? "ATAPI" : "ATA";
+ if (ata_version(parm->version_major) == 0) {
+ printf("%s", proto);
+ } else if (ata_version(parm->version_major) <= 7) {
+ printf("%s-%d", proto,
+ ata_version(parm->version_major));
+ } else if (ata_version(parm->version_major) == 8) {
+ printf("%s8-ACS", proto);
+ } else {
+ printf("ACS-%d %s",
+ ata_version(parm->version_major) - 7, proto);
+ }
if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
if (parm->satacapabilities & ATA_SATA_GEN3)
printf(" SATA 3.x\n");
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
