svn commit: r240699 - in head: sys/dev/pci usr.sbin/pciconf

[Gavin Atkinson]

Author: gavin
Date: Wed Sep 19 18:22:14 2012
New Revision: 240699
URL: http://svn.freebsd.org/changeset/base/240699

Log:
  Recognise NVM Express devices and pretty-print their name.
  
  MFC after:	1 week

Modified:
  head/sys/dev/pci/pci.c
  head/usr.sbin/pciconf/pciconf.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Wed Sep 19 16:28:38 2012	(r240698)
+++ head/sys/dev/pci/pci.c	Wed Sep 19 18:22:14 2012	(r240699)
@@ -3661,6 +3661,7 @@ static struct
 	{PCIC_STORAGE,		PCIS_STORAGE_ATA_ADMA,	"ATA (ADMA)"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SATA,	"SATA"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SAS,	"SAS"},
+	{PCIC_STORAGE,		PCIS_STORAGE_NVM,	"NVM Express"},
 	{PCIC_NETWORK,		-1,			"network"},
 	{PCIC_NETWORK,		PCIS_NETWORK_ETHERNET,	"ethernet"},
 	{PCIC_NETWORK,		PCIS_NETWORK_TOKENRING,	"token ring"},

Modified: head/usr.sbin/pciconf/pciconf.c
==============================================================================
--- head/usr.sbin/pciconf/pciconf.c	Wed Sep 19 16:28:38 2012	(r240698)
+++ head/usr.sbin/pciconf/pciconf.c	Wed Sep 19 18:22:14 2012	(r240699)
@@ -345,6 +345,7 @@ static struct
 	{PCIC_STORAGE,		PCIS_STORAGE_ATA_ADMA,	"ATA (ADMA)"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SATA,	"SATA"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SAS,	"SAS"},
+	{PCIC_STORAGE,		PCIS_STORAGE_NVM,	"NVM Express"},
 	{PCIC_NETWORK,		-1,			"network"},
 	{PCIC_NETWORK,		PCIS_NETWORK_ETHERNET,	"ethernet"},
 	{PCIC_NETWORK,		PCIS_NETWORK_TOKENRING,	"token ring"},