From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 873A5A0561;
	Fri, 28 Feb 2020 07:08:20 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 9EB211C002;
	Fri, 28 Feb 2020 07:07:53 +0100 (CET)
Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com
 [209.85.167.66]) by dpdk.org (Postfix) with ESMTP id 74FFE1BFEB
 for <dev@dpdk.org>; Fri, 28 Feb 2020 07:07:43 +0100 (CET)
Received: by mail-lf1-f66.google.com with SMTP id 7so1192876lfz.11
 for <dev@dpdk.org>; Thu, 27 Feb 2020 22:07:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=EXN99hayHt9TaCz4X1kE4O/kpaUkvFkFy0iqbsXvqBQ=;
 b=TvUm4mdHJ3WTIJwP3Dm22R0mSLCoyGTs2DLK6zXZ+dJfLnJHknLv0YmdlwoiYIqBeQ
 6ADDaBteHl6ENElnatF2P+MdX1f0R2+neX+wdxBjnaWyC95zBsSuXYuWwIVh7IrDEaSs
 +0A4XkjfaadLKQHbM/T/vEtMwFQjncuY4pTA7PqQvE51jPIQaqef/0YwELDhtbbBlWcv
 bEyfUDMtvxQL9WXBAge2twpFE/uXdF55dphIg9dhELZXmdrrZLU1f7Row0sj3m66VFd4
 yrpDPCG+LRIu4OHEFoIiJmRmpQzurY/K2YCBsODek65sHHWhDdBZZ37jHl95UUzZodS0
 6ERw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=EXN99hayHt9TaCz4X1kE4O/kpaUkvFkFy0iqbsXvqBQ=;
 b=nJCQzKIJ4TTMlgMrL8WcCj1NoDNuYRXQES5033Fu5tw4J0D2tis6pFwlSsHtFwM8CH
 Qm7txswjZDUK1++ZIzMxxKztP+/Ngqd8XQcW114jQ3N0CVi0wrevcfTEj8PTFuAq9uJW
 j21yjXDcNToKSgXOXruk2RXpecabc4MSFBlyjvwANlogoNW/QcTVZzzQW75C4TaiTjHE
 JCmPlAoBS8Gsw/RNhAWTGn2dzpF5iCC3oP1+m9ifI6YCT1odGRGc0S/ITTAUt+eP9Yw9
 Nd1YKoBC9djvBzcDRimdAMQDd63NQigy4EYfiI4uhcZuXbdpkedlxkEvF09Lx/GdKZki
 TUtw==
X-Gm-Message-State: ANhLgQ2ZjDm+9WZFYWBl3rhkXI60TAwxMaOJZmJUBSXGKkz6Q7GLLwYM
 LEYU/25wByHA0mJbTzxnbqgi5GLn
X-Google-Smtp-Source: ADFU+vsf+mc0RjfJBb5lZHrnpGs+UeLyLARwVmZSPAqQpbfeX5Z8DJp5A899Bluu0+oR6Oywy6Z1ZA==
X-Received: by 2002:a19:c70c:: with SMTP id x12mr1678657lff.210.1582870062650; 
 Thu, 27 Feb 2020 22:07:42 -0800 (PST)
Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru.
 [37.110.65.23])
 by smtp.googlemail.com with ESMTPSA id r12sm4819281ljh.105.2020.02.27.22.07.41
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 27 Feb 2020 22:07:42 -0800 (PST)
From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
To: dev@dpdk.org
Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Date: Fri, 28 Feb 2020 09:07:26 +0300
Message-Id: <20200228060727.192491-5-dmitry.kozliuk@gmail.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20200228060727.192491-1-dmitry.kozliuk@gmail.com>
References: <20200227071126.75162e92@Sovereign>
 <20200228060727.192491-1-dmitry.kozliuk@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [RFC PATCH 4/5] netuio: change class for Net to custom
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

This resolves the issue with timeout on driver loading.

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@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