From 726ffe43ddecb4c292d86dce38e0e02a93717113 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Tue, 1 Aug 2006 18:11:20 +0000
Subject: [PATCH] Use pcidevs.h.

---
 sys/dev/netif/vr/if_vr.c    | 17 +++++++++--------
 sys/dev/netif/vr/if_vrreg.h | 36 +-----------------------------------
 2 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index 113901925a..b33364709a 100644
--- a/sys/dev/netif/vr/if_vr.c
+++ b/sys/dev/netif/vr/if_vr.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.41 2005/12/31 14:08:00 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.42 2006/08/01 18:11:20 swildner Exp $
  */
 
 /*
@@ -93,6 +93,7 @@
 #include <dev/netif/mii_layer/mii.h>
 #include <dev/netif/mii_layer/miivar.h>
 
+#include <bus/pci/pcidevs.h>
 #include <bus/pci/pcireg.h>
 #include <bus/pci/pcivar.h>
 
@@ -109,19 +110,19 @@
  * Various supported device vendors/types and their names.
  */
 static struct vr_type vr_devs[] = {
-	{ VIA_VENDORID, VIA_DEVICEID_RHINE,
+	{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT3043,
 		"VIA VT3043 Rhine I 10/100BaseTX" },
-	{ VIA_VENDORID, VIA_DEVICEID_RHINE_II,
+	{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C100A,
 		"VIA VT86C100A Rhine II 10/100BaseTX" },
-	{ VIA_VENDORID, VIA_DEVICEID_RHINE_II_2,
+	{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6102,
 		"VIA VT6102 Rhine II 10/100BaseTX" },
-	{ VIA_VENDORID, VIA_DEVICEID_RHINE_III,
+	{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6105,
 		"VIA VT6105 Rhine III 10/100BaseTX" },
-	{ VIA_VENDORID, VIA_DEVICEID_RHINE_III_M,
+	{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6105M,
 		"VIA VT6105M Rhine III 10/100BaseTX" },
-	{ DELTA_VENDORID, DELTA_DEVICEID_RHINE_II,
+	{ PCI_VENDOR_DELTA, PCI_PRODUCT_DELTA_RHINEII,
 		"Delta Electronics Rhine II 10/100BaseTX" },
-	{ ADDTRON_VENDORID, ADDTRON_DEVICEID_RHINE_II,
+	{ PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_RHINEII,
 		"Addtron Technology Rhine II 10/100BaseTX" },
 	{ 0, 0, NULL }
 };
diff --git a/sys/dev/netif/vr/if_vrreg.h b/sys/dev/netif/vr/if_vrreg.h
index a7d7fdf759..007e664a0e 100644
--- a/sys/dev/netif/vr/if_vrreg.h
+++ b/sys/dev/netif/vr/if_vrreg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_vrreg.h,v 1.7.2.5 2003/02/06 04:46:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/vr/if_vrreg.h,v 1.8 2005/11/21 13:20:29 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/vr/if_vrreg.h,v 1.9 2006/08/01 18:11:20 swildner Exp $
  */
 
 /*
@@ -500,40 +500,6 @@ struct vr_softc {
 /*
  * General constants that are fun to know.
  *
- * VIA vendor ID
- */
-#define	VIA_VENDORID			0x1106
-
-/*
- * VIA Rhine device IDs.
- */
-#define	VIA_DEVICEID_RHINE		0x3043
-#define VIA_DEVICEID_RHINE_II		0x6100
-#define VIA_DEVICEID_RHINE_II_2		0x3065
-#define VIA_DEVICEID_RHINE_III		0x3106
-#define VIA_DEVICEID_RHINE_III_M	0x3053
-
-/*
- * Delta Electronics device ID.
- */
-#define DELTA_VENDORID			0x1500
-
-/*
- * Delta device IDs.
- */
-#define DELTA_DEVICEID_RHINE_II		0x1320
-
-/*
- * Addtron vendor ID.
- */
-#define ADDTRON_VENDORID		0x4033
-
-/*
- * Addtron device IDs.
- */
-#define ADDTRON_DEVICEID_RHINE_II	0x1320
-
-/*
  * VIA Rhine revision IDs
  */
 
-- 
2.41.0