add some additional pci classes and sub-classes..

Reviewed by:	imp (almost 6 months ago)

3 files changed, 86 insertions, 4 deletions

diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index ae4bd89..ceb0c75 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1215,12 +1215,15 @@ static struct
 	{PCIC_NETWORK,		PCIS_NETWORK_TOKENRING,	"token ring"},
 	{PCIC_NETWORK,		PCIS_NETWORK_FDDI,	"fddi"},
 	{PCIC_NETWORK,		PCIS_NETWORK_ATM,	"ATM"},
+	{PCIC_NETWORK,		PCIS_NETWORK_ISDN,	"ISDN"},
 	{PCIC_DISPLAY,		-1,			"display"},
 	{PCIC_DISPLAY,		PCIS_DISPLAY_VGA,	"VGA"},
 	{PCIC_DISPLAY,		PCIS_DISPLAY_XGA,	"XGA"},
+	{PCIC_DISPLAY,		PCIS_DISPLAY_3D,	"3D"},
 	{PCIC_MULTIMEDIA,	-1,			"multimedia"},
 	{PCIC_MULTIMEDIA,	PCIS_MULTIMEDIA_VIDEO,	"video"},
 	{PCIC_MULTIMEDIA,	PCIS_MULTIMEDIA_AUDIO,	"audio"},
+	{PCIC_MULTIMEDIA,	PCIS_MULTIMEDIA_TELE,	"telephony"},
 	{PCIC_MEMORY,		-1,			"memory"},
 	{PCIC_MEMORY,		PCIS_MEMORY_RAM,	"RAM"},
 	{PCIC_MEMORY,		PCIS_MEMORY_FLASH,	"flash"},
@@ -1233,19 +1236,24 @@ static struct
 	{PCIC_BRIDGE,		PCIS_BRIDGE_PCMCIA,	"PCI-PCMCIA"},
 	{PCIC_BRIDGE,		PCIS_BRIDGE_NUBUS,	"PCI-NuBus"},
 	{PCIC_BRIDGE,		PCIS_BRIDGE_CARDBUS,	"PCI-CardBus"},
-	{PCIC_BRIDGE,		PCIS_BRIDGE_OTHER,	"PCI-unknown"},
+	{PCIC_BRIDGE,		PCIS_BRIDGE_RACEWAY,	"PCI-RACEway"},
 	{PCIC_SIMPLECOMM,	-1,			"simple comms"},
 	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_UART,	"UART"},	/* could detect 16550 */
 	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_PAR,	"parallel port"},
+	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_MULSER,	"multiport serial"},
+	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_MODEM,	"generic modem"},
 	{PCIC_BASEPERIPH,	-1,			"base peripheral"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_PIC,	"interrupt controller"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_DMA,	"DMA controller"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_TIMER,	"timer"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_RTC,	"realtime clock"},
+	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_PCIHOT,	"PCI hot-plug controller"},
 	{PCIC_INPUTDEV,		-1,			"input device"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_KEYBOARD,	"keyboard"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_DIGITIZER,"digitizer"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_MOUSE,	"mouse"},
+	{PCIC_INPUTDEV,		PCIS_INPUTDEV_SCANNER,	"scanner"},
+	{PCIC_INPUTDEV,		PCIS_INPUTDEV_GAMEPORT,	"gameport"},
 	{PCIC_DOCKING,		-1,			"docking station"},
 	{PCIC_PROCESSOR,	-1,			"processor"},
 	{PCIC_SERIALBUS,	-1,			"serial bus"},
@@ -1255,6 +1263,22 @@ static struct
 	{PCIC_SERIALBUS,	PCIS_SERIALBUS_USB,	"USB"},
 	{PCIC_SERIALBUS,	PCIS_SERIALBUS_FC,	"Fibre Channel"},
 	{PCIC_SERIALBUS,	PCIS_SERIALBUS_SMBUS,	"SMBus"},
