summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/notes/i386/hardware4
-rw-r--r--share/man/man4/pciide.44
-rw-r--r--sys/dev/pci/pciide.c7
3 files changed, 10 insertions, 5 deletions
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index c717ab30910..c96c5795f7d 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl $OpenBSD: hardware,v 1.173 2004/12/30 16:43:30 krw Exp $
+dnl $OpenBSD: hardware,v 1.174 2005/01/15 15:23:40 jsg Exp $
OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
clones, with a wide variety of processors and I/O bus architectures. It
can be expected to install and run with minimal difficulties on most
@@ -80,7 +80,7 @@ Supported hardware {:-include-:}:
ITE IT8212F (RAID mode is not supported)
National Semiconductor PC87415
National Semiconductor SCx200 (found on SC1100 SoC)
- NVIDIA nForce/nForce2/nForce3/nForce3-250
+ NVIDIA nForce/nForce2/nForce2-400/nForce3/nForce3-250
(SATA controllers are not supported)
Promise PDC20246, PDC20262, PDC20265, PDC20267, PDC20268,
PDC20268R, PDC20269, PDC20271, PDC20275, PDC20276,
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index e7f2106e0ca..061f0902033 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pciide.4,v 1.44 2004/12/11 08:41:19 henning Exp $
+.\" $OpenBSD: pciide.4,v 1.45 2005/01/15 15:23:40 jsg Exp $
.\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
.\"
.\" Copyright (c) 1998 Manuel Bouyer.
@@ -90,7 +90,7 @@ National Semiconductor PC87415
.It
National Semiconductor SCx200 (found on SC1100 SoC)
.It
-NVIDIA nForce/nForce2/nForce3/nForce3-250 (SATA controllers are not
+NVIDIA nForce/nForce2/nForce2-400/nForce3/nForce3-250 (SATA controllers are not
supported)
.It
Promise PDC20246, PDC20262, PDC20265, PDC20267, PDC20268, PDC20268R,
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 216056dc977..61c1df3bbf7 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.181 2004/12/11 08:39:28 henning Exp $ */
+/* $OpenBSD: pciide.c,v 1.182 2005/01/15 15:23:39 jsg Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -625,6 +625,10 @@ const struct pciide_product_desc pciide_nvidia_products[] = {
0,
nforce_chip_map
},
+ { PCI_PRODUCT_NVIDIA_NFORCE2_400_IDE,
+ 0,
+ nforce_chip_map
+ },
{ PCI_PRODUCT_NVIDIA_NFORCE3_IDE,
0,
nforce_chip_map
@@ -6509,6 +6513,7 @@ nforce_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
sc->sc_wdcdev.UDMA_cap = 5;
break;
case PCI_PRODUCT_NVIDIA_NFORCE2_IDE:
+ case PCI_PRODUCT_NVIDIA_NFORCE2_400_IDE:
case PCI_PRODUCT_NVIDIA_NFORCE3_IDE:
case PCI_PRODUCT_NVIDIA_NFORCE3_250_IDE:
sc->sc_wdcdev.UDMA_cap = 6;