Make it possible for mmutype to contain MMU_68060 if the hardware is

actually '060-based, instead to look at the machineid.
This is simpler, and will be required to switch to pmap_motorola anyways.

5 files changed, 11 insertions, 11 deletions

diff --git a/sys/arch/amiga/dev/bzsc.c b/sys/arch/amiga/dev/bzsc.c
index c9c5a86a516..5461ad49cf8 100644
--- a/sys/arch/amiga/dev/bzsc.c
+++ b/sys/arch/amiga/dev/bzsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bzsc.c,v 1.8 2001/11/06 01:47:02 art Exp $	*/
+/*	$OpenBSD: bzsc.c,v 1.9 2001/11/30 22:08:16 miod Exp $	*/
 
 /*	$NetBSD: bzsc.c,v 1.14 1996/12/23 09:09:53 veego Exp $	*/
 
@@ -332,7 +332,7 @@ do { chain[n].ptr = (p); chain[n].len = (l); chain[n++].flg = (f); } while(0)
 		set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP);
 	else if (
 #if defined(M68040) || defined(M68060)
-		 ((mmutype == MMU_68040) && ((vm_offset_t)p >= 0xFFFC0000)) &&
+		 ((mmutype <= MMU_68040) && ((vm_offset_t)p >= 0xFFFC0000)) &&
 #endif
 		 ((vm_offset_t)p >= 0xFF000000)) {
 		int	len;
diff --git a/sys/arch/amiga/dev/bztzsc.c b/sys/arch/amiga/dev/bztzsc.c
index 2bfcd8ff52c..6420f03762d 100644
--- a/sys/arch/amiga/dev/bztzsc.c
+++ b/sys/arch/amiga/dev/bztzsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bztzsc.c,v 1.4 2001/11/06 01:47:02 art Exp $	*/
+/*	$OpenBSD: bztzsc.c,v 1.5 2001/11/30 22:08:16 miod Exp $	*/
 /*	$NetBSD: bztzsc.c,v 1.2 1996/12/23 09:09:54 veego Exp $	*/
 
 /*
@@ -344,7 +344,7 @@ do { chain[n].ptr = (p); chain[n].len = (l); chain[n++].flg = (f); } while(0)
 		set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP);
 	else if ((p >= (void *)0xFF000000)
 #if defined(M68040) || defined(M68060)
-		 && ((mmutype == MMU_68040) && (p >= (void *)0xFFFC0000))
+		 && ((mmutype <= MMU_68040) && (p >= (void *)0xFFFC0000))
 #endif
 		 ) {
 		while(l != 0) {
diff --git a/sys/arch/amiga/dev/flsc.c b/sys/arch/amiga/dev/flsc.c
index 954d9331bdc..4989593b33a 100644
--- a/sys/arch/amiga/dev/flsc.c
+++ b/sys/arch/amiga/dev/flsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flsc.c,v 1.10 2001/11/06 01:47:02 art Exp $	*/
+/*	$OpenBSD: flsc.c,v 1.11 2001/11/30 22:08:16 miod Exp $	*/
 /*	$NetBSD: flsc.c,v 1.14 1996/12/23 09:10:00 veego Exp $	*/
 
 /*
@@ -361,7 +361,7 @@ do { chain[n].ptr = (p); chain[n].len = (l); chain[n++].flg = (f); } while(0)
 		set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP);
 	else if ((p >= (void *)0xFF000000)
 #if defined(M68040) || defined(M68060)
-		 && ((mmutype == MMU_68040) && (p >= (void *)0xFFFC0000))
+		 && ((mmutype <= MMU_68040) && (p >= (void *)0xFFFC0000))
 #endif
 		 ) {
 		while(l != 0) {
diff --git a/sys/arch/amiga/dev/sbic.c b/sys/arch/amiga/dev/sbic.c
index 1d540674a43..7493889fa83 100644
--- a/sys/arch/amiga/dev/sbic.c
+++ b/sys/arch/amiga/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.14 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: sbic.c,v 1.15 2001/11/30 22:08:16 miod Exp $	*/
 /*	$NetBSD: sbic.c,v 1.28 1996/10/13 03:07:29 christos Exp $	*/
 
 /*
@@ -1789,7 +1789,7 @@ sbicgo(dev, xs)
 	 * push the data cache ( I think this won't work (EH))
 	 */
 #if defined(M68040) || defined(M68060)
-	if (mmutype == MMU_68040 && usedma && count) {
+	if (mmutype <= MMU_68040 && usedma && count) {
 		dma_cachectl(addr, count);
 		if (((u_int)addr & 0xF) || (((u_int)addr + count) & 0xF))
 			dev->sc_flags |= SBICF_DCFLUSH;
diff --git a/sys/arch/amiga/dev/sfas.c b/sys/arch/amiga/dev/sfas.c
index 1bf72b72b04..a51a2955e98 100644
--- a/sys/arch/amiga/dev/sfas.c
+++ b/sys/arch/amiga/dev/sfas.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: sfas.c,v 1.13 2001/11/06 01:47:02 art Exp $  */
+/*    $OpenBSD: sfas.c,v 1.14 2001/11/30 22:08:16 miod Exp $  */
 /*	$NetBSD: sfas.c,v 1.12 1996/10/13 03:07:33 christos Exp $	*/
 
 /*
@@ -345,7 +345,7 @@ sfas_scsicmd(struct scsi_xfer *xs)
  */
 	if (!(flags & SCSI_POLL) && (
 #if defined(M68040) || defined(M68060)
-	    ((mmutype == MMU_68040) && ((vm_offset_t)xs->data >= 0xFFFC0000)) &&
+	    ((mmutype <= MMU_68040) && ((vm_offset_t)xs->data >= 0xFFFC0000)) &&
 #endif
 		       ((vm_offset_t)xs->data >= 0xFF000000))) {
 		vm_offset_t	 sva;
@@ -913,7 +913,7 @@ sfas_setup_nexus(dev, nexus, pendp, cbuf, clen, buf, len, mode)
 	}
 
 /* Flush the caches. (If needed) */
-	if ((mmutype == MMU_68040) && len && !(mode & SFAS_SELECT_I))
+	if ((mmutype <= MMU_68040) && len && !(mode & SFAS_SELECT_I))
 		dma_cachectl(buf, len);
 }