Module Name: src
Committed By: njoly
Date: Fri Jul 30 15:28:09 UTC 2010
Modified Files:
src/sys/dev/pci: ichsmb.c piixide.c
Log Message:
Adjust for Intel ICH10 devices update.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/piixide.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/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.22 src/sys/dev/pci/ichsmb.c:1.23
--- src/sys/dev/pci/ichsmb.c:1.22 Sat Feb 6 14:09:25 2010
+++ src/sys/dev/pci/ichsmb.c Fri Jul 30 15:28:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.22 2010/02/06 14:09:25 tnn Exp $ */
+/* $NetBSD: ichsmb.c,v 1.23 2010/07/30 15:28:09 njoly 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.22 2010/02/06 14:09:25 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.23 2010/07/30 15:28:09 njoly Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -104,8 +104,8 @@
case PCI_PRODUCT_INTEL_82801G_SMB:
case PCI_PRODUCT_INTEL_82801H_SMB:
case PCI_PRODUCT_INTEL_82801I_SMB:
- case PCI_PRODUCT_INTEL_ICH10_SMB1:
- case PCI_PRODUCT_INTEL_ICH10_SMB2:
+ case PCI_PRODUCT_INTEL_82801JD_SMB:
+ case PCI_PRODUCT_INTEL_82801JI_SMB:
case PCI_PRODUCT_INTEL_3400_SMB:
return 1;
}
Index: src/sys/dev/pci/piixide.c
diff -u src/sys/dev/pci/piixide.c:1.54 src/sys/dev/pci/piixide.c:1.55
--- src/sys/dev/pci/piixide.c:1.54 Wed Feb 24 22:38:01 2010
+++ src/sys/dev/pci/piixide.c Fri Jul 30 15:28:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: piixide.c,v 1.54 2010/02/24 22:38:01 dyoung Exp $ */
+/* $NetBSD: piixide.c,v 1.55 2010/07/30 15:28:09 njoly Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.54 2010/02/24 22:38:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.55 2010/07/30 15:28:09 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,24 +261,24 @@
"Intel 631xESB/632xESB Serial ATA Controller",
piixsata_chip_map,
},
- { PCI_PRODUCT_INTEL_ICH10_SATA2_2x1,
+ { PCI_PRODUCT_INTEL_82801JD_SATA_IDE2,
0,
- "Intel ICH10 Serial ATA 2 Controller 2x1",
+ "Intel 82801JD Serial ATA Controller (ICH10)",
piixsata_chip_map,
},
- { PCI_PRODUCT_INTEL_ICH10_SATA2_2x2,
+ { PCI_PRODUCT_INTEL_82801JI_SATA_IDE2,
0,
- "Intel ICH10 Serial ATA 2 Controller 2x2",
+ "Intel 82801JI Serial ATA Controller (ICH10)",
piixsata_chip_map,
},
- { PCI_PRODUCT_INTEL_ICH10_SATA2_4x1,
+ { PCI_PRODUCT_INTEL_82801JD_SATA_IDE,
0,
- "Intel ICH10 Serial ATA 2 Controller 4x1",
+ "Intel 82801JD Serial ATA Controller (ICH10)",
piixsata_chip_map,
},
- { PCI_PRODUCT_INTEL_ICH10_SATA2_4x2,
+ { PCI_PRODUCT_INTEL_82801JI_SATA_IDE,
0,
- "Intel ICH10 Serial ATA 2 Controller 4x2",
+ "Intel 82801JI Serial ATA Controller (ICH10)",
piixsata_chip_map,
},
{
