Module Name: src
Committed By: msaitoh
Date: Mon Jun 6 14:33:32 UTC 2011
Modified Files:
src/sys/arch/i386/pci: pci_intr_fixup.c
src/sys/arch/x86/pci: ichlpcib.c
Log Message:
Rename to use PCI_PRODUCT_INTEL_82801DBM_LPC
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/pci/pci_intr_fixup.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/pci/ichlpcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/pci/pci_intr_fixup.c
diff -u src/sys/arch/i386/pci/pci_intr_fixup.c:1.47 src/sys/arch/i386/pci/pci_intr_fixup.c:1.48
--- src/sys/arch/i386/pci/pci_intr_fixup.c:1.47 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pci/pci_intr_fixup.c Mon Jun 6 14:33:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_fixup.c,v 1.47 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: pci_intr_fixup.c,v 1.48 2011/06/06 14:33:31 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.47 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.48 2011/06/06 14:33:31 msaitoh Exp $");
#include "opt_pcibios.h"
#include "opt_pcifixup.h"
@@ -148,7 +148,7 @@
ich_init, NULL }, /* ICH3M */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DB_LPC,
ich_init, NULL }, /* ICH4 */
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DB_ISA,
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DBM_LPC,
ich_init, NULL }, /* ICH4M */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801EB_LPC,
ich_init, NULL }, /* ICH5 */
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.29 src/sys/arch/x86/pci/ichlpcib.c:1.30
--- src/sys/arch/x86/pci/ichlpcib.c:1.29 Mon Apr 4 20:37:55 2011
+++ src/sys/arch/x86/pci/ichlpcib.c Mon Jun 6 14:33:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.29 2011/04/04 20:37:55 dyoung Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.30 2011/06/06 14:33:31 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.29 2011/04/04 20:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.30 2011/06/06 14:33:31 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -183,7 +183,7 @@
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801CA_LPC, 0, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801CAM_LPC, 0, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DB_LPC, 0, 0 },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DB_ISA, 0, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DBM_LPC, 0, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801EB_LPC, 0, 1 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FB_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801FBM_LPC, 1, 0 },
@@ -805,7 +805,7 @@
int rv;
/* Supported on ICH2-M, ICH3-M and ICH4-M. */
- if (PCI_PRODUCT(sc->sc_pa.pa_id) == PCI_PRODUCT_INTEL_82801DB_ISA ||
+ if (PCI_PRODUCT(sc->sc_pa.pa_id) == PCI_PRODUCT_INTEL_82801DBM_LPC ||
PCI_PRODUCT(sc->sc_pa.pa_id) == PCI_PRODUCT_INTEL_82801CAM_LPC ||
(PCI_PRODUCT(sc->sc_pa.pa_id) == PCI_PRODUCT_INTEL_82801BAM_LPC &&
pci_find_device(&sc->sc_pa, speedstep_bad_hb_check) == 0)) {
