From 7d8da118c14109f26643f2fb202d60d1c1b0f189 Mon Sep 17 00:00:00 2001
From: nyan <nyan@FreeBSD.org>
Date: Sat, 14 May 2005 10:14:56 +0000
Subject: - Move bus dependent defines to {isa,cbus}_dmareg.h. - Use
 isa/isareg.h rather than <arch>/isa/isa.h.

Tested on: i386, pc98
---
 sys/amd64/isa/isa.h     | 3 ---
 sys/amd64/isa/isa_dma.c | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'sys/amd64/isa')

diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index ad6b176..3c58e6c 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -49,15 +49,12 @@
 #define	IO_ISABEGIN	0x000		/* 0x000 - Beginning of I/O Registers */
 
 		/* CPU Board */
-#define	IO_DMA1		0x000		/* 8237A DMA Controller #1 */
 #define	IO_ICU1		0x020		/* 8259A Interrupt Controller #1 */
 #define	IO_PMP1		0x026		/* 82347 Power Management Peripheral */
 #define	IO_KBD		0x060		/* 8042 Keyboard */
 #define	IO_RTC		0x070		/* RTC */
 #define	IO_NMI		IO_RTC		/* NMI Control */
-#define	IO_DMAPG	0x080		/* DMA Page Registers */
 #define	IO_ICU2		0x0A0		/* 8259A Interrupt Controller #2 */
-#define	IO_DMA2		0x0C0		/* 8237A DMA Controller #2 */
 
 		/* Cards */
 #define	IO_VGA		0x3C0		/* E/VGA Ports */
diff --git a/sys/amd64/isa/isa_dma.c b/sys/amd64/isa/isa_dma.c
index 8404df5..ffd3baa 100644
--- a/sys/amd64/isa/isa_dma.c
+++ b/sys/amd64/isa/isa_dma.c
@@ -57,9 +57,9 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <amd64/isa/isa.h>
-#include <dev/ic/i8237.h>
+#include <isa/isareg.h>
 #include <isa/isavar.h>
+#include <isa/isa_dmareg.h>
 
 #define ISARAM_END	0x1000000
 
-- 
cgit v1.1