diff options
-rw-r--r-- | sys/arch/vax/conf/Makefile.vax | 5 | ||||
-rw-r--r-- | sys/arch/vax/vax/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/vax/vax/disksubr.c | 3 | ||||
-rw-r--r-- | sys/arch/vax/vax/gencons.c | 22 | ||||
-rw-r--r-- | sys/arch/vax/vax/machdep.c | 9 | ||||
-rw-r--r-- | sys/arch/vax/vsa/vsbus.c | 10 |
6 files changed, 28 insertions, 25 deletions
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index 55a23f35bf0..066c7c420ec 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.23 2003/05/13 22:45:11 miod Exp $ +# $OpenBSD: Makefile.vax,v 1.24 2003/06/26 13:06:22 miod Exp $ # $NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $ # Makefile for OpenBSD/vax @@ -65,7 +65,8 @@ VAX= $S/arch/vax INCLUDES= -I. -I$S/arch -I$S -nostdinc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ -D_VAX_INLINE_ -CWARNFLAGS?= -Werror -Wall -Wno-main -Wno-format -Wno-uninitialized +CWARNFLAGS?= -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \ + -Wno-main -Wno-format -Wno-uninitialized .if ${IDENT:M-DNO_PROPOLICE} CMACHFLAGS+= -fno-stack-protector .endif diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index fb6d84a7c13..e3ba6533630 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.40 2003/06/02 23:27:58 millert Exp $ */ +/* $OpenBSD: conf.c,v 1.41 2003/06/26 13:06:26 miod Exp $ */ /* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ /*- @@ -555,6 +555,8 @@ iszerodev(dev) return (major(dev) == 3 && minor(dev) == 12); } +int getmajor(void *); /* XXX used by dz_ibus and smg, die die die */ + int getmajor(void *ptr) { diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c index 33ba76f85df..bad32205d8a 100644 --- a/sys/arch/vax/vax/disksubr.c +++ b/sys/arch/vax/vax/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.19 2003/06/02 23:27:58 millert Exp $ */ +/* $OpenBSD: disksubr.c,v 1.20 2003/06/26 13:06:26 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $ */ /* @@ -40,6 +40,7 @@ #include <sys/syslog.h> #include <sys/proc.h> #include <sys/user.h> +#include <sys/disk.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c index 3ee281922fb..6e031c347fb 100644 --- a/sys/arch/vax/vax/gencons.c +++ b/sys/arch/vax/vax/gencons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gencons.c,v 1.14 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: gencons.c,v 1.15 2003/06/26 13:06:26 miod Exp $ */ /* $NetBSD: gencons.c,v 1.22 2000/01/24 02:40:33 matt Exp $ */ /* @@ -54,21 +54,23 @@ #include <machine/scb.h> #include <machine/../vax/gencons.h> -static struct tty *gencn_tty[4]; +struct tty *gencn_tty[4]; -static int consopened = 0; -static int maxttys = 1; +int consopened = 0; +int maxttys = 1; -static int pr_txcs[4] = {PR_TXCS, PR_TXCS1, PR_TXCS2, PR_TXCS3}; -static int pr_rxcs[4] = {PR_RXCS, PR_RXCS1, PR_RXCS2, PR_RXCS3}; -static int pr_txdb[4] = {PR_TXDB, PR_TXDB1, PR_TXDB2, PR_TXDB3}; -static int pr_rxdb[4] = {PR_RXDB, PR_RXDB1, PR_RXDB2, PR_RXDB3}; +int pr_txcs[4] = {PR_TXCS, PR_TXCS1, PR_TXCS2, PR_TXCS3}; +int pr_rxcs[4] = {PR_RXCS, PR_RXCS1, PR_RXCS2, PR_RXCS3}; +int pr_txdb[4] = {PR_TXDB, PR_TXDB1, PR_TXDB2, PR_TXDB3}; +int pr_rxdb[4] = {PR_RXDB, PR_RXDB1, PR_RXDB2, PR_RXDB3}; cons_decl(gen); cdev_decl(gencn); -static int gencnparam(struct tty *, struct termios *); -static void gencnstart(struct tty *); +int gencnparam(struct tty *, struct termios *); +void gencnstart(struct tty *); +void gencnrint(void *); +void gencntint(void *); int gencnopen(dev, flag, mode, p) diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index c8e9f75da98..bb9d0d30052 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.67 2003/06/02 23:27:59 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.68 2003/06/26 13:06:26 miod Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -165,6 +165,8 @@ struct vm_map *phys_map = NULL; int iospace_inited = 0; #endif +void cpu_dumpconf(void); + void cpu_startup() { @@ -821,7 +823,10 @@ allocsys(v) * to skip instructions. */ -long skip_operand(long ib, int size); +long skip_operand(long, int); +long skip_opcode(long); + +static u_int8_t get_byte(long); static __inline__ u_int8_t get_byte(ib) diff --git a/sys/arch/vax/vsa/vsbus.c b/sys/arch/vax/vsa/vsbus.c index dbc1d3ce5c3..3afabb0b0d4 100644 --- a/sys/arch/vax/vsa/vsbus.c +++ b/sys/arch/vax/vsa/vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsbus.c,v 1.11 2003/04/02 23:42:13 jason Exp $ */ +/* $OpenBSD: vsbus.c,v 1.12 2003/06/26 13:06:26 miod Exp $ */ /* $NetBSD: vsbus.c,v 1.29 2000/06/29 07:14:37 mrg Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. @@ -106,14 +106,6 @@ struct cfdriver vsbus_cd = { NULL, "vsbus", DV_DULL }; -/* dummy interrupt handler for use during autoconf */ -void -vsbus_intr(arg) - void *arg; -{ - return; -} - int vsbus_print(aux, name) void *aux; |