[src/netbsd-1-5]: src/sys/dev/pci Pull up revision 1.9 (via patch, requested ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8cb84ef3d093
branches:  netbsd-1-5
changeset: 491744:8cb84ef3d093
user:      he <he%NetBSD.org@localhost>
date:      Tue May 15 20:53:17 2001 +0000

description:
Pull up revision 1.9 (via patch, requested by bouyer):
  Add support for newer VIA pciide controllers.
  Add support for the AMD 766 pciide controller.
  Properly distinguish between HPT366 and HPT370 controllers.

diffstat:

 sys/dev/pci/pciide_apollo_reg.h |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r cf513127de64 -r 8cb84ef3d093 sys/dev/pci/pciide_apollo_reg.h
--- a/sys/dev/pci/pciide_apollo_reg.h   Tue May 15 20:52:51 2001 +0000
+++ b/sys/dev/pci/pciide_apollo_reg.h   Tue May 15 20:53:17 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_apollo_reg.h,v 1.6.4.1 2001/02/04 18:44:24 he Exp $     */
+/*     $NetBSD: pciide_apollo_reg.h,v 1.6.4.2 2001/05/15 20:53:17 he Exp $     */
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -79,8 +79,8 @@
 
 /* Ultra-DMA/33 control (586A/B only) */
 #define APO_UDMA 0x50
-#define AP0_UDMA_MASK(channel) (0xffff << ((1 - (channel)) << 4))
-#define APO_UDMA_TIME(channel, drive, x) (((x) & 0x3) << \
+#define APO_UDMA_MASK(channel) (0xffff << ((1 - (channel)) << 4))
+#define APO_UDMA_TIME(channel, drive, x) (((x) & 0xf) << \
        (((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
 #define APO_UDMA_PIO_MODE(channel, drive) (0x20 << \
        (((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
@@ -90,6 +90,8 @@
        (((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
 #define APO_UDMA_CLK66(channel) (0x08 << ((1 - (channel)) << 4))
 
-static int8_t apollo_udma_tim[] = {0x03, 0x02, 0x00, 0x02, 0x00};
+static int8_t apollo_udma100_tim[] = {0x0f, 0x07, 0x04, 0x02, 0x01, 0x00}; /* XXX check modes others than 2, 4, 5 */
+static int8_t apollo_udma66_tim[] = {0x03, 0x03, 0x02, 0x01, 0x00};
+static int8_t apollo_udma33_tim[] = {0x03, 0x02, 0x00};
 static int8_t apollo_pio_set[] = {0x0a, 0x0a, 0x0a, 0x02, 0x02};
 static int8_t apollo_pio_rec[] = {0x08, 0x08, 0x08, 0x02, 0x00};