diff --git a/sys/arch/vax/vax/ka46.c b/sys/arch/vax/vax/ka46.c index 1aff071547bd..bee4c719dd2a 100644 --- a/sys/arch/vax/vax/ka46.c +++ b/sys/arch/vax/vax/ka46.c @@ -1,4 +1,4 @@ -/* $NetBSD: ka46.c,v 1.15 2000/06/29 07:14:26 mrg Exp $ */ +/* $NetBSD: ka46.c,v 1.16 2001/02/18 16:56:22 ragge Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -53,13 +53,13 @@ #include #include -static void ka46_conf __P((void)); -static void ka46_steal_pages __P((void)); -static void ka46_memerr __P((void)); -static int ka46_mchk __P((caddr_t)); -static void ka46_halt __P((void)); -static void ka46_reboot __P((int)); -static void ka46_cache_enable __P((void)); +static void ka46_conf(void); +static void ka46_steal_pages(void); +static void ka46_memerr(void); +static int ka46_mchk(caddr_t); +static void ka46_halt(void); +static void ka46_reboot(int); +static void ka46_cache_enable(void); struct vs_cpu *ka46_cpu; @@ -137,8 +137,7 @@ ka46_memerr() } int -ka46_mchk(addr) - caddr_t addr; +ka46_mchk(caddr_t addr) { panic("Machine check"); return 0; @@ -152,15 +151,20 @@ ka46_steal_pages() ka46_cache_enable(); } +#define KA46_CPMBX 0x38 +#define KA46_HLT_HALT 0xcf +#define KA46_HLT_BOOT 0x8b + static void ka46_halt() { + ((u_int8_t *) clk_page)[KA46_CPMBX] = KA46_HLT_HALT; asm("halt"); } static void -ka46_reboot(arg) - int arg; +ka46_reboot(int arg) { + ((u_int8_t *) clk_page)[KA46_CPMBX] = KA46_HLT_BOOT; asm("halt"); } diff --git a/sys/arch/vax/vax/ka49.c b/sys/arch/vax/vax/ka49.c index 743e0865a26c..1707a6c2f029 100644 --- a/sys/arch/vax/vax/ka49.c +++ b/sys/arch/vax/vax/ka49.c @@ -39,19 +39,19 @@ #include #define KA49_CPMBX 0x38 -#define KA49_HLT_HALT 0x03 -#define KA49_HLT_BOOT 0x02 +#define KA49_HLT_HALT 0xcf +#define KA49_HLT_BOOT 0x8b -static void ka49_conf __P((void)); -static void ka49_memerr __P((void)); -static int ka49_mchk __P((caddr_t)); -static void ka49_halt __P((void)); -static void ka49_reboot __P((int)); -static void ka49_softmem __P((void *)); -static void ka49_hardmem __P((void *)); -static void ka49_steal_pages __P((void)); -static void ka49_cache_enable __P((void)); -static void ka49_halt __P((void)); +static void ka49_conf(void); +static void ka49_memerr(void); +static int ka49_mchk(caddr_t); +static void ka49_halt(void); +static void ka49_reboot(int); +static void ka49_softmem(void *); +static void ka49_hardmem(void *); +static void ka49_steal_pages(void); +static void ka49_cache_enable(void); +static void ka49_halt(void); /* * Declaration of 49-specific calls. @@ -93,8 +93,7 @@ ka49_conf() * Why may we get memory errors during startup??? */ void -ka49_hardmem(arg) - void *arg; +ka49_hardmem(void *arg) { if (cold == 0) printf("Hard memory error\n"); @@ -102,8 +101,7 @@ ka49_hardmem(arg) } void -ka49_softmem(arg) - void *arg; +ka49_softmem(void *arg) { if (cold == 0) printf("Soft memory error\n"); @@ -205,8 +203,7 @@ ka49_memerr() } int -ka49_mchk(addr) - caddr_t addr; +ka49_mchk(caddr_t addr) { panic("Machine check"); return 0; @@ -234,8 +231,7 @@ ka49_halt() } static void -ka49_reboot(arg) - int arg; +ka49_reboot(int arg) { ((u_int8_t *) clk_page)[KA49_CPMBX] = KA49_HLT_BOOT; asm("halt");