svn commit: r303124 - head/sys/cam

[Warner Losh]

Author: imp
Date: Thu Jul 21 03:11:36 2016
New Revision: 303124
URL: https://svnweb.freebsd.org/changeset/base/303124

Log:
  Fix mismerge and add NVME xport support to devstat (or rather, exclude
  it from SCSI).
  
  MFC after: 1 week

Modified:
  head/sys/cam/cam_ccb.h

Modified: head/sys/cam/cam_ccb.h
==============================================================================
--- head/sys/cam/cam_ccb.h	Thu Jul 21 03:11:35 2016	(r303123)
+++ head/sys/cam/cam_ccb.h	Thu Jul 21 03:11:36 2016	(r303124)
@@ -285,10 +285,11 @@ typedef enum {
 	XPORT_NVME,	/* NVMe over PCIe */
 } cam_xport;
 
+#define XPORT_IS_NVME(t)	((t) == XPORT_NVME)
 #define XPORT_IS_ATA(t)		((t) == XPORT_ATA || (t) == XPORT_SATA)
 #define XPORT_IS_SCSI(t)	((t) != XPORT_UNKNOWN && \
 				 (t) != XPORT_UNSPECIFIED && \
-				 !XPORT_IS_ATA(t))
+				 !XPORT_IS_ATA(t) && !XPORT_IS_NVME(t))
 #define XPORT_DEVSTAT_TYPE(t)	(XPORT_IS_ATA(t) ? DEVSTAT_TYPE_IF_IDE : \
 				 XPORT_IS_SCSI(t) ? DEVSTAT_TYPE_IF_SCSI : \
 				 DEVSTAT_TYPE_IF_OTHER)