- add some cases for ka52/53 (VAX_BTYP_1303), tested by hugh

- things depend on proc0paddr being zero'd out, so do it
- also forgot a "3100" in a cpu_model

3 files changed, 19 insertions, 5 deletions

diff --git a/sys/arch/vax/vax/findcpu.c b/sys/arch/vax/vax/findcpu.c
index 35f8825ac8c..caaa8645e08 100644
--- a/sys/arch/vax/vax/findcpu.c
+++ b/sys/arch/vax/vax/findcpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: findcpu.c,v 1.1 2000/04/27 01:10:09 bjc Exp $	*/
+/*	$OpenBSD: findcpu.c,v 1.2 2000/10/10 18:21:28 bjc Exp $	*/
 /*	$NetBSD: findcpu.c,v 1.5 1999/08/23 19:10:43 ragge Exp $	*/
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -108,6 +108,7 @@ findcpu()
 		case VAX_BTYP_69D:
 		case VAX_BTYP_630:
 		case VAX_BTYP_650:
+		case VAX_BTYP_1303:	
 			vax_bustype = VAX_IBUS;
 			break;
 
diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c
index 2453e5355c1..d17cb8d38fe 100644
--- a/sys/arch/vax/vax/gencons.c
+++ b/sys/arch/vax/vax/gencons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencons.c,v 1.7 2000/04/27 01:10:12 bjc Exp $	*/
+/*	$OpenBSD: gencons.c,v 1.8 2000/10/10 18:21:28 bjc Exp $	*/
 /*	$NetBSD: gencons.c,v 1.22 2000/01/24 02:40:33 matt Exp $	*/
 
 /*
@@ -272,6 +272,7 @@ gencnprobe(cndev)
 	if ((vax_cputype < VAX_TYP_UV1) || /* All older has MTPR console */
 	    (vax_boardtype == VAX_BTYP_630) ||
 	    (vax_boardtype == VAX_BTYP_670) ||
+		(vax_boardtype == VAX_BTYP_1303) ||
 	    (vax_boardtype == VAX_BTYP_650)) {
 		cndev->cn_dev = makedev(25, 0);
 		cndev->cn_pri = CN_NORMAL;
diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c
index b1b6e3fdf5f..df3232e9274 100644
--- a/sys/arch/vax/vax/locore.c
+++ b/sys/arch/vax/vax/locore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.c,v 1.10 2000/04/27 01:10:13 bjc Exp $	*/
+/*	$OpenBSD: locore.c,v 1.11 2000/10/10 18:21:28 bjc Exp $	*/
 /*	$NetBSD: locore.c,v 1.43 2000/03/26 11:39:45 ragge Exp $	*/
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -69,6 +69,7 @@ extern struct cpu_dep ka43_calls;
 extern struct cpu_dep ka46_calls;
 extern struct cpu_dep ka48_calls;
 extern struct cpu_dep ka49_calls;
+extern struct cpu_dep ka53_calls;
 extern struct cpu_dep ka410_calls;
 extern struct cpu_dep ka630_calls;
 extern struct cpu_dep ka650_calls;
@@ -123,6 +124,7 @@ start()
 #if VAX410
 	case VAX_BTYP_420: /* They are very similar */
 		dep_call = &ka410_calls;
+		strcat(cpu_model, "3100");
 		if (((vax_siedata >> 8) & 0xff) == 1)
 			strcat(cpu_model, "/m{38,48}");
 		else if (((vax_siedata >> 8) & 0xff) == 0)
@@ -149,7 +151,10 @@ start()
 #if VAX48
 	case VAX_BTYP_48:
 		dep_call = &ka48_calls;
-		strcat(cpu_model, "4000 VLC");
+		if (vax_confdata & 0x80)
+			strcat(cpu_model, "3100/m{30,40}");
+		else
+			strcat(cpu_model, "4000 VLC");
 		break;
 #endif
 #if VAX49
@@ -158,6 +163,12 @@ start()
 		strcat(cpu_model, "4000/90");
 		break;
 #endif
+#if VAX53
+	case VAX_BTYP_1303:	
+		dep_call = &ka53_calls;
+		strcat(cpu_model, "4000/{100,105A}");
+		break;
+#endif
 #if VAX630
 	case VAX_BTYP_630:
 		dep_call = &ka630_calls;
@@ -224,7 +235,8 @@ start()
 
         avail_end = TRUNC_PAGE(avail_end); /* be sure */
 
-	proc0.p_addr = (void *)proc0paddr; /* XXX */
+	proc0.p_addr = (struct user *)proc0paddr; /* XXX */
+	bzero((struct user *)proc0paddr, sizeof(struct user));
 
 	/* Clear the used parts of the uarea except for the pcb */
 	bzero(&proc0.p_addr->u_stats, sizeof(struct user) - sizeof(struct pcb));