Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a couple things pointed out from Michael.

This commit is contained in:
chopps 1994-07-16 19:45:32 +00:00
parent cc9da7d69f
commit b655a15c00
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/amiga/amiga/machdep.c
View File

@ -38,7 +38,7 @@
* from: Utah $Hdr: machdep.c 1.63 91/04/24$
*
* @(#)machdep.c 7.16 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.35 1994/07/16 02:26:05 chopps Exp $
* $Id: machdep.c,v 1.36 1994/07/16 19:45:32 chopps Exp $
*/
#include <sys/param.h>
@ -1383,11 +1383,14 @@ intrhand(sr)
}
if (ireq & INTF_SOFTINT) {
/*
* first call installed callbacks,
* then clear the softint-bit
* first clear the softint-bit
* then call installed callbacks,
* this order is dicated by the nature of
* software interrupts. The other order
* allows software interrupts to be missed
*/
call_sicallbacks();
custom.intreq = INTF_SOFTINT;
call_sicallbacks();
}
break;

14
sys/arch/amiga/dev/atzsc.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)dma.c
* $Id: atzsc.c,v 1.5 1994/07/02 21:15:10 chopps Exp $
* $Id: atzsc.c,v 1.6 1994/07/16 19:45:44 chopps Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
@ -143,6 +143,18 @@ atzscattach(pdp, dp, auxp)
*/
sc->sc_flags |= SBICF_BADDMA;
sc->sc_dmamask = ~0x00ffffff;
/*
* If the users kva space is not ztwo try and allocate a bounce buffer.
* XXX this needs to change if we move to multiple memory segments.
*/
if (kvtop(sc) & sc->sc_dmamask) {
sc->sc_dmabuffer = (char *)alloc_z2mem(MAXPHYS);
if (isztwomem(sc->sc_dmabuffer))
printf(" bounce pa 0x%x", ztwopa(sc->sc_dmabuffer));
else if (sc->sc_dmabuffer)
printf(" bounce pa 0x%x",
PREP_DMA_MEM(sc->sc_dmabuffer));
}
sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x91);
sc->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 77;