This resolves the issue with timeout on driver loading.

Signed-off-by: Dmitry Kozlyuk <dmitry.kozl...@gmail.com>
---
 drivers/bus/pci/windows/pci.c    |  3 ++-
 kernel/windows/netuio/netuio.inf | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index 4ffa6a610..de385bf89 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -731,7 +731,8 @@ rte_pci_scan(void)
        SP_DEVINFO_DATA     DeviceInfoData = { 0 };
        int                 ret = -1;
 
-       hDevInfo = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL, 
DIGCF_PRESENT);
+       hDevInfo = SetupDiGetClassDevs(
+               NULL, L"PCI", NULL, DIGCF_ALLCLASSES | DIGCF_PRESENT);
        if (INVALID_HANDLE_VALUE == hDevInfo) {
                RTE_LOG(ERR, EAL, "Unable to enumerate PCI devices.\n", 
__func__);
                goto end;
diff --git a/kernel/windows/netuio/netuio.inf b/kernel/windows/netuio/netuio.inf
index 4c4d5e047..e244bed3a 100644
--- a/kernel/windows/netuio/netuio.inf
+++ b/kernel/windows/netuio/netuio.inf
@@ -36,12 +36,19 @@
 
 [Version]
 Signature="$WINDOWS NT$"
-Class=Net
-ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
+Class=UIO
+ClassGuid={86807C09-8149-4C34-9F2D-82575B8369DA}
 Provider=%Intel%
 CatalogFile=netuio.cat
 DriverVer=
 
+[ClassInstall32]
+Addreg=UioClassReg
+
+[UioClassReg]
+HKR,,,0,%ClassName%
+HKR,,Icon,,-5
+
 ;*****************************************
 ; Install Section
 ;*****************************************
-- 
2.25.1

Reply via email to