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

---
 sys/dev/netif/sis/if_sis.c    | 21 +++++++++++----------
 sys/dev/netif/sis/if_sisreg.h | 23 +----------------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index 7712940643..c3a6c0e089 100644
--- a/sys/dev/netif/sis/if_sis.c
+++ b/sys/dev/netif/sis/if_sis.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.31 2005/12/31 14:08:00 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.32 2006/08/01 18:09:37 swildner Exp $
  */
 
 /*
@@ -92,6 +92,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>
 
@@ -106,9 +107,9 @@
  * Various supported device vendors/types and their names.
  */
 static struct sis_type sis_devs[] = {
-	{ SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
-	{ SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },
-	{ NS_VENDORID, NS_DEVICEID_DP83815, "NatSemi DP8381[56] 10/100BaseTX" },
+	{ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_900, "SiS 900 10/100BaseTX" },
+	{ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7016, "SiS 7016 10/100BaseTX" },
+	{ PCI_VENDOR_NS, PCI_PRODUCT_NS_DP83815, "NatSemi DP8381[56] 10/100BaseTX" },
 	{ 0, 0, NULL }
 };
 
@@ -403,7 +404,7 @@ sis_find_bridge(device_t dev)
 		device_get_children(*busp, &pci_children, &pci_childcount);
 		for (j = 0, childp = pci_children; j < pci_childcount;
 		     j++, childp++) {
-			if (pci_get_vendor(*childp) == SIS_VENDORID &&
+			if (pci_get_vendor(*childp) == PCI_VENDOR_SIS &&
 			    pci_get_device(*childp) == 0x0008) {
 				child = *childp;
 				goto done;
@@ -959,11 +960,11 @@ sis_attach(device_t dev)
 	error = waittime = 0;
 	sc = device_get_softc(dev);
 
-	if (pci_get_device(dev) == SIS_DEVICEID_900)
+	if (pci_get_device(dev) == PCI_PRODUCT_SIS_900)
 		sc->sis_type = SIS_TYPE_900;
-	if (pci_get_device(dev) == SIS_DEVICEID_7016)
+	if (pci_get_device(dev) == PCI_PRODUCT_SIS_7016)
 		sc->sis_type = SIS_TYPE_7016;
-	if (pci_get_vendor(dev) == NS_VENDORID)
+	if (pci_get_vendor(dev) == PCI_VENDOR_NS)
 		sc->sis_type = SIS_TYPE_83815;
 
 	sc->sis_rev = pci_read_config(dev, PCIR_REVID, 1);
@@ -1056,7 +1057,7 @@ sis_attach(device_t dev)
 	 * Get station address from the EEPROM.
 	 */
 	switch (pci_get_vendor(dev)) {
-	case NS_VENDORID:
+	case PCI_VENDOR_NS:
 		/*
 		 * Reading the MAC address out of the EEPROM on
 		 * the NatSemi chip takes a bit more work than
@@ -1091,7 +1092,7 @@ sis_attach(device_t dev)
 			bcopy((char *)&tmp[1], eaddr, ETHER_ADDR_LEN);
 		}
 		break;
-	case SIS_VENDORID:
+	case PCI_VENDOR_SIS:
 	default:
 #ifdef __i386__
 		/*
diff --git a/sys/dev/netif/sis/if_sisreg.h b/sys/dev/netif/sis/if_sisreg.h
index 30aed1841e..7cb2a14047 100644
--- a/sys/dev/netif/sis/if_sisreg.h
+++ b/sys/dev/netif/sis/if_sisreg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.1.4.11 2003/02/05 21:49:01 mbr Exp $
- * $DragonFly: src/sys/dev/netif/sis/if_sisreg.h,v 1.6 2004/05/06 10:15:37 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sis/if_sisreg.h,v 1.7 2006/08/01 18:09:37 swildner Exp $
  */
 
 /*
@@ -380,17 +380,6 @@ struct sis_ring_data {
 };
 
 
-/*
- * SiS PCI vendor ID.
- */
-#define SIS_VENDORID		0x1039
-
-/*
- * SiS PCI device IDs
- */
-#define SIS_DEVICEID_900	0x0900
-#define SIS_DEVICEID_7016	0x7016
-
 /*
  * SiS 900 PCI revision codes.
  */
@@ -403,16 +392,6 @@ struct sis_ring_data {
 #define SIS_REV_635		0x0090
 #define SIS_REV_96x		0x0091
 
-/*
- * NatSemi vendor ID
- */
-#define NS_VENDORID		0x100B
-
-/*
- * DP83815 device ID
- */
-#define NS_DEVICEID_DP83815	0x0020
-
 struct sis_type {
 	uint16_t		sis_vid;
 	uint16_t		sis_did;
-- 
2.41.0