svn commit: r350795 - stable/11/sbin/camcontrol

[Alexander Motin]

Author: mav
Date: Thu Aug  8 21:54:31 2019
New Revision: 350795
URL: https://svnweb.freebsd.org/changeset/base/350795

Log:
  MFC r349964 (by imp):
  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/11/sbin/camcontrol/camcontrol.c
  stable/11/sbin/camcontrol/camcontrol.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/11/sbin/camcontrol/camcontrol.c	Thu Aug  8 21:47:40 2019	(r350794)
+++ stable/11/sbin/camcontrol/camcontrol.c	Thu Aug  8 21:54:31 2019	(r350795)
@@ -5193,6 +5193,10 @@ 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*/
 	default:
 		*devtype = CC_DT_UNKNOWN;
 		goto bailout;

Modified: stable/11/sbin/camcontrol/camcontrol.h
==============================================================================
--- stable/11/sbin/camcontrol/camcontrol.h	Thu Aug  8 21:47:40 2019	(r350794)
+++ stable/11/sbin/camcontrol/camcontrol.h	Thu Aug  8 21:54:31 2019	(r350795)
@@ -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;