diff options
| author |   markus <markus@openbsd.org> | 2002-07-10 11:01:01 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-07-10 11:01:01 +0000 |
| commit | 31dcf5a8f4213f4613c45b040d00d0c287b2abf9 (patch) | |
| tree | 4a7ae94997221e82c3c10968817042f07ec70b20 | |
| parent | bark if all connection attempt fails. (diff) | |
| download | wireguard-openbsd-31dcf5a8f4213f4613c45b040d00d0c287b2abf9.tar.xz wireguard-openbsd-31dcf5a8f4213f4613c45b040d00d0c287b2abf9.zip | |
ICH4 support; ok gluk@
| -rw-r--r-- | share/man/man4/pciide.4 | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pciide.c | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4 index c2672305534..4e18ce24629 100644 --- a/share/man/man4/pciide.4 +++ b/share/man/man4/pciide.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pciide.4,v 1.20 2002/07/06 14:35:47 gluk Exp $ +.\" $OpenBSD: pciide.4,v 1.21 2002/07/10 11:01:01 markus Exp $ .\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $ .\" .\" Copyright (c) 1998 Manuel Bouyer. @@ -70,7 +70,7 @@ HighPoint HPT366, HPT370, HPT372, HPT374 .It Intel PIIX, PIIX3, and PIIX4 .It -Intel 82801 (ICH/ICH0/ICH2) +Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4) .It National Semiconductor PC87415 .It diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index edf31294dc2..4fad9cd9d6c 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.86 2002/07/06 14:35:47 gluk Exp $ */ +/* $OpenBSD: pciide.c,v 1.87 2002/07/10 11:01:01 markus Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -307,11 +307,15 @@ const struct pciide_product_desc pciide_intel_products[] = { 0, piix_chip_map }, - { PCI_PRODUCT_INTEL_82801CAM_IDE, /* Intel 82801CAM IDE (ICH2) */ + { PCI_PRODUCT_INTEL_82801CAM_IDE, /* Intel 82801CAM IDE (ICH3) */ 0, piix_chip_map }, - { PCI_PRODUCT_INTEL_82801CA_IDE, /* Intel 82801CA IDE (ICH2) */ + { PCI_PRODUCT_INTEL_82801CA_IDE, /* Intel 82801CA IDE (ICH3) */ + 0, + piix_chip_map + }, + { PCI_PRODUCT_INTEL_82801DB_IDE, /* Intel 82801DB IDE (ICH4) */ 0, piix_chip_map }, @@ -1525,6 +1529,7 @@ piix_chip_map(sc, pa) case PCI_PRODUCT_INTEL_82801BA_IDE: case PCI_PRODUCT_INTEL_82801CAM_IDE: case PCI_PRODUCT_INTEL_82801CA_IDE: + case PCI_PRODUCT_INTEL_82801DB_IDE: sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA; break; } @@ -1539,6 +1544,7 @@ piix_chip_map(sc, pa) case PCI_PRODUCT_INTEL_82801BA_IDE: case PCI_PRODUCT_INTEL_82801CAM_IDE: case PCI_PRODUCT_INTEL_82801CA_IDE: + case PCI_PRODUCT_INTEL_82801DB_IDE: sc->sc_wdcdev.UDMA_cap = 5; break; default: @@ -1571,7 +1577,8 @@ piix_chip_map(sc, pa) sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CAM_IDE || - sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE) { + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) { WDCDEBUG_PRINT((", IDE_CONTROL 0x%x", pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)), DEBUG_PROBE); @@ -1630,7 +1637,8 @@ next: sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CAM_IDE || - sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE) { + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) { WDCDEBUG_PRINT((", IDE_CONTROL 0x%x", pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)), DEBUG_PROBE); @@ -1793,13 +1801,15 @@ piix3_4_setup_channel(chp) sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CAM_IDE || - sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE) { + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) { ideconf |= PIIX_CONFIG_PINGPONG; } if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE || sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BA_IDE|| sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CAM_IDE|| - sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE) { + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801CA_IDE || + sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DB_IDE) { /* setup Ultra/100 */ if (drvp->UDMA_mode > 2 && (ideconf & PIIX_CONFIG_CR(channel, drive)) == 0) |