summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2008-01-11 11:30:57 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2008-01-11 11:30:57 +0000
commit6d9dbb172a67f1cb6fb3b527e8f86755b23f92b4 (patch)
tree7e714a1a95ced0f8102356a24b4e29af82be2e3d
parentffe209168e8e4a6cadc5b70a7585c156e54cbe00 (diff)
Turns out the id I thought was both CX700/VX700 IDE was only for VX700,
so rename it and add a CX700 id. Tweaked version of a diff from dtrombley@dslindiana.com who tested with a board with the new id.
-rw-r--r--sys/dev/pci/pcidevs5
-rw-r--r--sys/dev/pci/pciide.c9
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index b99b2432e51..a2d324dc579 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1312 2008/01/11 11:12:35 jsg Exp $
+$OpenBSD: pcidevs,v 1.1313 2008/01/11 11:30:55 jsg Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -4095,7 +4095,8 @@ product VIATECH VT82C505 0x0505 VT82C505
product VIATECH VT82C561 0x0561 VT82C561
product VIATECH VT82C571 0x0571 VT82C571 IDE
product VIATECH VT82C576 0x0576 VT82C576 3V
-product VIATECH CX700_IDE 0x0581 CX700 IDE
+product VIATECH VX700_IDE 0x0581 VX700 IDE
+product VIATECH CX700_IDE 0x5324 CX700 IDE
product VIATECH VT82C585 0x0585 VT82C585 ISA
product VIATECH VT82C586_ISA 0x0586 VT82C586 ISA
product VIATECH VT8237A_SATA 0x0591 VT8237A SATA
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 281b54c0538..a5ce3a31e8a 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.277 2008/01/02 06:54:30 brad Exp $ */
+/* $OpenBSD: pciide.c,v 1.278 2008/01/11 11:30:56 jsg Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -630,6 +630,10 @@ const struct pciide_product_desc pciide_via_products[] = {
0,
apollo_chip_map
},
+ { PCI_PRODUCT_VIATECH_VX700_IDE, /* VIA VX700 IDE */
+ 0,
+ apollo_chip_map
+ },
{ PCI_PRODUCT_VIATECH_VT6420_SATA, /* VIA VT6420 SATA */
IDE_PCI_CLASS_OVERRIDE,
sata_chip_map
@@ -3026,7 +3030,8 @@ apollo_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
}
if ((PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VT6410) ||
- (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_CX700_IDE)) {
+ (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_CX700_IDE) ||
+ (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VX700_IDE)) {
printf(": ATA133");
sc->sc_wdcdev.UDMA_cap = 6;
} else {