summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2007-10-17 22:11:53 +0000
committerBrad Smith <brad@cvs.openbsd.org>2007-10-17 22:11:53 +0000
commitd00e4f08054c782a706f7ab2afdcb86b5b4c1415 (patch)
tree65fff5a613dca91ee5fc0e5f5984f5084213bea5
parente414c9da63da73789e69dd2de52d8c42695155c2 (diff)
Add the Intel ICH9 chipset.
Tested by damien@ ok dlg@
-rw-r--r--share/man/man4/pciide.46
-rw-r--r--sys/dev/pci/pciide.c26
2 files changed, 28 insertions, 4 deletions
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index df81ffa7357..8299537ef57 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pciide.4,v 1.76 2007/09/14 23:19:34 brad Exp $
+.\" $OpenBSD: pciide.4,v 1.77 2007/10/17 22:11:52 brad Exp $
.\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
.\"
.\" Copyright (c) 1998 Manuel Bouyer.
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: September 14 2007 $
+.Dd $Mdocdate: October 17 2007 $
.Dt PCIIDE 4
.Os
.Sh NAME
@@ -85,7 +85,7 @@ Intel PIIX, PIIX3, and PIIX4
.It
Intel 82801
(ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/\&
-ICH6/ICH6M/ICH6R/ICH7/ICH7M/ICH7R/ICH7M DH/ICH8/ICH8M)
+ICH6/ICH6M/ICH6R/ICH7/ICH7M/ICH7R/ICH7M DH/ICH8/ICH8M/ICH9/ICH9M)
.It
Intel 6300ESB/6321ESB
.It
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index ef8308a382e..a191b2f9fc4 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.274 2007/10/09 23:26:05 krw Exp $ */
+/* $OpenBSD: pciide.c,v 1.275 2007/10/17 22:11:52 brad Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -499,6 +499,30 @@ const struct pciide_product_desc pciide_intel_products[] = {
0,
piix_chip_map
},
+ { PCI_PRODUCT_INTEL_82801I_SATA_1, /* Intel 82801I (ICH9) SATA */
+ 0,
+ piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_82801I_SATA_2, /* Intel 82801I (ICH9) SATA */
+ 0,
+ piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_82801I_SATA_3, /* Intel 82801I (ICH9) SATA */
+ 0,
+ piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_82801I_SATA_4, /* Intel 82801I (ICH9) SATA */
+ 0,
+ piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_82801I_SATA_5, /* Intel 82801I (ICH9M) SATA */
+ 0,
+ piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_82801I_SATA_6, /* Intel 82801I (ICH9M) SATA */
+ 0,
+ piixsata_chip_map
+ },
{ PCI_PRODUCT_INTEL_6321ESB_SATA, /* Intel 6321ESB SATA */
0,
piixsata_chip_map