diff options
| author |   chris <chris@openbsd.org> | 2001-02-22 03:04:08 +0000 |
|---|---|---|
| committer | chris <chris@openbsd.org> | 2001-02-22 03:04:08 +0000 |
| commit | 8da1bcb226ab333ad6dfe92b0984f8da7df9380b (patch) | |
| tree | f8719853fbc0f9bea644e1b13aa748337060efaf | |
| parent | sync (diff) | |
| download | wireguard-openbsd-8da1bcb226ab333ad6dfe92b0984f8da7df9380b.tar.xz wireguard-openbsd-8da1bcb226ab333ad6dfe92b0984f8da7df9380b.zip | |
Use real VIA product names for IDE controllers rather then contrived ones,
ok deraadt@
| -rw-r--r-- | sys/dev/pci/pcidevs | 6 | ||||
| -rw-r--r-- | sys/dev/pci/pciide.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index ca231560856..60b44955907 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ - $OpenBSD: pcidevs,v 1.369 2001/02/22 01:34:29 chris Exp $ + $OpenBSD: pcidevs,v 1.370 2001/02/22 03:04:08 chris Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -1772,7 +1772,7 @@ product VIATECH VT8371_HB 0x0391 VT8371 Host product VIATECH VT8501 0x0501 VT8501 product VIATECH VT82C505 0x0505 VT82C505 product VIATECH VT82C561 0x0561 VT82C561 -product VIATECH VT82C586A_IDE 0x0571 VT82C586A IDE +product VIATECH VT82C571 0x0571 VT82C571 IDE product VIATECH VT82C576 0x0576 VT82C576 3V product VIATECH VT82C585 0x0585 VT82C585 PCI-ISA product VIATECH VT82C586_ISA 0x0586 VT82C586 PCI-ISA @@ -1787,7 +1787,7 @@ product VIATECH VT82C693 0x0693 VT82C693 Host-PCI product VIATECH VT86C926 0x0926 VT86C926 Amazon product VIATECH VT82C570M 0x1000 VT82C570M Host-PCI product VIATECH VT82C570MV 0x1006 VT82C570M PCI-ISA -product VIATECH VT82C586_IDE 0x1571 VT82C586 IDE +product VIATECH VT82C416 0x1571 VT82C416 IDE product VIATECH VT82C1595 0x1595 VT82C1595 Host-PCI product VIATECH VT83C572 0x3038 VT83C572 USB product VIATECH VT82C586_PWR 0x3040 VT82C586 Power Management diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 8792a68bec3..b522898644b 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.44 2001/02/06 07:57:08 chris Exp $ */ +/* $OpenBSD: pciide.c,v 1.45 2001/02/22 03:04:09 chris Exp $ */ /* $NetBSD: pciide.c,v 1.48 1999/11/28 20:05:18 bouyer Exp $ */ /* @@ -348,11 +348,11 @@ const struct pciide_product_desc pciide_cmd_products[] = { }; const struct pciide_product_desc pciide_via_products[] = { - { PCI_PRODUCT_VIATECH_VT82C586_IDE, /* VIA VT82C586 (Apollo VP) IDE */ + { PCI_PRODUCT_VIATECH_VT82C416, /* VIA VT82C416 IDE */ 0, apollo_chip_map }, - { PCI_PRODUCT_VIATECH_VT82C586A_IDE, /* VIA VT82C586A IDE */ + { PCI_PRODUCT_VIATECH_VT82C571, /* VIA VT82C571 IDE */ 0, apollo_chip_map } @@ -1988,7 +1988,7 @@ apollo_chip_map(sc, pa) pciide_mapreg_dma(sc, pa); if (sc->sc_dma_ok) { sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA; - if (sc->sc_pp->ide_product == PCI_PRODUCT_VIATECH_VT82C586A_IDE + if (sc->sc_pp->ide_product == PCI_PRODUCT_VIATECH_VT82C571 && rev >= 6) sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA; } |