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

---
 sys/dev/netif/wb/if_wb.c    |  7 ++++---
 sys/dev/netif/wb/if_wbreg.h | 22 +---------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index f6385a1e1b..54e0144a48 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.35 2006/06/25 11:02:39 corecode Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.36 2006/08/01 18:11:47 swildner Exp $
  */
 
 /*
@@ -111,6 +111,7 @@
 #include <sys/bus.h>
 #include <sys/rman.h>
 
+#include <bus/pci/pcidevs.h>
 #include <bus/pci/pcireg.h>
 #include <bus/pci/pcivar.h>
 
@@ -128,9 +129,9 @@
  * Various supported device vendors/types and their names.
  */
 static struct wb_type wb_devs[] = {
-	{ WB_VENDORID, WB_DEVICEID_840F,
+	{ PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W89C840F,
 		"Winbond W89C840F 10/100BaseTX" },
-	{ CP_VENDORID, CP_DEVICEID_RL100,
+	{ PCI_VENDOR_COMPEX, PCI_PRODUCT_COMPEX_RL100ATX,
 		"Compex RL100-ATX 10/100baseTX" },
 	{ 0, 0, NULL }
 };
diff --git a/sys/dev/netif/wb/if_wbreg.h b/sys/dev/netif/wb/if_wbreg.h
index 965af3e3a2..7874d2221d 100644
--- a/sys/dev/netif/wb/if_wbreg.h
+++ b/sys/dev/netif/wb/if_wbreg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wbreg.h,v 1.7 1999/08/30 23:08:30 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wbreg.h,v 1.7 2005/06/10 16:05:34 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wbreg.h,v 1.8 2006/08/01 18:11:47 swildner Exp $
  */
 
 /*
@@ -402,26 +402,6 @@ struct wb_softc {
 /*
  * General constants that are fun to know.
  *
- * Winbond PCI vendor ID
- */
-#define	WB_VENDORID		0x1050
-
-/*
- * Winbond device IDs.
- */
-#define	WB_DEVICEID_840F	0x0840
-
-/*
- * Compex vendor ID.
- */
-#define CP_VENDORID		0x11F6
-
-/*
- * Compex device IDs.
- */
-#define CP_DEVICEID_RL100	0x2011
-
-/*
  * PCI low memory base and low I/O base register, and
  * other PCI registers.
  */
-- 
2.41.0