summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2004-03-12 19:10:08 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2004-03-12 19:10:08 +0000
commitda6c536f3e994104b19aa8377758446d0fa53b77 (patch)
tree5a405ad86aa3a29aba922e7c9f85944054001d81
parentd8cac78d3ded828ac290d48b4bceae795b625c1b (diff)
Enable ata133 on amd8111; from netbsd
tested by beck@
-rw-r--r--sys/dev/pci/pciide.c6
-rw-r--r--sys/dev/pci/pciide_amd_reg.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 6aef5da366f..1e1e9ae5a82 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.162 2004/02/18 09:49:04 grange Exp $ */
+/* $OpenBSD: pciide.c,v 1.163 2004/03/12 19:10:07 grange Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -2282,9 +2282,11 @@ amd756_chip_map(sc, pa)
sc->sc_wdcdev.PIO_cap = 4;
sc->sc_wdcdev.DMA_cap = 2;
switch (sc->sc_pp->ide_product) {
+ case PCI_PRODUCT_AMD_8111_IDE:
+ sc->sc_wdcdev.UDMA_cap = 6;
+ break;
case PCI_PRODUCT_AMD_766_IDE:
case PCI_PRODUCT_AMD_PBC768_IDE:
- case PCI_PRODUCT_AMD_8111_IDE:
sc->sc_wdcdev.UDMA_cap = 5;
break;
default:
diff --git a/sys/dev/pci/pciide_amd_reg.h b/sys/dev/pci/pciide_amd_reg.h
index 775955db478..ebbff5c6c12 100644
--- a/sys/dev/pci/pciide_amd_reg.h
+++ b/sys/dev/pci/pciide_amd_reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide_amd_reg.h,v 1.6 2003/09/28 21:01:43 grange Exp $ */
+/* $OpenBSD: pciide_amd_reg.h,v 1.7 2004/03/12 19:10:07 grange Exp $ */
/* $NetBSD: pciide_amd_reg.h,v 1.2 2000/07/06 15:08:11 bouyer Exp $ */
/*
@@ -80,4 +80,5 @@ static const int8_t amd756_pio_rec[] = {0x08, 0x08, 0x08, 0x02, 0x00};
#define AMD756_UDMA_EN_MTH(channel, drive) (0x80 << \
(((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
-static const int8_t amd756_udma_tim[] = {0x02, 0x01, 0x00, 0x04, 0x05, 0x06};
+static const int8_t amd756_udma_tim[] =
+ {0x02, 0x01, 0x00, 0x04, 0x05, 0x06, 0x07};