Support multiple PCI class codes for filtering

Author: a1ive

docs/README.md

@@ -125,9 +125,9 @@ Exports active physical network interfaces with IPv4 addresses to `report.html`
 - --display[=`FILE`]  
   Print EDID info.  
   `FILE` specifies the file name of the SPD dump.  
-- --pci[=`CLASS`]  
+- --pci[=`CLASS,..`]  
   Print PCI info.  
-  `CLASS` specifies the class code of PCI devices, e.g. `0C05` (SMBus).  
+  `CLASS` specifies the class codes of PCI devices, e.g. `0c05` or `03,0c05`..  
 - --spd[=`FILE`]  
   Print DIMM SPD info.  
   Driver is required to access SPD data.  

libnw/gpu.c

@@ -41,7 +41,10 @@ PNWLIB_GPU_INFO NWL_InitGpu(VOID)
 	info->Initialized = 1;
 
 	// TODO: Get GPU vendor/device from pci.ids
-	info->PciList = NWL_EnumPci(NWL_NodeAlloc("PCI", NFLG_TABLE), "03");
+	PNWL_ARG_SET pciClasses = NULL;
+	NWL_ArgSetAddStr(&pciClasses, "03");
+	info->PciList = NWL_EnumPci(NWL_NodeAlloc("PCI", NFLG_TABLE), pciClasses);
+	NWL_ArgSetFree(pciClasses);
 	return info;
 }
 

libnw/libnw.c

@@ -178,6 +178,7 @@ VOID NW_Print(LPCSTR lpFileName)
 VOID NW_Fini(VOID)
 {
 	NWL_ArgSetFree(NWLC->SmbiosTypes);
+	NWL_ArgSetFree(NWLC->PciClasses);
 	if (NWLC->NwRsdp)
 		free(NWLC->NwRsdp);
 	if (NWLC->NwRsdt)

libnw/libnw.h

@@ -73,7 +73,7 @@ typedef struct _NWLIB_CONTEXT
 	LPCSTR DevTreeFilter;
 	DWORD AcpiTable;
 	PNWL_ARG_SET SmbiosTypes;
-	LPCSTR PciClass;
+	PNWL_ARG_SET PciClasses;
 	LPSTR DiskPath;
 	LPSTR NetGuid;
 	LPCSTR ProductPolicy;
@@ -253,7 +253,7 @@ typedef struct _NWLIB_NET_TRAFFIC
 } NWLIB_NET_TRAFFIC;
 LIBNW_API VOID NWL_GetNetTraffic(NWLIB_NET_TRAFFIC* info, BOOL bit);
 
-LIBNW_API PNODE NWL_EnumPci(PNODE pNode, LPCSTR pciClass);
+LIBNW_API PNODE NWL_EnumPci(PNODE pNode, PNWL_ARG_SET pciClasses);
 
 typedef struct _NWLIB_CUR_DISPLAY
 {

libnw/pci.c

@@ -8,6 +8,7 @@
 
 #include "libnw.h"
 #include "utils.h"
+#include "stb_ds.h"
 
 static void
 PrintDriverInfo(PNODE pNode, HDEVINFO hInfo, SP_DEVINFO_DATA* spData)
@@ -38,7 +39,25 @@ PrintDriverInfo(PNODE pNode, HDEVINFO hInfo, SP_DEVINFO_DATA* spData)
 		NWL_NodeAttrSet(pNode, "Inf Section", NWL_Ucs2ToUtf8(NWLC->NwBufW), 0);
 }
 
-PNODE NWL_EnumPci(PNODE pNode, LPCSTR pciClass)
+static BOOL
+MatchPciClass(PNWL_ARG_SET pciClasses, const char* hwClass)
+{
+	if (!pciClasses)
+		return TRUE;
+
+	for (ptrdiff_t i = 0; i < hmlen(pciClasses); i++)
+	{
+		const char* pciClass = pciClasses[i].key.Str;
+		size_t classLen = strnlen_s(pciClass, 6);
+
+		if (_strnicmp(pciClass, hwClass, classLen) == 0)
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+PNODE NWL_EnumPci(PNODE pNode, PNWL_ARG_SET pciClasses)
 {
 	HDEVINFO hInfo = NULL;
 	DWORD i = 0;
@@ -67,14 +86,8 @@ PNODE NWL_EnumPci(PNODE pNode, LPCSTR pciClass)
 				break;
 			}
 		}
-		if (pciClass)
-		{
-			size_t PciClassLen = strlen(pciClass);
-			if (PciClassLen > 6)
-				PciClassLen = 6;
-			if (_strnicmp(pciClass, hwClass, PciClassLen) != 0)
-				continue;
-		}
+		if (!MatchPciClass(pciClasses, hwClass))
+			continue;
 		npci = NWL_NodeAppendNew(pNode, "Device", NFLG_TABLE_ROW);
 
 		NWL_NodeAttrSet(npci, "HWID", NWL_Ucs2ToUtf8(NWLC->NwBufW), 0);
@@ -107,5 +120,5 @@ PNODE NW_Pci(BOOL bAppend)
 	PNODE node = NWL_NodeAlloc("PCI", NFLG_TABLE);
 	if (bAppend)
 		NWL_NodeAppendChild(NWLC->NwRoot, node);
-	return NWL_EnumPci(node, NWLC->PciClass);
+	return NWL_EnumPci(node, NWLC->PciClasses);
 }

nwinfo.c

@@ -143,9 +143,9 @@ static void nwinfo_help(void)
 		"                   'NOCSMI' and 'CSMIRAID'.\n"
 		"  --display[=FILE] Print EDID info.\n"
 		"    FILE           Specify the file name of the EDID dump.\n"
-		"  --pci[=CLASS]    Print PCI info.\n"
-		"                   CLASS specifies the class code of PCI devices,\n"
-		"                   e.g. '0C05' (SMBus).\n"
+		"  --pci[=CLASS,..] Print PCI info.\n"
+		"                   CLASS specifies the class codes of PCI devices,\n"
+		"                   e.g. '0c05' or '03,0c05'.\n"
 		"  --usb            Print USB info.\n"
 		"  --spd[=FILE]     Print DIMM SPD info.\n"
 		"                   WARNING: This option may damage the hardware.\n"
@@ -275,6 +275,7 @@ int main(int argc, char* argv[])
 	nwContext.AcpiTable = 0;
 	nwContext.SmbiosTypes = NULL;
 	nwContext.DiskPath = NULL;
+	nwContext.PciClasses = NULL;
 
 	struct optparse options;
 	optparse_init(&options, argv);
@@ -354,8 +355,7 @@ int main(int argc, char* argv[])
 			nwContext.AcpiInfo = TRUE;
 			break;
 		case NW_OPT_SMBIOS:
-			if (options.optarg && options.optarg[0])
-				nwinfo_parse_arg_set(options.optarg, &nwContext.SmbiosTypes, FALSE);
+			nwinfo_parse_arg_set(options.optarg, &nwContext.SmbiosTypes, FALSE);
 			nwContext.DmiInfo = TRUE;
 			break;
 		case NW_OPT_DISK:
@@ -420,8 +420,7 @@ int main(int argc, char* argv[])
 			nwContext.EdidInfo = TRUE;
 			break;
 		case NW_OPT_PCI:
-			if (options.optarg && options.optarg[0])
-				nwContext.PciClass = options.optarg;
+			nwinfo_parse_arg_set(options.optarg, &nwContext.PciClasses, TRUE);
 			nwContext.PciInfo = TRUE;
 			break;
 		case NW_OPT_USB: