[src/netbsd-1-4]: src/sys/dev/pci Pull up revisions 1.8-1.9 (requested by bou...

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

details:   https://anonhg.NetBSD.org/src/rev/84d10cb9d5ab
branches:  netbsd-1-4
changeset: 470851:84d10cb9d5ab
user:      he <he%NetBSD.org@localhost>
date:      Mon Aug 14 14:14:45 2000 +0000

description:
Pull up revisions 1.8-1.9 (requested by bouyer):
  Add UltraDMA support for the CMD PCI0646U and PCI0646U2 controllers;
  normally disabled on PCI0646U due to a chip bug, but can be
  enabled with a kernel option.

diffstat:

 sys/dev/pci/pciide_cmd_reg.h |  17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r ecf08769f60f -r 84d10cb9d5ab sys/dev/pci/pciide_cmd_reg.h
--- a/sys/dev/pci/pciide_cmd_reg.h      Mon Aug 14 14:11:36 2000 +0000
+++ b/sys/dev/pci/pciide_cmd_reg.h      Mon Aug 14 14:14:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_cmd_reg.h,v 1.4.4.1 2000/07/07 17:33:50 he Exp $        */
+/*     $NetBSD: pciide_cmd_reg.h,v 1.4.4.2 2000/08/14 14:14:45 he Exp $        */
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -37,6 +37,10 @@
  * Available from http://www.cmd.com/
  */
 
+/* Interesting revision of the 0646 */
+#define CMD0646U2_REV 0x05
+#define CMD0646U_REV 0x03
+
 /* Configuration (RO) */
 #define CMD_CONF 0x50
 #define CMD_CONF_REV_MASK      0x03 /* 0640/3/6 only */
@@ -74,11 +78,16 @@
 
 /* DMA master read mode select */
 #define CMD_DMA_MODE 0x71
+#define CMD_DMA_MASK           0x03
 #define CMD_DMA                        0x00
 #define CMD_DMA_MULTIPLE       0x01
-#define CMD_DMA_LINE           0x10
+#define CMD_DMA_LINE           0x03
+/* the followings bits are only for 0646U/646U2/648/649 */
+#define CMD_DMA_IRQ(chan)      (0x4 << (chan))
+#define CMD_DMA_IRQ_DIS(chan)  (0x10 << (chan))
+#define CMD_DMA_RST            0x40
 
-/* the followings are only for 0648/9 */
+/* the followings are only for 0646U/646U2/648/649 */
 /* busmaster control/status register */
 #define CMD_BICSR      0x79
 #define CMD_BICSR_80(chan)     (0x01 << (chan))
@@ -88,7 +97,7 @@
 #define CMD_UDMATIM_UDMA33(drive) (0x04 << (drive))
 #define CMD_UDMATIM_TIM_MASK   0x3
 #define CMD_UDMATIM_TIM_OFF(drive) (4 + ((drive) * 2))
-static int8_t cmd0648_9_tim_udma[] = {0x03, 0x02, 0x01, 0x02, 0x01};
+static int8_t cmd0646_9_tim_udma[] = {0x03, 0x02, 0x01, 0x02, 0x01};
 
 /*
  * timings values for the 0643/6/8/9