First shot at a multivendor kernel. This version handles pica's and desk-

station tyne's. Auto detection still needs to be compleeted.
Checked in version is hardwired for pica's. Use the PICA config file.

3 files changed, 6 insertions, 5 deletions

diff --git a/sys/arch/arc/include/bus.h b/sys/arch/arc/include/bus.h
index c9ab54932a2..77db1fa692c 100644
--- a/sys/arch/arc/include/bus.h
+++ b/sys/arch/arc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.3 1996/07/30 20:24:24 pefo Exp $	*/
+/*	$OpenBSD: bus.h,v 1.4 1996/09/14 15:58:25 pefo Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -101,7 +101,7 @@ struct arc_isa_busmap {
 #endif
 
 #define bus_mem_map(t, addr, size, cacheable, mhp)			\
-    (*mhp = (t == NULL ? port : port + (ulong)(t->isa_mem_base)), 0)
+    (*mhp = (bus_mem_handle_t)(t == NULL ? addr : addr + (ulong)(t->isa_mem_base)), 0)
 #define bus_mem_unmap(t, ioh, size)
 
 #define	bus_mem_read_1(t, h, o)		(*(volatile u_int8_t *)((h) + (o)))
diff --git a/sys/arch/arc/include/cpu.h b/sys/arch/arc/include/cpu.h
index 3330f03c8b9..033e0414373 100644
--- a/sys/arch/arc/include/cpu.h
+++ b/sys/arch/arc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.3 1996/08/26 11:12:02 pefo Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.4 1996/09/14 15:58:25 pefo Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -297,6 +297,7 @@
 struct clockframe {
 	int	pc;	/* program counter at time of interrupt */
 	int	sr;	/* status register at time of interrupt */
+	int	cr;	/* cause register at time of interrupt */
 };
 
 #define	CLKF_USERMODE(framep)	((framep)->sr & SR_KSU_USER)
diff --git a/sys/arch/arc/include/memconf.h b/sys/arch/arc/include/memconf.h
index c4e4e760b52..3064c1a04cd 100644
--- a/sys/arch/arc/include/memconf.h
+++ b/sys/arch/arc/include/memconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memconf.h,v 1.1 1996/08/26 11:12:02 pefo Exp $	*/
+/*	$OpenBSD: memconf.h,v 1.2 1996/09/14 15:58:26 pefo Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -43,7 +43,7 @@ struct mem_descriptor {
 };
 
 #ifdef _KERNEL
-#define	MAXMEMSEGS	8
+#define	MAXMEMSEGS	16
 extern struct mem_descriptor mem_layout[];
 #endif