summaryrefslogtreecommitdiff
path: root/sys/dev/isa/isadmareg.h
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-12-12 00:22:02 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-12-12 00:22:02 +0000
commit56e63ce11a06e0c5e1217a6e31b7af28156d2dcf (patch)
tree51226b447f947ed90e7a0cf19805d25d1ef17ea5 /sys/dev/isa/isadmareg.h
parent30e5e6d8ec6e8062e0a07aa1e5cecd1a7283c2c9 (diff)
Revert to non-bus.h versions for the time being
Diffstat (limited to 'sys/dev/isa/isadmareg.h')
-rw-r--r--sys/dev/isa/isadmareg.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/sys/dev/isa/isadmareg.h b/sys/dev/isa/isadmareg.h
index a534b64671d..47744042425 100644
--- a/sys/dev/isa/isadmareg.h
+++ b/sys/dev/isa/isadmareg.h
@@ -1,15 +1,21 @@
-/* $OpenBSD: isadmareg.h,v 1.2 1996/11/29 22:55:02 niklas Exp $ */
/* $NetBSD: isadmareg.h,v 1.4 1995/06/28 04:31:48 cgd Exp $ */
#include <dev/ic/i8237reg.h>
/*
- * Register definitions for the DMA controllers
+ * Register definitions for DMA controller 1 (channels 0..3):
*/
-#define DMA_CHN(u, c) ((u) * (2 * (c))) /* addr reg for channel c */
-#define DMA_SR(u) ((u) * 8) /* status register */
-#define DMA_SMSK(u) ((u) * 10) /* single mask register */
-#define DMA_MODE(u) ((u) * 11) /* mode register */
-#define DMA_FFC(u) ((u) * 12) /* clear first/last FF */
+#define DMA1_CHN(c) (IO_DMA1 + 1*(2*(c))) /* addr reg for channel c */
+#define DMA1_SR (IO_DMA1 + 1*8) /* status register */
+#define DMA1_SMSK (IO_DMA1 + 1*10) /* single mask register */
+#define DMA1_MODE (IO_DMA1 + 1*11) /* mode register */
+#define DMA1_FFC (IO_DMA1 + 1*12) /* clear first/last FF */
-#define DMA_NREGS(u) ((u) * 13) /* XXX true? */
+/*
+ * Register definitions for DMA controller 2 (channels 4..7):
+ */
+#define DMA2_CHN(c) (IO_DMA2 + 2*(2*(c))) /* addr reg for channel c */
+#define DMA2_SR (IO_DMA2 + 2*8) /* status register */
+#define DMA2_SMSK (IO_DMA2 + 2*10) /* single mask register */
+#define DMA2_MODE (IO_DMA2 + 2*11) /* mode register */
+#define DMA2_FFC (IO_DMA2 + 2*12) /* clear first/last FF */