svn commit: r315521 - stable/11/sys/cam/ctl

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Mar 18 23:59:50 2017
New Revision: 315521
URL: https://svnweb.freebsd.org/changeset/base/315521

Log:
  MFC r312622:
  
  Add SCSI descriptors for USB Mass Storage.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/sys/cam/ctl/ctl.c
  stable/11/sys/cam/ctl/ctl.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/ctl/ctl.c
==============================================================================
--- stable/11/sys/cam/ctl/ctl.c	Sat Mar 18 23:57:47 2017	(r315520)
+++ stable/11/sys/cam/ctl/ctl.c	Sat Mar 18 23:59:50 2017	(r315521)
@@ -10102,6 +10102,9 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio
 	} else if (port_type == CTL_PORT_SAS) {
 		/* SAS (no version claimed) */
 		scsi_ulto2b(0x0BE0, inq_ptr->version3);
+	} else if (port_type == CTL_PORT_UMASS) {
+		/* USB Mass Storage Class Bulk-Only Transport, Revision 1.0 */
+		scsi_ulto2b(0x1730, inq_ptr->version3);
 	}
 
 	if (lun == NULL) {

Modified: stable/11/sys/cam/ctl/ctl.h
==============================================================================
--- stable/11/sys/cam/ctl/ctl.h	Sat Mar 18 23:57:47 2017	(r315520)
+++ stable/11/sys/cam/ctl/ctl.h	Sat Mar 18 23:59:50 2017	(r315521)
@@ -53,6 +53,7 @@ typedef enum {
 	CTL_PORT_INTERNAL	= 0x08,
 	CTL_PORT_ISCSI		= 0x10,
 	CTL_PORT_SAS		= 0x20,
+	CTL_PORT_UMASS		= 0x40,
 	CTL_PORT_ALL		= 0xff,
 	CTL_PORT_ISC		= 0x100 // FC port for inter-shelf communication
 } ctl_port_type;