+	{PCIC_WIRELESS,		-1,			"wireless controller"},
+	{PCIC_WIRELESS,		PCIS_WIRELESS_IRDA,	"iRDA"},
+	{PCIC_WIRELESS,		PCIS_WIRELESS_IR,	"IR"},
+	{PCIC_WIRELESS,		PCIS_WIRELESS_RF,	"RF"},
+	{PCIC_INTELLIIO,	-1,			"intelligent I/O controller"},
+	{PCIC_INTELLIIO,	PCIS_INTELLIIO_I2O,	"I2O"},
+	{PCIC_SATCOM,		-1,			"satellite communication"},
+	{PCIC_SATCOM,		PCIS_SATCOM_TV,		"sat TV"},
+	{PCIC_SATCOM,		PCIS_SATCOM_AUDIO,	"sat audio"},
+	{PCIC_SATCOM,		PCIS_SATCOM_VOICE,	"sat voice"},
+	{PCIC_SATCOM,		PCIS_SATCOM_DATA,	"sat data"},
+	{PCIC_CRYPTO,		-1,			"encrypt/decrypt"},
+	{PCIC_CRYPTO,		PCIS_CRYPTO_NETCOMP,	"network/computer crypto"},
+	{PCIC_CRYPTO,		PCIS_CRYPTO_NETCOMP,	"entertainment crypto"},
+	{PCIC_DASP,		-1,			"dasp"},
+	{PCIC_DASP,		PCIS_DASP_DPIO,		"DPIO module"},
 	{0, 0,		NULL}
 };
 
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index b4de6fd..db135f0 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -128,7 +128,7 @@
 #define PCIR_MINGNT	0x3e
 #define PCIR_MAXLAT	0x3f
 
-/* config registers for header type 1 devices */
+/* config registers for header type 1 (PCI-to-PCI bridge) devices */
 
 #define PCIR_SECSTAT_1	0x1e
 
@@ -158,7 +158,7 @@
 #define PCIR_SUBVEND_1	0x34
 #define PCIR_SUBDEV_1	0x36
 
-/* config registers for header type 2 devices */
+/* config registers for header type 2 (CardBus) devices */
 
 #define PCIR_SECSTAT_2	0x16
 
@@ -207,16 +207,19 @@
 #define PCIS_NETWORK_TOKENRING	0x01
 #define PCIS_NETWORK_FDDI	0x02
 #define PCIS_NETWORK_ATM	0x03
+#define PCIS_NETWORK_ISDN	0x04
 #define PCIS_NETWORK_OTHER	0x80
 
 #define PCIC_DISPLAY	0x03
 #define PCIS_DISPLAY_VGA	0x00
 #define PCIS_DISPLAY_XGA	0x01
+#define PCIS_DISPLAY_3D		0x02
 #define PCIS_DISPLAY_OTHER	0x80
 
 #define PCIC_MULTIMEDIA	0x04
 #define PCIS_MULTIMEDIA_VIDEO	0x00
 #define PCIS_MULTIMEDIA_AUDIO	0x01
+#define PCIS_MULTIMEDIA_TELE	0x02
 #define PCIS_MULTIMEDIA_OTHER	0x80
 
 #define PCIC_MEMORY	0x05
@@ -233,12 +236,15 @@
 #define PCIS_BRIDGE_PCMCIA	0x05
 #define PCIS_BRIDGE_NUBUS	0x06
 #define PCIS_BRIDGE_CARDBUS	0x07
+#define PCIS_BRIDGE_RACEWAY	0x08
 #define PCIS_BRIDGE_OTHER	0x80
 
 #define PCIC_SIMPLECOMM	0x07
 #define PCIS_SIMPLECOMM_UART	0x00
 #define PCIP_SIMPLECOMM_UART_16550A	0x02
 #define PCIS_SIMPLECOMM_PAR	0x01
+#define PCIS_SIMPLECOMM_MULSER	0x02
+#define PCIS_SIMPLECOMM_MODEM	0x03
 #define PCIS_SIMPLECOMM_OTHER	0x80
 
 #define PCIC_BASEPERIPH	0x08
