svn commit: r350726 - stable/12/sbin/camcontrol

[Alexander Motin]

Author: mav
Date: Thu Aug  8 02:17:24 2019
New Revision: 350726
URL: https://svnweb.freebsd.org/changeset/base/350726

Log:
  MFC r349964: Add device type NVME and device type MMCSD to get_device_type
  
  For completeness, add nvme and mmc/sd devices to the list of device
  types we know.

Modified:
  stable/12/sbin/camcontrol/camcontrol.c
  stable/12/sbin/camcontrol/camcontrol.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/12/sbin/camcontrol/camcontrol.c	Thu Aug  8 02:12:08 2019	(r350725)
+++ stable/12/sbin/camcontrol/camcontrol.c	Thu Aug  8 02:17:24 2019	(r350726)
@@ -5391,6 +5391,14 @@ get_device_type(struct cam_device *dev, int retry_coun
 		*devtype = CC_DT_ATA;
 		goto bailout;
 		break; /*NOTREACHED*/
+	case PROTO_NVME:
+		*devtype = CC_DT_NVME;
+		goto bailout;
+		break; /*NOTREACHED*/
+	case PROTO_MMCSD:
+		*devtype = CC_DT_MMCSD;
+		goto bailout;
+		break; /*NOTREACHED*/
 	default:
 		*devtype = CC_DT_UNKNOWN;
 		goto bailout;

Modified: stable/12/sbin/camcontrol/camcontrol.h
==============================================================================
--- stable/12/sbin/camcontrol/camcontrol.h	Thu Aug  8 02:12:08 2019	(r350725)
+++ stable/12/sbin/camcontrol/camcontrol.h	Thu Aug  8 02:17:24 2019	(r350726)
@@ -44,6 +44,8 @@ typedef enum {
 	CC_DT_SCSI,
 	CC_DT_ATA_BEHIND_SCSI,
 	CC_DT_ATA,
+	CC_DT_NVME,
+	CC_DT_MMCSD,
 	CC_DT_UNKNOWN
 } camcontrol_devtype;