From 065a50f8cfa18254f64def684fc0f840b2823741 Mon Sep 17 00:00:00 2001
From: bsh <bsh@NetBSD.org>
Date: Thu, 3 Aug 2006 03:01:39 +0000
Subject: [PATCH] Device 10de:026c is not AC-97 controller but nForce430 HD
 Audio controller.

Pointed out by Brad.  Thanks.
---
 sys/dev/pci/auich.c | 10 ++++------
 sys/dev/pci/pcidevs |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 84aaeedffbb9..6e5c2272b9fe 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: auich.c,v 1.110 2006/08/01 18:31:53 bsh Exp $	*/
+/*	$NetBSD: auich.c,v 1.111 2006/08/03 03:01:39 bsh Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.110 2006/08/01 18:31:53 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.111 2006/08/03 03:01:39 bsh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -377,8 +377,7 @@ static const struct audio_format auich_modem_formats[AUICH_MODEM_NFORMATS] = {
 #define PCIID_NFORCE3		PCI_ID_CODE0(NVIDIA, NFORCE3_MCPT_AC)
 #define PCIID_NFORCE3_250	PCI_ID_CODE0(NVIDIA, NFORCE3_250_MCPT_AC)
 #define PCIID_NFORCE4		PCI_ID_CODE0(NVIDIA, NFORCE4_AC)
-#define	PCIID_NFORCE430_1	PCI_ID_CODE0(NVIDIA, NFORCE430_AC1) /* nForce410? */
-#define	PCIID_NFORCE430_2	PCI_ID_CODE0(NVIDIA, NFORCE430_AC2)
+#define	PCIID_NFORCE430 	PCI_ID_CODE0(NVIDIA, NFORCE430_AC)
 #define PCIID_AMD768		PCI_ID_CODE0(AMD, PBC768_AC)
 #define PCIID_AMD8111		PCI_ID_CODE0(AMD, PBC8111_AC)
 
@@ -409,8 +408,7 @@ static const struct auich_devtype auich_audio_devices[] = {
 	{ PCIID_NFORCE3, "nForce3 MCP-T AC-97 Audio",	"nForce3" },
 	{ PCIID_NFORCE3_250, "nForce3 250 MCP-T AC-97 Audio", "nForce3" },
 	{ PCIID_NFORCE4, "nForce4 AC-97 Audio",		"nForce4" },
-	{ PCIID_NFORCE430_1, "nForce430 (MCP51) AC-97 Audio", "nForce430" },
-	{ PCIID_NFORCE430_2, "nForce430 (MCP51) AC-97 Audio", "nForce430" },
+	{ PCIID_NFORCE430, "nForce430 (MCP51) AC-97 Audio", "nForce430" },
 	{ PCIID_AMD768,	"AMD768 AC-97 Audio",		"AMD768" },
 	{ PCIID_AMD8111,"AMD8111 AC-97 Audio",		"AMD8111" },
 	{ 0,		NULL,				NULL },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 338717bb9e51..d282c6d81281 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.813 2006/08/01 20:37:02 xtraeme Exp $
+$NetBSD: pcidevs,v 1.814 2006/08/03 03:01:39 bsh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2641,8 +2641,8 @@ product NVIDIA	NFORCE430_SATA1	0x0266	nForce430 Serial SATA Controller
 product NVIDIA	NFORCE430_SATA2	0x0267	nForce430 Serial SATA Controller
 product NVIDIA	NFORCE430_LAN1	0x0268	nForce430 Gigabit Ethernet Controller
 product NVIDIA	NFORCE430_LAN2	0x0269	nForce430 Gigabit Ethernet Controller
-product NVIDIA	NFORCE430_AC1	0x026b	nForce430 AC-97
-product NVIDIA	NFORCE430_AC2	0x026c	nForce430 AC-97
+product NVIDIA	NFORCE430_AC	0x026b	nForce430 AC-97 Audio Controller
+product NVIDIA	NFORCE430_HDA	0x026c	nForce430 High Definition Audio Controller
 product NVIDIA	NFORCE430_OHCI	0x026d	nForce430 USB Controller
 product NVIDIA	NFORCE430_EHCI	0x026e	nForce430 USB2 Controller
 product NVIDIA	GF4_TI_4800	0x0280	GeForce4 Ti 4800