Changes and bugfixes in memory handling system.

Sysmap too small.
Alloc map page failure.
Support for discontigous memory. Needs testing.
Name changes. "Mach" removal.
Kernel memory size increased.

4 files changed, 11 insertions, 10 deletions

diff --git a/sys/arch/arc/dev/asc.c b/sys/arch/arc/dev/asc.c
index 0a8af5464b9..24780814358 100644
--- a/sys/arch/arc/dev/asc.c
+++ b/sys/arch/arc/dev/asc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc.c,v 1.1 1996/06/24 09:07:19 pefo Exp $	*/
+/*	$OpenBSD: asc.c,v 1.2 1996/08/26 11:11:59 pefo Exp $	*/
 /*	$NetBSD: asc.c,v 1.10 1994/12/05 19:11:12 dean Exp $	*/
 
 /*-
@@ -642,7 +642,7 @@ asc_scsi_cmd(xs)
 	 *  Flush caches for any data buffer
 	 */
 	if(xs->datalen != 0) {
-		MachHitFlushDCache(xs->data, xs->datalen);
+		R4K_HitFlushDCache(xs->data, xs->datalen);
 	}
 	/*
 	 *  The hack on the next few lines are to avoid buffers
@@ -1397,7 +1397,7 @@ asc_end(asc, status, ss, ir)
 			state->buf = (vm_offset_t)&scsicmd->sense;
 			state->buflen = sizeof(struct scsi_sense_data);
 			state->flags |= CHECK_SENSE;
-			MachHitFlushDCache(state->buf, state->buflen);
+			R4K_HitFlushDCache(state->buf, state->buflen);
 			asc->cmd[target] = scsicmd;
 			asc_startcmd(asc, target);
 			return(0);
diff --git a/sys/arch/arc/dev/dma.c b/sys/arch/arc/dev/dma.c
index 433655983de..085ec063793 100644
--- a/sys/arch/arc/dev/dma.c
+++ b/sys/arch/arc/dev/dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma.c,v 1.2 1996/07/30 20:24:20 pefo Exp $	*/
+/*	$OpenBSD: dma.c,v 1.3 1996/08/26 11:11:59 pefo Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rz.c	8.1 (Berkeley) 7/29/93
- *      $Id: dma.c,v 1.2 1996/07/30 20:24:20 pefo Exp $
+ *      $Id: dma.c,v 1.3 1996/08/26 11:11:59 pefo Exp $
  */
 
 /*
@@ -79,7 +79,7 @@ picaDmaInit()
 {
 	int map = PICA_TL_BASE;
 
-	MachFlushCache();	/* Make shure no map entries are cached */
+	R4K_FlushCache();	/* Make shure no map entries are cached */
 
 	bzero((char *)map, PICA_TL_SIZE);
 	free_dma_pte = (dma_pte_t *)map;
diff --git a/sys/arch/arc/dev/fd.c b/sys/arch/arc/dev/fd.c
index aee3df4d52d..fc5d4443775 100644
--- a/sys/arch/arc/dev/fd.c
+++ b/sys/arch/arc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.1 1996/06/24 09:07:19 pefo Exp $	*/
+/*	$OpenBSD: fd.c,v 1.2 1996/08/26 11:12:00 pefo Exp $	*/
 /*	$NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp $	*/
 
 /*-
@@ -877,7 +877,7 @@ loop:
 #endif
 		 }}
 #endif
-		MachFlushDCache(bp->b_data + fd->sc_skip, fd->sc_nbytes);
+		R4K_FlushDCache(bp->b_data + fd->sc_skip, fd->sc_nbytes);
 		read = bp->b_flags & B_READ ? DMA_FROM_DEV : DMA_TO_DEV;
 		DMA_START(fdc->dma, bp->b_data + fd->sc_skip, fd->sc_nbytes, read);
 		outb(iobase + fdctl, type->rate);
diff --git a/sys/arch/arc/dev/if_sn.c b/sys/arch/arc/dev/if_sn.c
index c5148833611..fc9044253fc 100644
--- a/sys/arch/arc/dev/if_sn.c
+++ b/sys/arch/arc/dev/if_sn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sn.c,v 1.2 1996/07/30 20:24:22 pefo Exp $	*/
+/*	$OpenBSD: if_sn.c,v 1.3 1996/08/26 11:12:01 pefo Exp $	*/
 /*
  * National Semiconductor  SONIC Driver
  * Copyright (c) 1991   Algorithmics Ltd (http://www.algor.co.uk)
@@ -326,6 +326,7 @@ snattach(parent, self, aux)
 	p += NRBA * RBASIZE;
 
 	DMA_MAP(sc->dma, (caddr_t)SONICBUF, p - SONICBUF, SONICBUF - pp);
+	printf(" buf:%d",p - SONICBUF);
 
 #if 0
 	camdump(sc);
@@ -663,7 +664,7 @@ sonicput(sc, m0)
 		int resid = m->m_len;
 
 		if(resid != 0) {
-			MachHitFlushDCache(va, resid);
+			R4K_HitFlushDCache(va, resid);
 			DMA_MAP(sc->dma, (caddr_t)va, resid, fragoffset);
 		}
 		len += resid;