diff options
author | nyan <nyan@FreeBSD.org> | 2005-05-14 10:14:56 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2005-05-14 10:14:56 +0000 |
commit | 7d8da118c14109f26643f2fb202d60d1c1b0f189 (patch) | |
tree | 8f8dfa32b717e024b13ab2d3e5a3409e35636eda /sys/pc98 | |
parent | 8eefffbe8dcf6461ff80845af9b16fea1245e6b1 (diff) | |
download | FreeBSD-src-7d8da118c14109f26643f2fb202d60d1c1b0f189.zip FreeBSD-src-7d8da118c14109f26643f2fb202d60d1c1b0f189.tar.gz |
- Move bus dependent defines to {isa,cbus}_dmareg.h.
- Use isa/isareg.h rather than <arch>/isa/isa.h.
Tested on: i386, pc98
Diffstat (limited to 'sys/pc98')
-rw-r--r-- | sys/pc98/cbus/cbus.h | 1 | ||||
-rw-r--r-- | sys/pc98/cbus/cbus_dma.c | 11 | ||||
-rw-r--r-- | sys/pc98/cbus/cbus_dmareg.h | 44 |
3 files changed, 45 insertions, 11 deletions
diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h index 8adcce8..ca18b24 100644 --- a/sys/pc98/cbus/cbus.h +++ b/sys/pc98/cbus/cbus.h @@ -53,7 +53,6 @@ /* PC98 IO address ... very dirty (^_^; */ #define IO_ICU1 0x000 /* 8259A Interrupt Controller #1 */ -#define IO_DMA 0x001 /* 8237A DMA Controller */ #define IO_ICU2 0x008 /* 8259A Interrupt Controller #2 */ #define IO_RTC 0x020 /* 4990A RTC */ #define IO_SYSPORT 0x031 /* 8255A System Port */ diff --git a/sys/pc98/cbus/cbus_dma.c b/sys/pc98/cbus/cbus_dma.c index f85e3c7..255f7e0 100644 --- a/sys/pc98/cbus/cbus_dma.c +++ b/sys/pc98/cbus/cbus_dma.c @@ -60,18 +60,9 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <dev/ic/i8237.h> #include <isa/isavar.h> #include <pc98/cbus/cbus.h> - -/* -** Register definitions for DMA controller 1 (channels 0..3): -*/ -#define DMA1_CHN(c) (IO_DMA + (4*(c))) /* addr reg for channel c */ -#define DMA1_STATUS (IO_DMA + 0x10) /* status register */ -#define DMA1_SMSK (IO_DMA + 0x14) /* single mask register */ -#define DMA1_MODE (IO_DMA + 0x16) /* mode register */ -#define DMA1_FFC (IO_DMA + 0x18) /* clear first/last FF */ +#include <pc98/cbus/cbus_dmareg.h> static int isa_dmarangecheck(caddr_t va, u_int length, int chan); diff --git a/sys/pc98/cbus/cbus_dmareg.h b/sys/pc98/cbus/cbus_dmareg.h new file mode 100644 index 0000000..9401b91 --- /dev/null +++ b/sys/pc98/cbus/cbus_dmareg.h @@ -0,0 +1,44 @@ +/*- + * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _PC98_CBUS_CBUS_DMAREG_H_ +#define _PC98_CBUS_CBUS_DMAREG_H_ + +#include <dev/ic/i8237.h> + +#define IO_DMA 0x01 /* 8237A DMA Controller */ + +/* + * Register definitions for DMA controller 1 (channels 0..3): + */ +#define DMA1_CHN(c) (IO_DMA + (4*(c))) /* addr reg for channel c */ +#define DMA1_STATUS (IO_DMA + 0x10) /* status register */ +#define DMA1_SMSK (IO_DMA + 0x14) /* single mask register */ +#define DMA1_MODE (IO_DMA + 0x16) /* mode register */ +#define DMA1_FFC (IO_DMA + 0x18) /* clear first/last FF */ + +#endif /* _PC98_CBUS_CBUS_DMAREG_H_ */ |