Module Name: src
Committed By: martin
Date: Tue Feb 17 15:06:07 UTC 2015
Modified Files:
src/sys/arch/x86/pci [netbsd-7]: ichlpcib.c
src/sys/dev/pci [netbsd-7]: ichsmb.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #528):
sys/dev/pci/ichsmb.c: revision 1.38
sys/dev/pci/pcidevs: revision 1.1206
sys/dev/pci/pcidevs: revision 1.1207
sys/arch/x86/pci/ichlpcib.c: revision 1.44
Change Intel 0x0434 entry:
- Rename DH89XX_QA to DH89XXCC_IQIA
- Modify the description to DH89xxCC PCIe Endpoint and QuickAssist
(include typo fix)
- Rename DH89xxCC's names from DH89XX_ to DH89XXCC_.
- Add some DH89xxCC's devices.
- Add DH89XXCL's devices.
- Rename PCI_PRODUCT_INTEL_DH89XX_SMB to PCI_PRODUCT_INTEL_DH89XXCC_SMB
- Add PCI_PRODUCT_INTEL_DH89XXCL_SMB
Add DH89xxC[CL] LPC devices.
To generate a diff of this commit:
cvs rdiff -u -r1.43.4.2 -r1.43.4.3 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/dev/pci/ichsmb.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/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.43.4.2 src/sys/arch/x86/pci/ichlpcib.c:1.43.4.3
--- src/sys/arch/x86/pci/ichlpcib.c:1.43.4.2 Mon Jan 26 16:16:11 2015
+++ src/sys/arch/x86/pci/ichlpcib.c Tue Feb 17 15:06:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.43.4.2 2015/01/26 16:16:11 martin Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.43.4.3 2015/02/17 15:06:07 martin Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.2 2015/01/26 16:16:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.3 2015/02/17 15:06:07 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -262,6 +262,8 @@ static struct lpcib_device {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C226_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H81_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DH89XXCC_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DH89XXCL_LPC, 1, 0 },
#if 0
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_PCU_1, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_PCU_2, 1, 0 },
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.37 src/sys/dev/pci/ichsmb.c:1.37.2.1
--- src/sys/dev/pci/ichsmb.c:1.37 Wed Jul 2 19:49:38 2014
+++ src/sys/dev/pci/ichsmb.c Tue Feb 17 15:06:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.37 2014/07/02 19:49:38 riastradh Exp $ */
+/* $NetBSD: ichsmb.c,v 1.37.2.1 2015/02/17 15:06:07 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37 2014/07/02 19:49:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37.2.1 2015/02/17 15:06:07 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -117,7 +117,8 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_C600_SMB_1:
case PCI_PRODUCT_INTEL_C600_SMB_2:
case PCI_PRODUCT_INTEL_EP80579_SMB:
- case PCI_PRODUCT_INTEL_DH89XX_SMB:
+ case PCI_PRODUCT_INTEL_DH89XXCC_SMB:
+ case PCI_PRODUCT_INTEL_DH89XXCL_SMB:
case PCI_PRODUCT_INTEL_C2000_PCU_SMBUS:
return 1;
}
