diff --git a/sys/arch/amiga/dev/bzsc.c b/sys/arch/amiga/dev/bzsc.c index d7004ff1ea91..7739e1394548 100644 --- a/sys/arch/amiga/dev/bzsc.c +++ b/sys/arch/amiga/dev/bzsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: bzsc.c,v 1.7 1996/04/21 21:10:52 veego Exp $ */ +/* $NetBSD: bzsc.c,v 1.8 1996/06/10 16:11:20 is Exp $ */ /* * Copyright (c) 1995 Daniel Widenfalk @@ -334,7 +334,7 @@ do { chain[n].ptr = (p); chain[n].len = (l); chain[n++].flg = (f); } while(0) if (l < 512) set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP); else if ( -#ifdef M68040 +#if defined(M68040) || defined(M68060) ((mmutype == MMU_68040) && ((vm_offset_t)p >= 0xFFFC0000)) && #endif ((vm_offset_t)p >= 0xFF000000)) { diff --git a/sys/arch/amiga/dev/flsc.c b/sys/arch/amiga/dev/flsc.c index 04cebcfd8e7e..9a7087e41e30 100644 --- a/sys/arch/amiga/dev/flsc.c +++ b/sys/arch/amiga/dev/flsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: flsc.c,v 1.6 1996/06/03 17:07:20 is Exp $ */ +/* $NetBSD: flsc.c,v 1.7 1996/06/10 16:11:26 is Exp $ */ /* * Copyright (c) 1995 Daniel Widenfalk @@ -376,7 +376,7 @@ do { chain[n].ptr = (p); chain[n].len = (l); chain[n++].flg = (f); } while(0) if (l < 512) set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP); else if ((p >= (void *)0xFF000000) -#if M68040 +#if defined(M68040) || defined(M68060) && ((mmutype == MMU_68040) && (p >= (void *)0xFFFC0000)) #endif ) { diff --git a/sys/arch/amiga/dev/sbic.c b/sys/arch/amiga/dev/sbic.c index ed7441147060..97343da15c4f 100644 --- a/sys/arch/amiga/dev/sbic.c +++ b/sys/arch/amiga/dev/sbic.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbic.c,v 1.25 1996/05/12 02:26:10 mhitch Exp $ */ +/* $NetBSD: sbic.c,v 1.26 1996/06/10 16:11:33 is Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -1790,7 +1790,7 @@ sbicgo(dev, xs) /* * push the data cache ( I think this won't work (EH)) */ -#if defined(M68040) +#if defined(M68040) || defined(M68060) if (mmutype == MMU_68040 && usedma && count) { dma_cachectl(addr, count); if (((u_int)addr & 0xF) || (((u_int)addr + count) & 0xF)) @@ -2278,10 +2278,11 @@ sbicnextstate(dev, csr, asr) /* * check for overlapping cache line, flush if so */ -#ifdef M68040 +#if defined(M68040) || defined(M68060) if (dev->sc_flags & SBICF_DCFLUSH) { #if 0 - printf("sbic: 68040 DMA cache flush needs fixing? %x:%x\n", + printf("sbic: 68040/68060 DMA cache flush needs" + "fixing? %x:%x\n", dev->sc_xs->data, dev->sc_xs->datalen); #endif } @@ -2557,10 +2558,11 @@ sbicnextstate(dev, csr, asr) /* * check for overlapping cache line, flush if so */ -#ifdef M68040 +#if defined(M68040) || defined(M68060) if (dev->sc_flags & SBICF_DCFLUSH) { #if 0 - printf("sibc: 68040 DMA cache flush needs fixing? %x:%x\n", + printf("sbic: 68040/060 DMA cache flush needs" + "fixing? %x:%x\n", dev->sc_xs->data, dev->sc_xs->datalen); #endif } diff --git a/sys/arch/amiga/dev/sfas.c b/sys/arch/amiga/dev/sfas.c index 8e916fa7341f..0c73942c5451 100644 --- a/sys/arch/amiga/dev/sfas.c +++ b/sys/arch/amiga/dev/sfas.c @@ -1,4 +1,4 @@ -/* $NetBSD: sfas.c,v 1.9 1996/04/23 22:53:23 veego Exp $ */ +/* $NetBSD: sfas.c,v 1.10 1996/06/10 16:11:39 is Exp $ */ /* * Copyright (c) 1995 Daniel Widenfalk @@ -367,7 +367,7 @@ sfas_scsicmd(struct scsi_xfer *xs) * 2) Out data source/destination is not in the u-stack area. */ if (!(flags & SCSI_POLL) && ( -#ifdef M68040 +#if defined(M68040) || defined(M68060) ((mmutype == MMU_68040) && ((vm_offset_t)xs->data >= 0xFFFC0000)) && #endif ((vm_offset_t)xs->data >= 0xFF000000))) {