From e3a079b5402ccdd97555d635856de665243b0db7 Mon Sep 17 00:00:00 2001
From: gdamore <gdamore@NetBSD.org>
Date: Fri, 21 Jul 2006 17:20:20 +0000
Subject: [PATCH] Update ADMtek pci device ids to match data sheets.  While
 here, add the 9513 device (although I've never seen one, I have a datasheet
 for it. :-)

---
 sys/dev/cardbus/if_tlp_cardbus.c |  8 ++++----
 sys/dev/pci/if_tlp_pci.c         | 10 ++++++----
 sys/dev/pci/pcidevs              | 11 ++++++-----
 sys/dev/pci/pcidevs.h            | 11 ++++++-----
 sys/dev/pci/pcidevs_data.h       | 24 ++++++++++++++----------
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/sys/dev/cardbus/if_tlp_cardbus.c b/sys/dev/cardbus/if_tlp_cardbus.c
index 365409b653ec..a8482c85573e 100644
--- a/sys/dev/cardbus/if_tlp_cardbus.c
+++ b/sys/dev/cardbus/if_tlp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tlp_cardbus.c,v 1.49 2006/03/29 06:22:38 thorpej Exp $	*/
+/*	$NetBSD: if_tlp_cardbus.c,v 1.50 2006/07/21 17:20:21 gdamore Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.49 2006/03/29 06:22:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.50 2006/07/21 17:20:21 gdamore Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -142,7 +142,7 @@ const struct tulip_cardbus_product {
 	{ PCI_VENDOR_XIRCOM,	PCI_PRODUCT_XIRCOM_X3201_3_21143,
 	  TULIP_CHIP_X3201_3 },
 
-	{ PCI_VENDOR_ADMTEK,	PCI_PRODUCT_ADMTEK_AN985,
+	{ PCI_VENDOR_ADMTEK,	PCI_PRODUCT_ADMTEK_AN983,
 	  TULIP_CHIP_AN985 },
 
 	{ PCI_VENDOR_ACCTON,	PCI_PRODUCT_ACCTON_EN2242,
@@ -160,7 +160,7 @@ const struct tulip_cardbus_product {
 	{ PCI_VENDOR_HAWKING,	PCI_PRODUCT_HAWKING_PN672TX,
 	  TULIP_CHIP_AN985 },
 
-	{ PCI_VENDOR_ADMTEK,	PCI_PRODUCT_ADMTEK_AN985_2,
+	{ PCI_VENDOR_ADMTEK,	PCI_PRODUCT_ADMTEK_AN985,
 	  TULIP_CHIP_AN985 },
 
 	{ PCI_VENDOR_MICROSOFT,	PCI_PRODUCT_MICROSOFT_MN120,
diff --git a/sys/dev/pci/if_tlp_pci.c b/sys/dev/pci/if_tlp_pci.c
index 84b4093f53d1..3e0929076d9e 100644
--- a/sys/dev/pci/if_tlp_pci.c
+++ b/sys/dev/pci/if_tlp_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tlp_pci.c,v 1.93 2006/07/18 14:26:57 itohy Exp $	*/
+/*	$NetBSD: if_tlp_pci.c,v 1.94 2006/07/21 17:20:20 gdamore Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.93 2006/07/18 14:26:57 itohy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.94 2006/07/21 17:20:20 gdamore Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -161,9 +161,11 @@ static const struct tulip_pci_product {
 	{ PCI_VENDOR_ADMTEK,		PCI_PRODUCT_ADMTEK_AL981,
 	  TULIP_CHIP_AL981 },
 
-	{ PCI_VENDOR_ADMTEK,		PCI_PRODUCT_ADMTEK_AN985,
+	{ PCI_VENDOR_ADMTEK,		PCI_PRODUCT_ADMTEK_AN983,
 	  TULIP_CHIP_AN985 },
-	{ PCI_VENDOR_ADMTEK,		PCI_PRODUCT_ADMTEK_AN983B,
+	{ PCI_VENDOR_ADMTEK,		PCI_PRODUCT_ADMTEK_ADM9511,
+	  TULIP_CHIP_AN985 },
+	{ PCI_VENDOR_ADMTEK,		PCI_PRODUCT_ADMTEK_ADM9513,
 	  TULIP_CHIP_AN985 },
 	{ PCI_VENDOR_ACCTON,		PCI_PRODUCT_ACCTON_EN2242,
 	  TULIP_CHIP_AN985 },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 8045f072eb14..e532f97f1ec5 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.807 2006/07/18 14:19:14 itohy Exp $
+$NetBSD: pcidevs,v 1.808 2006/07/21 17:20:20 gdamore Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -822,11 +822,12 @@ product ADDTRON 8139	0x1360	8139 Ethernet
 product ADDTRON RHINEII	0x1320	Rhine II 10/100 Ethernet
 
 /* ADMtek products */
