diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 08:02:14 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 08:02:14 +0000 |
| commit | a3b5edea3991a5af513f92dd86991d7b1a561a54 (patch) | |
| tree | f051a33605fa9c2bde1756be0816999893544828 /sys/arch/hp300/dev/dmareg.h | |
| parent | a66e6c132dfc5477c6359bf03ab2bd43b9779756 (diff) | |
Sync with changes from NetBSD, up to 970705.
This includes all of the new frodo drivers, from Michael Smith, hacked up
by Jason R. Thorpe; other changes, mostly configuration and/or m68k
abstraction related, from Thorpe. A few others of my own.
This compiles and runs, have not yet tested Domain kbd or apci ports.
Diffstat (limited to 'sys/arch/hp300/dev/dmareg.h')
| -rw-r--r-- | sys/arch/hp300/dev/dmareg.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/hp300/dev/dmareg.h b/sys/arch/hp300/dev/dmareg.h index 231b6510353..7698edc7e0e 100644 --- a/sys/arch/hp300/dev/dmareg.h +++ b/sys/arch/hp300/dev/dmareg.h @@ -1,5 +1,5 @@ -/* $OpenBSD: dmareg.h,v 1.5 1997/04/16 11:56:00 downsj Exp $ */ -/* $NetBSD: dmareg.h,v 1.10 1997/04/01 03:10:58 scottr Exp $ */ +/* $OpenBSD: dmareg.h,v 1.6 1997/07/06 08:01:49 downsj Exp $ */ +/* $NetBSD: dmareg.h,v 1.12 1997/05/05 21:02:40 thorpej Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -37,6 +37,7 @@ */ #include <hp300/dev/iotypes.h> /* XXX */ +#include <machine/hp300spu.h> /* * Hardware layout for the 98620[ABC]: @@ -116,8 +117,8 @@ struct dmareg { #define DMA_STAT(dc) dc->dm_Bhwaddr->dmaB_stat #if defined(HP320) -#define DMA_ARM(dc) \ - if (dc->dm_softc->sc_type == DMA_B) { \ +#define DMA_ARM(sc, dc) \ + if (sc->sc_type == DMA_B) { \ struct dmaBdevice *dma = dc->dm_Bhwaddr; \ dma->dmaB_addr = dc->dm_chain[dc->dm_cur].dc_addr; \ dma->dmaB_count = dc->dm_chain[dc->dm_cur].dc_count - 1; \ @@ -129,7 +130,7 @@ struct dmareg { dma->dma_cmd = dc->dm_cmd; \ } #else -#define DMA_ARM(dc) \ +#define DMA_ARM(sc, dc) \ { \ struct dmadevice *dma = dc->dm_hwaddr; \ dma->dma_addr = dc->dm_chain[dc->dm_cur].dc_addr; \ |