[src/netbsd-1-4]: src/sys/dev/ic Pull up revision 1.6 (requested by ad):

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

details:   https://anonhg.NetBSD.org/src/rev/c279aee98290
branches:  netbsd-1-4
changeset: 470088:c279aee98290
user:      he <he%NetBSD.org@localhost>
date:      Tue Jan 18 20:04:59 2000 +0000

description:
Pull up revision 1.6 (requested by ad):
  Fix register offset problem to make EISA boards work correctly.

diffstat:

 sys/dev/ic/dptreg.h |  21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diffs (51 lines):

diff -r 5c430d3c3800 -r c279aee98290 sys/dev/ic/dptreg.h
--- a/sys/dev/ic/dptreg.h       Mon Jan 17 19:20:48 2000 +0000
+++ b/sys/dev/ic/dptreg.h       Tue Jan 18 20:04:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dptreg.h,v 1.5.2.2 2000/01/17 18:34:32 he Exp $        */
+/*     $NetBSD: dptreg.h,v 1.5.2.3 2000/01/18 20:04:59 he Exp $        */
 
 /*
  * Copyright (c) 1999 Andy Doran <ad%NetBSD.org@localhost>
@@ -79,16 +79,15 @@
 /*
  * HBA registers
  */
-#define HA_BASE                        0x10
-#define HA_DATA                        (HA_BASE + 0)
-#define HA_ERROR               (HA_BASE + 1)
-#define HA_DMA_BASE            (HA_BASE + 2)
-#define HA_ICMD_CODE2          (HA_BASE + 4)
-#define HA_ICMD_CODE1          (HA_BASE + 5)
-#define HA_ICMD                        (HA_BASE + 6)
+#define HA_DATA                        0
+#define HA_ERROR               1
+#define HA_DMA_BASE            2
+#define HA_ICMD_CODE2          4
+#define HA_ICMD_CODE1          5
+#define HA_ICMD                        6
 
 /* EATA commands. There are many more that we don't define or use. */
-#define HA_COMMAND             (HA_BASE + 7)
+#define HA_COMMAND             7
 #define   CP_PIO_GETCFG                0xf0    /* Read configuration data, PIO */
 #define   CP_PIO_CMD           0xf2    /* Execute command, PIO */
 #define   CP_DMA_GETCFG                0xfd    /* Read configuration data, DMA */
@@ -109,7 +108,7 @@
 #define     CPI_RESET_MSKD_BUS 0x09    /* Reset masked bus */
 #define     CPI_POWEROFF_WARN  0x0a    /* Power about to fail */
 
-#define HA_STATUS              (HA_BASE + 7)
+#define HA_STATUS              7
 #define   HA_ST_ERROR          0x01
 #define   HA_ST_MORE           0x02
 #define   HA_ST_CORRECTD       0x04
@@ -120,7 +119,7 @@
 #define   HA_ST_BUSY           0x80
 #define   HA_ST_DATA_RDY       (HA_ST_SEEK_COMPLETE|HA_ST_READY|HA_ST_DRQ)
 
-#define HA_AUX_STATUS          (HA_BASE + 8)
+#define HA_AUX_STATUS          8
 #define   HA_AUX_BUSY          0x01
 #define   HA_AUX_INTR          0x02