@@ -246,12 +252,15 @@
 #define PCIS_BASEPERIPH_DMA	0x01
 #define PCIS_BASEPERIPH_TIMER	0x02
 #define PCIS_BASEPERIPH_RTC	0x03
+#define PCIS_BASEPERIPH_PCIHOT	0x04
 #define PCIS_BASEPERIPH_OTHER	0x80
 
 #define PCIC_INPUTDEV	0x09
 #define PCIS_INPUTDEV_KEYBOARD	0x00
 #define PCIS_INPUTDEV_DIGITIZER	0x01
 #define PCIS_INPUTDEV_MOUSE	0x02
+#define PCIS_INPUTDEV_SCANNER	0x02
+#define PCIS_INPUTDEV_GAMEPORT	0x02
 #define PCIS_INPUTDEV_OTHER	0x80
 
 #define PCIC_DOCKING	0x0a
@@ -264,6 +273,7 @@
 #define PCIS_PROCESSOR_PENTIUM	0x02
 #define PCIS_PROCESSOR_ALPHA	0x10
 #define PCIS_PROCESSOR_POWERPC	0x20
+#define PCIS_PROCESSOR_MIPS	0x20
 #define PCIS_PROCESSOR_COPROC	0x40
 
 #define PCIC_SERIALBUS	0x0c
@@ -277,6 +287,30 @@
 #define PCIS_SERIALBUS_FC	0x04
 #define PCIS_SERIALBUS_SMBUS	0x05
 
+#define PCIC_WIRELESS	0x0d
+#define PCIS_WIRELESS_IRDA	0x00
+#define PCIS_WIRELESS_IR	0x01
+#define PCIS_WIRELESS_RF	0x10
+#define PCIS_WIRELESS_OTHER	0x80
+
+#define PCIC_INTELLIIO	0x0e
+#define PCIS_INTELLIIO_I2O	0x00
+
+#define PCIC_SATCOM	0x0f
+#define PCIS_SATCOM_TV		0x01
+#define PCIS_SATCOM_AUDIO	0x02
+#define PCIS_SATCOM_VOICE	0x03
+#define PCIS_SATCOM_DATA	0x04
+
+#define PCIC_CRYPTO	0x10
+#define PCIS_CRYPTO_NETCOMP	0x00
+#define PCIS_CRYPTO_ENTERTAIN	0x10
+#define PCIS_CRYPTO_OTHER	0x80
+
+#define PCIC_DASP	0x11
+#define PCIS_DASP_DPIO	0x00
+#define PCIS_DASP_OTHER	0x80
+
 #define PCIC_OTHER	0xff
 
 /* PCI power manangement */
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index 0ea232a..c36c692 100644
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -270,12 +270,15 @@ static struct
 	{PCIC_NETWORK,		PCIS_NETWORK_TOKENRING,	"token ring"},
 	{PCIC_NETWORK,		PCIS_NETWORK_FDDI,	"fddi"},
 	{PCIC_NETWORK,		PCIS_NETWORK_ATM,	"ATM"},
+	{PCIC_NETWORK,		PCIS_NETWORK_ISDN,	"ISDN"},
 	{PCIC_DISPLAY,		-1,			"display"},
 	{PCIC_DISPLAY,		PCIS_DISPLAY_VGA,	"VGA"},
 	{PCIC_DISPLAY,		PCIS_DISPLAY_XGA,	"XGA"},
+	{PCIC_DISPLAY,		PCIS_DISPLAY_3D,	"3D"},
 	{PCIC_MULTIMEDIA,	-1,			"multimedia"},
 	{PCIC_MULTIMEDIA,	PCIS_MULTIMEDIA_VIDEO,	"video"},
 	{PCIC_MULTIMEDIA,	PCIS_MULTIMEDIA_AUDIO,	"audio"},
+	{PCIC_MULTIMEDIA,	PCIS_MULTIMEDIA_TELE,	"telephony"},
 	{PCIC_MEMORY,		-1,			"memory"},
 	{PCIC_MEMORY,		PCIS_MEMORY_RAM,	"RAM"},
 	{PCIC_MEMORY,		PCIS_MEMORY_FLASH,	"flash"},
