Fix mismerge and add NVME xport support to devstat (or rather, exclude

it from SCSI).

MFC after: 1 week
This commit is contained in:
Warner Losh 2016-07-21 03:11:36 +00:00
parent b24ced67d0
commit 336b7b6665
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=303124

View file

@ -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)