[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.12 (requested by bouyer ...

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

details:   https://anonhg.NetBSD.org/src/rev/37142f890ed9
branches:  netbsd-1-6
changeset: 529223:37142f890ed9
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 01 16:33:50 2002 +0000

description:
Pull up revision 1.12 (requested by bouyer in ticket #727):
Correct setup for Ultra133 capable VIA chipsets, From Matthias Drochner
on current-users, with cross-check and some improvement from linux-2.4.19
and FreeBSD-current.
Also don't set the APO_UDMA_CLK66 bit for Ultra/100 capable chipset, and
support Ultra/133 for the VT8233A.

diffstat:

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

diffs (22 lines):

diff -r 6dbdb1409262 -r 37142f890ed9 sys/dev/pci/pciide_apollo_reg.h
--- a/sys/dev/pci/pciide_apollo_reg.h   Fri Nov 01 16:33:33 2002 +0000
+++ b/sys/dev/pci/pciide_apollo_reg.h   Fri Nov 01 16:33:50 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_apollo_reg.h,v 1.11 2002/04/23 20:41:17 bouyer Exp $    */
+/*     $NetBSD: pciide_apollo_reg.h,v 1.11.4.1 2002/11/01 16:33:50 tron Exp $  */
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -89,9 +89,10 @@
        (((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
 #define APO_UDMA_CLK66(channel) (0x08 << ((1 - (channel)) << 4))
 
+static const int8_t apollo_udma133_tim[] __attribute__((__unused__)) =
+    {0x07, 0x07, 0x06, 0x04, 0x02, 0x01, 0x00};
 static const int8_t apollo_udma100_tim[] __attribute__((__unused__)) =
-    /* XXX Check modes other than 2, 4, 5 */
-    {0x0f, 0x07, 0x04, 0x02, 0x01, 0x00};
+    {0x07, 0x07, 0x04, 0x02, 0x01, 0x00};
 static const int8_t apollo_udma66_tim[] __attribute__((__unused__)) =
     {0x03, 0x03, 0x02, 0x01, 0x00};
 static const int8_t apollo_udma33_tim[] __attribute__((__unused__)) =