@@ -288,19 +291,24 @@ static struct
 	{PCIC_BRIDGE,		PCIS_BRIDGE_PCMCIA,	"PCI-PCMCIA"},
 	{PCIC_BRIDGE,		PCIS_BRIDGE_NUBUS,	"PCI-NuBus"},
 	{PCIC_BRIDGE,		PCIS_BRIDGE_CARDBUS,	"PCI-CardBus"},
-	{PCIC_BRIDGE,		PCIS_BRIDGE_OTHER,	"PCI-unknown"},
+	{PCIC_BRIDGE,		PCIS_BRIDGE_RACEWAY,	"PCI-RACEway"},
 	{PCIC_SIMPLECOMM,	-1,			"simple comms"},
 	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_UART,	"UART"},	/* could detect 16550 */
 	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_PAR,	"parallel port"},
+	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_MULSER,	"multiport serial"},
+	{PCIC_SIMPLECOMM,	PCIS_SIMPLECOMM_MODEM,	"generic modem"},
 	{PCIC_BASEPERIPH,	-1,			"base peripheral"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_PIC,	"interrupt controller"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_DMA,	"DMA controller"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_TIMER,	"timer"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_RTC,	"realtime clock"},
+	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_PCIHOT,	"PCI hot-plug controller"},
 	{PCIC_INPUTDEV,		-1,			"input device"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_KEYBOARD,	"keyboard"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_DIGITIZER,"digitizer"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_MOUSE,	"mouse"},
+	{PCIC_INPUTDEV,		PCIS_INPUTDEV_SCANNER,	"scanner"},
+	{PCIC_INPUTDEV,		PCIS_INPUTDEV_GAMEPORT,	"gameport"},
 	{PCIC_DOCKING,		-1,			"docking station"},
 	{PCIC_PROCESSOR,	-1,			"processor"},
 	{PCIC_SERIALBUS,	-1,			"serial bus"},
@@ -310,6 +318,22 @@ static struct
 	{PCIC_SERIALBUS,	PCIS_SERIALBUS_USB,	"USB"},
 	{PCIC_SERIALBUS,	PCIS_SERIALBUS_FC,	"Fibre Channel"},
 	{PCIC_SERIALBUS,	PCIS_SERIALBUS_SMBUS,	"SMBus"},
+	{PCIC_WIRELESS,		-1,			"wireless controller"},
+	{PCIC_WIRELESS,		PCIS_WIRELESS_IRDA,	"iRDA"},
+	{PCIC_WIRELESS,		PCIS_WIRELESS_IR,	"IR"},
+	{PCIC_WIRELESS,		PCIS_WIRELESS_RF,	"RF"},
+	{PCIC_INTELLIIO,	-1,			"intelligent I/O controller"},
+	{PCIC_INTELLIIO,	PCIS_INTELLIIO_I2O,	"I2O"},
+	{PCIC_SATCOM,		-1,			"satellite communication"},
+	{PCIC_SATCOM,		PCIS_SATCOM_TV,		"sat TV"},
+	{PCIC_SATCOM,		PCIS_SATCOM_AUDIO,	"sat audio"},
+	{PCIC_SATCOM,		PCIS_SATCOM_VOICE,	"sat voice"},
+	{PCIC_SATCOM,		PCIS_SATCOM_DATA,	"sat data"},
+	{PCIC_CRYPTO,		-1,			"encrypt/decrypt"},
+	{PCIC_CRYPTO,		PCIS_CRYPTO_NETCOMP,	"network/computer crypto"},
+	{PCIC_CRYPTO,		PCIS_CRYPTO_NETCOMP,	"entertainment crypto"},
+	{PCIC_DASP,		-1,			"dasp"},
+	{PCIC_DASP,		PCIS_DASP_DPIO,		"DPIO module"},
 	{0, 0,		NULL}
 };