Module Name: src
Committed By: bouyer
Date: Sat Mar 17 19:05:39 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs piixide.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1739):
sys/dev/pci/piixide.c: revision 1.58
sys/dev/pci/pcidevs: patch
Add support for Intel 6 Series Serial ATA Controller
To generate a diff of this commit:
cvs rdiff -u -r1.962.4.15 -r1.962.4.16 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.47.4.1 -r1.47.4.2 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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.962.4.15 src/sys/dev/pci/pcidevs:1.962.4.16
--- src/sys/dev/pci/pcidevs:1.962.4.15 Mon Nov 22 03:39:08 2010
+++ src/sys/dev/pci/pcidevs Sat Mar 17 19:05:38 2012
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.962.4.15 2010/11/22 03:39:08 riz Exp $
+$NetBSD: pcidevs,v 1.962.4.16 2012/03/17 19:05:38 bouyer Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2312,6 +2312,31 @@ product INTEL 82840_AGP 0x1a23 82840 AG
product INTEL 82840_PCI 0x1a24 82840 PCI
product INTEL 82845_HB 0x1a30 82845 Host
product INTEL 82845_AGP 0x1a31 82845 AGP
+product INTEL 6SERIES_SATA_1 0x1c00 6 Series SATA
+product INTEL 6SERIES_SATA_2 0x1c01 6 Series SATA
+product INTEL 6SERIES_AHCI_1 0x1c02 6 Series AHCI
+product INTEL 6SERIES_AHCI_2 0x1c03 6 Series AHCI
+product INTEL 6SERIES_RAID_1 0x1c04 6 Series RAID
+product INTEL 6SERIES_RAID_2 0x1c05 6 Series RAID
+product INTEL 6SERIES_RAID_3 0x1c06 6 Series RAID
+product INTEL 6SERIES_SATA_3 0x1c08 6 Series SATA
+product INTEL 6SERIES_SATA_4 0x1c09 6 Series SATA
+product INTEL 6SERIES_PCIE_1 0x1c10 6 Series PCIE
+product INTEL 6SERIES_PCIE_2 0x1c12 6 Series PCIE
+product INTEL 6SERIES_PCIE_3 0x1c14 6 Series PCIE
+product INTEL 6SERIES_PCIE_4 0x1c16 6 Series PCIE
+product INTEL 6SERIES_PCIE_5 0x1c18 6 Series PCIE
+product INTEL 6SERIES_PCIE_6 0x1c1a 6 Series PCIE
+product INTEL 6SERIES_PCIE_7 0x1c1c 6 Series PCIE
+product INTEL 6SERIES_PCIE_8 0x1c1e 6 Series PCIE
+product INTEL 6SERIES_HDA 0x1c20 6 Series HD Audio
+product INTEL 6SERIES_SMB 0x1c22 6 Series SMBus
+product INTEL 6SERIES_THERM 0x1c24 6 Series Thermal
+product INTEL 6SERIES_DMI 0x1c25 6 Series DMI-PCI
+product INTEL 6SERIES_EHCI_1 0x1c26 6 Series USB
+product INTEL 6SERIES_EHCI_2 0x1c2d 6 Series USB
+product INTEL 6SERIES_MEI 0x1c3a 6 Series MEI
+product INTEL 6SERIES_KT 0x1c3d 6 Series KT
product INTEL 82801AA_LPC 0x2410 82801AA LPC Interface Bridge
product INTEL 82801AA_IDE 0x2411 82801AA IDE Controller
product INTEL 82801AA_USB 0x2412 82801AA USB Controller
Index: src/sys/dev/pci/piixide.c
diff -u src/sys/dev/pci/piixide.c:1.47.4.1 src/sys/dev/pci/piixide.c:1.47.4.2
--- src/sys/dev/pci/piixide.c:1.47.4.1 Fri Dec 18 05:48:07 2009
+++ src/sys/dev/pci/piixide.c Sat Mar 17 19:05:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: piixide.c,v 1.47.4.1 2009/12/18 05:48:07 snj Exp $ */
+/* $NetBSD: piixide.c,v 1.47.4.2 2012/03/17 19:05:39 bouyer Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.47.4.1 2009/12/18 05:48:07 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.47.4.2 2012/03/17 19:05:39 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -308,6 +308,30 @@ static const struct pciide_product_desc
"Intel 3400 Serial ATA Controller",
piixsata_chip_map,
},
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_1,
+ 0,
+ "Intel 6 Series Serial ATA Controller",
+ piixsata_chip_map,
+ },
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_2,
+ 0,
+ "Intel 6 Series Serial ATA Controller",
+ piixsata_chip_map,
+ },
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_3,
+ 0,
+ "Intel 6 Series Serial ATA Controller",
+ piixsata_chip_map,
+ },
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_4,
+ 0,
+ "Intel 6 Series Serial ATA Controller",
+ piixsata_chip_map,
+ },
{ 0,
0,
NULL,
