summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2005-05-26 17:43:24 +0000
committerjsg <jsg@openbsd.org>2005-05-26 17:43:24 +0000
commit560a00d9b49b3d7c3ca3f753644dc1b5f8a70f58 (patch)
treea97cf0c8dcb1196ac94187efc5441dbbea685e53
parenttrunk depends on ifmedia. (diff)
downloadwireguard-openbsd-560a00d9b49b3d7c3ca3f753644dc1b5f8a70f58.tar.xz
wireguard-openbsd-560a00d9b49b3d7c3ca3f753644dc1b5f8a70f58.zip
nForce4 PATA support from Olivier Crouzet <ol at epita.fr>. ok grange@
-rw-r--r--share/man/man4/pciide.46
-rw-r--r--sys/dev/pci/pciide.c7
2 files changed, 9 insertions, 4 deletions
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index cdc1fa63b71..1bbe9f5aaca 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pciide.4,v 1.48 2005/04/29 01:11:47 jsg Exp $
+.\" $OpenBSD: pciide.4,v 1.49 2005/05/26 17:43:25 jsg Exp $
.\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
.\"
.\" Copyright (c) 1998 Manuel Bouyer.
@@ -90,8 +90,8 @@ National Semiconductor PC87415
.It
National Semiconductor SCx200 (found on SC1100 SoC)
.It
-NVIDIA nForce/nForce2/nForce2-400/nForce3/nForce3-250 (SATA controllers are not
-supported)
+NVIDIA nForce/nForce2/nForce2-400/nForce3/nForce3-250/nForce4
+(SATA controllers are not supported)
.It
Promise PDC20246, PDC20262, PDC20265, PDC20267, PDC20268, PDC20268R,
PDC20269, PDC20271, PDC20275, PDC20276, PDC20277, PDC20376
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 5fd4b5e1006..eb0c8401203 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.192 2005/04/29 01:11:46 jsg Exp $ */
+/* $OpenBSD: pciide.c,v 1.193 2005/05/26 17:43:24 jsg Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -656,6 +656,10 @@ const struct pciide_product_desc pciide_nvidia_products[] = {
{ PCI_PRODUCT_NVIDIA_NFORCE3_250_IDE,
0,
nforce_chip_map
+ },
+ { PCI_PRODUCT_NVIDIA_NFORCE4_ATA133,
+ 0,
+ nforce_chip_map
}
};
@@ -6563,6 +6567,7 @@ nforce_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
case PCI_PRODUCT_NVIDIA_NFORCE2_400_IDE:
case PCI_PRODUCT_NVIDIA_NFORCE3_IDE:
case PCI_PRODUCT_NVIDIA_NFORCE3_250_IDE:
+ case PCI_PRODUCT_NVIDIA_NFORCE4_ATA133:
sc->sc_wdcdev.UDMA_cap = 6;
break;
default: