Add support for OS defined halt action on Pele and Spitfire.

Testing by Brandon Creighton and Jim Uhl.

2 files changed, 9 insertions, 36 deletions

diff --git a/sys/arch/vax/vax/ka660.c b/sys/arch/vax/vax/ka660.c
index 23684998f75..52ec1e13b39 100644
--- a/sys/arch/vax/vax/ka660.c
+++ b/sys/arch/vax/vax/ka660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka660.c,v 1.3 2001/11/06 19:53:17 miod Exp $	*/
+/*	$OpenBSD: ka660.c,v 1.4 2002/09/28 06:25:11 hugh Exp $	*/
 /*	$NetBSD: ka660.c,v 1.3 2000/06/29 07:14:27 mrg Exp $	*/
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden.
@@ -63,8 +63,6 @@
 static void    ka660_conf(void);
 static void    ka660_memerr(void);
 static int     ka660_mchk(caddr_t);
-static void    ka660_halt(void);
-static void    ka660_reboot(int);
 static void    ka660_cache_enable(void);
 
 struct vs_cpu *ka660_cpu;
@@ -81,8 +79,8 @@ struct cpu_dep ka660_calls = {
 	generic_clkwrite,
 	6,	/* ~VUPS */
 	2,	/* SCB pages */
-	ka660_halt,
-	ka660_reboot,
+	generic_halt,
+	generic_reboot,
 };
 
 
@@ -90,6 +88,8 @@ void
 ka660_conf()
 {
 	printf("cpu0: KA660, microcode Rev. %d\n", vax_cpudata & 0377);
+
+	cpmbx = (struct cpmbx *)vax_map_physmem(0x20140400, 1);
 }
 
 void
@@ -136,16 +136,3 @@ ka660_mchk(addr)
 	panic("Machine check");
 	return 0;
 }
-
-static void
-ka660_halt()
-{
-	asm("halt");
-}
-
-static void
-ka660_reboot(int arg)
-{
-	asm("halt");
-}
-
diff --git a/sys/arch/vax/vax/ka670.c b/sys/arch/vax/vax/ka670.c
index 9e73780932b..57021664e81 100644
--- a/sys/arch/vax/vax/ka670.c
+++ b/sys/arch/vax/vax/ka670.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka670.c,v 1.5 2002/03/14 03:16:02 millert Exp $	*/
+/*	$OpenBSD: ka670.c,v 1.6 2002/09/28 06:25:11 hugh Exp $	*/
 /*	$NetBSD: ka670.c,v 1.4 2000/03/13 23:52:35 soren Exp $	*/
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
@@ -57,8 +57,6 @@ static	void ka670_conf(void);
 static	int ka670_mchk(caddr_t);
 static	void ka670_memerr(void);
 static	int ka670_cache_init(void);	/* "int mapen" as argument? */
-static	void ka670_halt(void);
-static	void ka670_reboot(int);
 
 struct	cpu_dep ka670_calls = {
 	0,
@@ -69,8 +67,8 @@ struct	cpu_dep ka670_calls = {
 	generic_clkwrite,
 	8,	/* 8 VUP */
 	2,	/* SCB pages */
-	ka670_halt,
-	ka670_reboot,
+	generic_halt,
+	generic_reboot,
 	0,
 };
 
@@ -203,18 +201,6 @@ ka670_conf()
 	 * init/reset the caches.
 	 */
 	ka670_cache_init();
-}
-
-static void
-ka670_halt()
-{
-	asm("halt");
-}
 
-static void
-ka670_reboot(arg)
-	int arg;
-{
-	asm("halt");
+	cpmbx = (struct cpmbx *)vax_map_physmem(0x20140400, 1);
 }
-