-product ADMTEK AL981	0x0981	AL981 10/100 Ethernet
-product ADMTEK AN985	0x0985	AN985 10/100 Ethernet
-product ADMTEK AN985_2	0x1985	AN985 10/100 Ethernet (OEM)
+product ADMTEK AL981	0x0981	AL981 (Comet) 10/100 Ethernet
+product ADMTEK AN983	0x0985	AN983 (Centaur-P) 10/100 Ethernet
+product ADMTEK AN985	0x1985	AN985 (Centaur-C) 10/100 Ethernet
 product ADMTEK ADM8211	0x8201	ADM8211 11Mbps 802.11b WLAN
-product ADMTEK AN983B	0x9511	AN983B 10/100 Ethernet
+product ADMTEK ADM9511	0x9511	ADM9511 (Centaur-II) 10/100 Ethernet
+product ADMTEK ADM9513	0x9513	ADM9513 (Centaur-II) 10/100 Ethernet
 
 /* Advanced System Products */
 product ADVSYS 1200A	0x1100
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 6656b42255d8..60cb3cf7ed8f 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcidevs.h,v 1.806 2006/07/18 14:21:02 itohy Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.807 2006/07/21 17:20:20 gdamore Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -829,11 +829,12 @@
 #define	PCI_PRODUCT_ADDTRON_RHINEII	0x1320		/* Rhine II 10/100 Ethernet */
 
 /* ADMtek products */
-#define	PCI_PRODUCT_ADMTEK_AL981	0x0981		/* AL981 10/100 Ethernet */
-#define	PCI_PRODUCT_ADMTEK_AN985	0x0985		/* AN985 10/100 Ethernet */
-#define	PCI_PRODUCT_ADMTEK_AN985_2	0x1985		/* AN985 10/100 Ethernet (OEM) */
+#define	PCI_PRODUCT_ADMTEK_AL981	0x0981		/* AL981 (Comet) 10/100 Ethernet */
+#define	PCI_PRODUCT_ADMTEK_AN983	0x0985		/* AN983 (Centaur-P) 10/100 Ethernet */
+#define	PCI_PRODUCT_ADMTEK_AN985	0x1985		/* AN985 (Centaur-C) 10/100 Ethernet */
 #define	PCI_PRODUCT_ADMTEK_ADM8211	0x8201		/* ADM8211 11Mbps 802.11b WLAN */
-#define	PCI_PRODUCT_ADMTEK_AN983B	0x9511		/* AN983B 10/100 Ethernet */
+#define	PCI_PRODUCT_ADMTEK_ADM9511	0x9511		/* ADM9511 (Centaur-II) 10/100 Ethernet */
+#define	PCI_PRODUCT_ADMTEK_ADM9513	0x9513		/* ADM9513 (Centaur-II) 10/100 Ethernet */
 
 /* Advanced System Products */
 #define	PCI_PRODUCT_ADVSYS_1200A	0x1100
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index c1bb15d274c5..b8397252383c 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcidevs_data.h,v 1.805 2006/07/18 14:21:02 itohy Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.806 2006/07/21 17:20:20 gdamore Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -3005,23 +3005,27 @@ static const struct pci_product pci_products[] = {
 	},
 	{
 	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AL981,
-	    "AL981 10/100 Ethernet",
+	    "AL981 (Comet) 10/100 Ethernet",
+	},
+	{
+	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN983,
+	    "AN983 (Centaur-P) 10/100 Ethernet",
 	},
 	{
 	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN985,
-	    "AN985 10/100 Ethernet",
-	},
-	{
-	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN985_2,
-	    "AN985 10/100 Ethernet (OEM)",
+	    "AN985 (Centaur-C) 10/100 Ethernet",
 	},
 	{
 	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_ADM8211,
 	    "ADM8211 11Mbps 802.11b WLAN",
 	},
 	{
-	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN983B,
-	    "AN983B 10/100 Ethernet",
+	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_ADM9511,
+	    "ADM9511 (Centaur-II) 10/100 Ethernet",
+	},
+	{
+	    PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_ADM9513,
+	    "ADM9513 (Centaur-II) 10/100 Ethernet",
 	},
 	{
 	    PCI_VENDOR_ADVSYS, PCI_PRODUCT_ADVSYS_1200A,
@@ -11768,4 +11772,4 @@ static const struct pci_product pci_products[] = {
 	    "Video Controller",
 	},
 };
-const int pci_nproducts = 2349;
+const int pci_nproducts = 2350;