summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorsimonb <simonb@NetBSD.org>2000-01-08 01:02:35 +0000
committersimonb <simonb@NetBSD.org>2000-01-08 01:02:35 +0000
commitee075b7de7e41ca64aa5f25484e91abf3a388209 (patch)
tree9d4d3a6ac02ff00a28093754df78aea318def017 /sys
parent58465c9fcd7701002400bba164423a6e507ecc4d (diff)
Function prototype cleanup.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/pmax/dev/bt459.h22
-rw-r--r--sys/arch/pmax/dev/bt478.c4
-rw-r--r--sys/arch/pmax/dev/bt478var.h18
-rw-r--r--sys/arch/pmax/dev/cfb.c10
-rw-r--r--sys/arch/pmax/dev/cfbvar.h4
-rw-r--r--sys/arch/pmax/dev/dc.c40
-rw-r--r--sys/arch/pmax/dev/dc_cons.h10
-rw-r--r--sys/arch/pmax/dev/dc_ds.c4
-rw-r--r--sys/arch/pmax/dev/dc_ds_cons.h4
-rw-r--r--sys/arch/pmax/dev/dcvar.h13
-rw-r--r--sys/arch/pmax/dev/device.h6
-rw-r--r--sys/arch/pmax/dev/dtop.c30
-rw-r--r--sys/arch/pmax/dev/fb.c6
-rw-r--r--sys/arch/pmax/dev/fbreg.h22
-rw-r--r--sys/arch/pmax/dev/findcons.c26
-rw-r--r--sys/arch/pmax/dev/ims332.h22
-rw-r--r--sys/arch/pmax/dev/lk201.c4
-rw-r--r--sys/arch/pmax/dev/lk201var.h12
-rw-r--r--sys/arch/pmax/dev/mfb.c46
-rw-r--r--sys/arch/pmax/dev/mfbvar.h5
-rw-r--r--sys/arch/pmax/dev/pm.c30
-rw-r--r--sys/arch/pmax/dev/pm_ds.c6
-rw-r--r--sys/arch/pmax/dev/pmvar.h6
-rw-r--r--sys/arch/pmax/dev/qvss_compat.c32
-rw-r--r--sys/arch/pmax/dev/rcons.c8
-rw-r--r--sys/arch/pmax/dev/rconsvar.h6
-rw-r--r--sys/arch/pmax/dev/rz.c48
-rw-r--r--sys/arch/pmax/dev/scsi.h30
-rw-r--r--sys/arch/pmax/dev/sfb.c10
-rw-r--r--sys/arch/pmax/dev/sfbvar.h5
-rw-r--r--sys/arch/pmax/dev/sii.c31
-rw-r--r--sys/arch/pmax/dev/sii_ds.c14
-rw-r--r--sys/arch/pmax/dev/siivar.h4
-rw-r--r--sys/arch/pmax/dev/tz.c4
-rw-r--r--sys/arch/pmax/dev/xcfb.c6
-rw-r--r--sys/arch/pmax/ibus/ibus_3max.c8
-rw-r--r--sys/arch/pmax/ibus/ibus_pmax.c8
-rw-r--r--sys/arch/pmax/ibus/ibusvar.h30
-rw-r--r--sys/arch/pmax/include/autoconf.h4
-rw-r--r--sys/arch/pmax/include/bootinfo.h4
-rw-r--r--sys/arch/pmax/include/fbvar.h18
-rw-r--r--sys/arch/pmax/include/intr.h16
-rw-r--r--sys/arch/pmax/include/param.h6
-rw-r--r--sys/arch/pmax/include/tc_machdep.h4
-rw-r--r--sys/arch/pmax/pmax/autoconf.c10
-rw-r--r--sys/arch/pmax/pmax/bus_dma.c4
-rw-r--r--sys/arch/pmax/pmax/conf-glue.c4
-rw-r--r--sys/arch/pmax/pmax/cpu.c8
-rw-r--r--sys/arch/pmax/pmax/dec_3100.c7
-rw-r--r--sys/arch/pmax/pmax/dec_3max.c9
-rw-r--r--sys/arch/pmax/pmax/dec_3maxplus.c11
-rw-r--r--sys/arch/pmax/pmax/dec_3min.c13
-rw-r--r--sys/arch/pmax/pmax/dec_5100.c21
-rw-r--r--sys/arch/pmax/pmax/dec_maxine.c9
-rw-r--r--sys/arch/pmax/pmax/disksubr.c14
-rw-r--r--sys/arch/pmax/pmax/machdep.c10
-rw-r--r--sys/arch/pmax/pmax/memc.h4
-rw-r--r--sys/arch/pmax/pmax/memc_3min.c6
-rw-r--r--sys/arch/pmax/pmax/sysconf.c20
-rw-r--r--sys/arch/pmax/pmax/turbochannel.h13
-rw-r--r--sys/arch/pmax/tc/ioasic.c6
-rw-r--r--sys/arch/pmax/tc/mcclock_ioasic.c8
-rw-r--r--sys/arch/pmax/tc/scc.c8
-rw-r--r--sys/arch/pmax/tc/sccvar.h10
-rw-r--r--sys/arch/pmax/tc/tcbus.c8
65 files changed, 419 insertions, 430 deletions
diff --git a/sys/arch/pmax/dev/bt459.h b/sys/arch/pmax/dev/bt459.h
index e854b2f104e..1d18732e495 100644
--- a/sys/arch/pmax/dev/bt459.h
+++ b/sys/arch/pmax/dev/bt459.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bt459.h,v 1.5 1999/12/09 00:16:14 simonb Exp $ */
+/* $NetBSD: bt459.h,v 1.6 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -149,14 +149,14 @@ typedef struct {
#define BT459_REG_CRAM_END 0x07ff
#ifdef _KERNEL
-int bt459init (struct fbinfo *);
-void bt459RestoreCursorColor (struct fbinfo *);
-void bt459CursorColor (struct fbinfo *, unsigned int []);
-void bt459PosCursor (struct fbinfo *, int, int);
-void bt459InitColorMap (struct fbinfo *);
-int bt459LoadColorMap (struct fbinfo *, const u_char *, int, int);
-int bt459GetColorMap (struct fbinfo *, u_char *, int, int);
-void bt459LoadCursor (struct fbinfo *, u_short *);
-int bt459_video_on (struct fbinfo *);
-int bt459_video_off (struct fbinfo *);
+int bt459init __P((struct fbinfo *));
+void bt459RestoreCursorColor __P((struct fbinfo *));
+void bt459CursorColor __P((struct fbinfo *, unsigned int []));
+void bt459PosCursor __P((struct fbinfo *, int, int));
+void bt459InitColorMap __P((struct fbinfo *));
+int bt459LoadColorMap __P((struct fbinfo *, const u_char *, int, int));
+int bt459GetColorMap __P((struct fbinfo *, u_char *, int, int));
+void bt459LoadCursor __P((struct fbinfo *, u_short *));
+int bt459_video_on __P((struct fbinfo *));
+int bt459_video_off __P((struct fbinfo *));
#endif /* _KERNEL */
diff --git a/sys/arch/pmax/dev/bt478.c b/sys/arch/pmax/dev/bt478.c
index 6f6a10e93bc..e430a237a83 100644
--- a/sys/arch/pmax/dev/bt478.c
+++ b/sys/arch/pmax/dev/bt478.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt478.c,v 1.12 1999/12/09 00:16:14 simonb Exp $ */
+/* $NetBSD: bt478.c,v 1.13 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -79,7 +79,7 @@
/* XXX qvss ioctl interface uses this */
-void bt478CursorColor __P((struct fbinfo *fi, unsigned int color[]));
+void bt478CursorColor __P((struct fbinfo *fi, unsigned int color[]));
static u_char bg_RGB[3]; /* background color for the cursor */
diff --git a/sys/arch/pmax/dev/bt478var.h b/sys/arch/pmax/dev/bt478var.h
index a1d87846cea..30a4ea1c3de 100644
--- a/sys/arch/pmax/dev/bt478var.h
+++ b/sys/arch/pmax/dev/bt478var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bt478var.h,v 1.4 1999/12/09 00:16:14 simonb Exp $ */
+/* $NetBSD: bt478var.h,v 1.5 2000/01/08 01:02:35 simonb Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -18,11 +18,11 @@
* chipset driver.
*/
-int bt478init __P((struct fbinfo *fi));
-void bt478BlankCursor __P((struct fbinfo *fi));
-void bt478RestoreCursorColor __P((struct fbinfo *fi));
-void bt478InitColorMap __P((struct fbinfo *fi));
-int bt478LoadColorMap __P ((struct fbinfo *fi, const u_char *bits,
- int index, int count));
-int bt478GetColorMap __P ((struct fbinfo *fi, u_char *bits,
- int index, int count));
+int bt478init __P((struct fbinfo *fi));
+void bt478BlankCursor __P((struct fbinfo *fi));
+void bt478RestoreCursorColor __P((struct fbinfo *fi));
+void bt478InitColorMap __P((struct fbinfo *fi));
+int bt478LoadColorMap __P((struct fbinfo *fi, const u_char *bits,
+ int index, int count));
+int bt478GetColorMap __P((struct fbinfo *fi, u_char *bits,
+ int index, int count));
diff --git a/sys/arch/pmax/dev/cfb.c b/sys/arch/pmax/dev/cfb.c
index c225a904b8b..cd3facceb7c 100644
--- a/sys/arch/pmax/dev/cfb.c
+++ b/sys/arch/pmax/dev/cfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.34 1999/09/05 11:34:29 simonb Exp $ */
+/* $NetBSD: cfb.c,v 1.35 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -127,7 +127,7 @@ struct fbdriver cfb_driver = {
bt459CursorColor
};
-int cfbinit __P((struct fbinfo *fi, caddr_t cfbaddr, int unit, int silent));
+int cfbinit __P((struct fbinfo *fi, caddr_t cfbaddr, int unit, int silent));
#define CFB_OFFSET_VRAM 0x0 /* from module's base */
#define CFB_OFFSET_BT459 0x200000 /* Bt459 registers */
@@ -142,9 +142,9 @@ int cfbinit __P((struct fbinfo *fi, caddr_t cfbaddr, int unit, int silent));
* code is completely gone.
*/
-int cfbmatch __P((struct device *, struct cfdata *, void *));
-void cfbattach __P((struct device *, struct device *, void *));
-int cfb_intr __P((void *sc));
+int cfbmatch __P((struct device *, struct cfdata *, void *));
+void cfbattach __P((struct device *, struct device *, void *));
+int cfb_intr __P((void *sc));
struct cfattach cfb_ca = {
sizeof(struct fbsoftc), cfbmatch, cfbattach
diff --git a/sys/arch/pmax/dev/cfbvar.h b/sys/arch/pmax/dev/cfbvar.h
index ceb80ca8817..a91cb85268f 100644
--- a/sys/arch/pmax/dev/cfbvar.h
+++ b/sys/arch/pmax/dev/cfbvar.h
@@ -1,7 +1,7 @@
-/* $NetBSD: cfbvar.h,v 1.3 1999/11/19 02:35:40 simonb Exp $ */
+/* $NetBSD: cfbvar.h,v 1.4 2000/01/08 01:02:35 simonb Exp $ */
/*
* Initialize a Turbochannel CFB dumb 2-d framebuffer,
* so it can be used as a bitmapped glass-tty console device.
*/
-int cfbinit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
+int cfbinit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
diff --git a/sys/arch/pmax/dev/dc.c b/sys/arch/pmax/dev/dc.c
index c93106c6029..89291f65fe2 100644
--- a/sys/arch/pmax/dev/dc.c
+++ b/sys/arch/pmax/dev/dc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dc.c,v 1.56 2000/01/06 05:22:07 simonb Exp $ */
+/* $NetBSD: dc.c,v 1.57 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.56 2000/01/06 05:22:07 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.57 2000/01/08 01:02:35 simonb Exp $");
/*
* devDC7085.c --
@@ -118,30 +118,30 @@ extern struct cfdriver dc_cd;
/*
* Forward declarations
*/
-struct tty *dctty __P((dev_t dev));
-void dcstart __P((struct tty *));
-void dcrint __P((struct dc_softc *sc));
-void dcxint __P((struct tty *));
-int dcmctl __P((dev_t dev, int bits, int how));
-void dcscan __P((void *));
-int dcparam __P((struct tty *tp, struct termios *t));
-static int cold_dcparam __P((struct tty *tp, struct termios *t,
- struct dc_softc *sc));
+struct tty *dctty __P((dev_t dev));
+void dcstart __P((struct tty *));
+void dcrint __P((struct dc_softc *sc));
+void dcxint __P((struct tty *));
+int dcmctl __P((dev_t dev, int bits, int how));
+void dcscan __P((void *));
+int dcparam __P((struct tty *tp, struct termios *t));
+static int cold_dcparam __P((struct tty *tp, struct termios *t,
+ struct dc_softc *sc));
+void dc_reset __P((dcregs *dcaddr));
-extern void ttrstrt __P((void *));
+void ttrstrt __P((void *));
-void dc_reset __P ((dcregs *dcaddr));
/* console I/O */
-int dcGetc __P((dev_t));
-void dcPutc __P((dev_t, int));
-void dcPollc __P((dev_t, int));
-void dc_consinit __P((dev_t dev, dcregs *dcaddr));
+int dcGetc __P((dev_t));
+void dcPutc __P((dev_t, int));
+void dcPollc __P((dev_t, int));
+void dc_consinit __P((dev_t dev, dcregs *dcaddr));
-void dc_tty_init __P((struct dc_softc *sc, dev_t dev));
+void dc_tty_init __P((struct dc_softc *sc, dev_t dev));
#if NRASTERCONSOLE > 0
-void dc_kbd_init __P((struct dc_softc *sc, dev_t dev));
-void dc_mouse_init __P((struct dc_softc *sc, dev_t dev));
+void dc_kbd_init __P((struct dc_softc *sc, dev_t dev));
+void dc_mouse_init __P((struct dc_softc *sc, dev_t dev));
#endif
diff --git a/sys/arch/pmax/dev/dc_cons.h b/sys/arch/pmax/dev/dc_cons.h
index 8110a2a2629..8b87a11dc9a 100644
--- a/sys/arch/pmax/dev/dc_cons.h
+++ b/sys/arch/pmax/dev/dc_cons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dc_cons.h,v 1.1 1996/10/13 03:42:17 jonathan Exp $ */
+/* $NetBSD: dc_cons.h,v 1.2 2000/01/08 01:02:35 simonb Exp $ */
#ifdef _KERNEL
#ifndef _DC_CONS_H
@@ -8,10 +8,10 @@
* Following declaratios for console code.
* XXX should be redesigned to expose less driver internals.
*/
-void dc_consinit __P((dev_t dev, dcregs *dcaddr));
-extern int dcGetc __P ((dev_t dev));
-extern int dcparam __P((register struct tty *tp, register struct termios *t));
-extern void dcPutc __P((dev_t dev, int c));
+void dc_consinit __P((dev_t dev, dcregs *dcaddr));
+int dcGetc __P((dev_t dev));
+int dcparam __P((register struct tty *tp, register struct termios *t));
+void dcPutc __P((dev_t dev, int c));
#endif /* _DCVAR_H */
#endif /* _KERNEL */
diff --git a/sys/arch/pmax/dev/dc_ds.c b/sys/arch/pmax/dev/dc_ds.c
index 4b77c962095..de004ed834a 100644
--- a/sys/arch/pmax/dev/dc_ds.c
+++ b/sys/arch/pmax/dev/dc_ds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dc_ds.c,v 1.12 1999/12/08 04:03:28 simonb Exp $ */
+/* $NetBSD: dc_ds.c,v 1.13 2000/01/08 01:02:35 simonb Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -36,7 +36,7 @@
/*
* Autoconfig definition of driver front-end
*/
-int dc_ds_match __P((struct device * parent, struct cfdata *match, void *aux));
+int dc_ds_match __P((struct device * parent, struct cfdata *match, void *aux));
void dc_ds_attach __P((struct device *parent, struct device *self, void *aux));
struct cfattach dc_ds_ca = {
diff --git a/sys/arch/pmax/dev/dc_ds_cons.h b/sys/arch/pmax/dev/dc_ds_cons.h
index 6b19ba04b89..ec8b2908e9d 100644
--- a/sys/arch/pmax/dev/dc_ds_cons.h
+++ b/sys/arch/pmax/dev/dc_ds_cons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dc_ds_cons.h,v 1.1 1996/09/25 20:48:55 jonathan Exp $ */
+/* $NetBSD: dc_ds_cons.h,v 1.2 2000/01/08 01:02:35 simonb Exp $ */
#ifdef _KERNEL
#ifndef _DC_DS_CONS_H
@@ -8,7 +8,7 @@
* Following declaratios for console code.
* XXX should be redesigned to expose less driver internals.
*/
-int dc_ds_consinit __P((dev_t dev));
+int dc_ds_consinit __P((dev_t dev));
#endif /* _DC_DS_CONS_H */
#endif /* _KERNEL */
diff --git a/sys/arch/pmax/dev/dcvar.h b/sys/arch/pmax/dev/dcvar.h
index ed60f26bf59..be2ac9b9c1a 100644
--- a/sys/arch/pmax/dev/dcvar.h
+++ b/sys/arch/pmax/dev/dcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dcvar.h,v 1.6 1999/12/08 00:13:33 simonb Exp $ */
+/* $NetBSD: dcvar.h,v 1.7 2000/01/08 01:02:35 simonb Exp $ */
/*
* External declarations from DECstation dc serial driver.
@@ -30,18 +30,17 @@ struct dc_softc {
/* flags */
#define DC_KBDMOUSE 0x01 /* keyboard and mouse attached */
-int dcattach __P((struct dc_softc *sc, void *addr,
- int dtrmask, int rts_ctsmask,
- int speed, int consline));
+int dcattach __P((struct dc_softc *sc, void *addr, int dtrmask,
+ int rts_ctsmask, int speed, int consline));
int dcintr __P((void * xxxunit));
/*
* Following declaratios for console code.
* XXX shuould be separated, or redesigned.
*/
-extern int dcGetc __P ((dev_t dev));
-extern int dcparam __P((register struct tty *tp, register struct termios *t));
-extern void dcPutc __P((dev_t dev, int c));
+int dcGetc __P((dev_t dev));
+int dcparam __P((register struct tty *tp, register struct termios *t));
+void dcPutc __P((dev_t dev, int c));
/* QVSS-compatible in-kernel X input event parser, pointer tracker */
void (*dcDivertXInput) __P((int cc)); /* X windows keyboard input routine */
diff --git a/sys/arch/pmax/dev/device.h b/sys/arch/pmax/dev/device.h
index b4ebdf0e322..5f3ba6cc173 100644
--- a/sys/arch/pmax/dev/device.h
+++ b/sys/arch/pmax/dev/device.h
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.13 1999/04/24 08:01:03 simonb Exp $ */
+/* $NetBSD: device.h,v 1.14 2000/01/08 01:02:35 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -133,7 +133,7 @@ extern struct pmax_scsi_device scsi_dinit[];
* Callbacks to add known a controller, and to configure all slaves on
* all known controllers.
*/
-void pmax_add_scsi __P((struct pmax_driver *dp, int unit));
-void configure_scsi __P((void));
+void pmax_add_scsi __P((struct pmax_driver *dp, int unit));
+void configure_scsi __P((void));
#endif /* _KERNEL */
diff --git a/sys/arch/pmax/dev/dtop.c b/sys/arch/pmax/dev/dtop.c
index 0ccfc3569b8..df72c9c1b45 100644
--- a/sys/arch/pmax/dev/dtop.c
+++ b/sys/arch/pmax/dev/dtop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dtop.c,v 1.42 1999/12/23 15:34:17 ad Exp $ */
+/* $NetBSD: dtop.c,v 1.43 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -94,7 +94,7 @@ SOFTWARE.
********************************************************/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.42 1999/12/23 15:34:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.43 2000/01/08 01:02:35 simonb Exp $");
#include "rasterconsole.h"
@@ -162,8 +162,8 @@ struct dtop_softc {
short bad_pkts;
struct dtop_ds {
- int (*handler)
- __P((dtop_device_t, dtop_message_t, int, int));
+ int (*handler) __P((dtop_device_t, dtop_message_t,
+ int, int));
dtop_device status;
} device[(DTOP_ADDR_DEFAULT - DTOP_ADDR_FIRST) >> 1];
@@ -178,14 +178,14 @@ typedef struct dtop_softc *dtop_softc_t;
/*
* Forward/prototyped declarations
*/
-int dtop_get_packet __P((dtop_softc_t dtop, dtop_message_t pkt));
-int dtop_escape __P((int c));
-void dtop_keyboard_repeat __P((void *));
-int dtop_null_device_handler __P((dtop_device_t, dtop_message_t, int, int));
-int dtop_locator_handler __P((dtop_device_t, dtop_message_t, int, int));
-int dtop_keyboard_handler __P((dtop_device_t, dtop_message_t, int, int));
-int dtopparam __P((struct tty *, struct termios *));
-void dtopstart __P((struct tty *));
+int dtop_get_packet __P((dtop_softc_t dtop, dtop_message_t pkt));
+int dtop_escape __P((int c));
+void dtop_keyboard_repeat __P((void *));
+int dtop_null_device_handler __P((dtop_device_t, dtop_message_t, int, int));
+int dtop_locator_handler __P((dtop_device_t, dtop_message_t, int, int));
+int dtop_keyboard_handler __P((dtop_device_t, dtop_message_t, int, int));
+int dtopparam __P((struct tty *, struct termios *));
+void dtopstart __P((struct tty *));
/*
* lk201 keyboard divisions and up/down mode key bitmap.
@@ -219,9 +219,9 @@ static u_long keymodes[8] = {0, 0, 0, 0, 0, 0x0003e800, 0, 0};
* config.old are completely gone.
*
*/
-int dtopmatch __P((struct device * parent, struct cfdata *match, void *aux));
-void dtopattach __P((struct device *parent, struct device *self, void *aux));
-int dtopintr __P((void *sc));
+int dtopmatch __P((struct device * parent, struct cfdata *match, void *aux));
+void dtopattach __P((struct device *parent, struct device *self, void *aux));
+int dtopintr __P((void *sc));
struct cfattach dtop_ca = {
sizeof(struct dtop_softc), dtopmatch, dtopattach
diff --git a/sys/arch/pmax/dev/fb.c b/sys/arch/pmax/dev/fb.c
index 861454fa769..b95cc0f89c1 100644
--- a/sys/arch/pmax/dev/fb.c
+++ b/sys/arch/pmax/dev/fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.31 1999/12/15 14:48:25 ad Exp $ */
+/* $NetBSD: fb.c,v 1.32 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -113,7 +113,7 @@
/* qvss/pm compatible and old 4.4bsd/pmax driver functions */
-extern void fbScreenInit __P (( struct fbinfo *fi));
+void fbScreenInit __P(( struct fbinfo *fi));
#if NDC > 0
@@ -156,7 +156,7 @@ struct fbdev {
static u_int fbndevs; /* number of devices */
static u_char cmap_bits[768]; /* colormap for console */
-void fbattach __P((int n));
+void fbattach __P((int n));
/*
* attach routine: required for pseudo-device
diff --git a/sys/arch/pmax/dev/fbreg.h b/sys/arch/pmax/dev/fbreg.h
index b8cd07ed2e0..9f9570d7aee 100644
--- a/sys/arch/pmax/dev/fbreg.h
+++ b/sys/arch/pmax/dev/fbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbreg.h,v 1.7 1999/04/24 08:01:04 simonb Exp $ */
+/* $NetBSD: fbreg.h,v 1.8 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -50,7 +50,7 @@ struct fbuaccess {
struct pmax_fbtty {
int row, col; /* Screen pos for glass tty */
- void (*KBDPutc) __P ((dev_t dev, int c));
+ void (*KBDPutc) __P((dev_t dev, int c));
/* Send char to keyboard func */
dev_t kbddev; /* Device for KBDPutc */
};
@@ -70,13 +70,13 @@ typedef struct {
*/
#define TO_MS(tv) ((tv.tv_sec * 1000) + (tv.tv_usec / 1000))
-extern void fbKbdEvent __P((int, struct fbinfo *));
-extern void fbMouseEvent __P((MouseReport *, struct fbinfo *));
-extern void fbMouseButtons __P((MouseReport *, struct fbinfo *));
-extern void fbScroll __P((struct fbinfo *));
-extern void fbPutc __P((dev_t, int));
-extern void fbBlitc __P((int, struct fbinfo *));
-extern int tb_kbdmouseconfig __P((struct fbinfo *fi));
-extern int fbmmap_fb __P((struct fbinfo *, dev_t, caddr_t, struct proc *));
+void fbKbdEvent __P((int, struct fbinfo *));
+void fbMouseEvent __P((MouseReport *, struct fbinfo *));
+void fbMouseButtons __P((MouseReport *, struct fbinfo *));
+void fbScroll __P((struct fbinfo *));
+void fbPutc __P((dev_t, int));
+void fbBlitc __P((int, struct fbinfo *));
+int tb_kbdmouseconfig __P((struct fbinfo *fi));
+int fbmmap_fb __P((struct fbinfo *, dev_t, caddr_t, struct proc *));
-extern void init_pmaxfbu __P((struct fbinfo *fi));
+void init_pmaxfbu __P((struct fbinfo *fi));
diff --git a/sys/arch/pmax/dev/findcons.c b/sys/arch/pmax/dev/findcons.c
index ddbe6c20b38..3423692b9b8 100644
--- a/sys/arch/pmax/dev/findcons.c
+++ b/sys/arch/pmax/dev/findcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: findcons.c,v 1.22 1999/12/23 15:34:18 ad Exp $ */
+/* $NetBSD: findcons.c,v 1.23 2000/01/08 01:02:35 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: findcons.c,v 1.22 1999/12/23 15:34:18 ad Exp $$");
+__KERNEL_RCSID(0, "$NetBSD: findcons.c,v 1.23 2000/01/08 01:02:35 simonb Exp $$");
#include <sys/param.h>
#include <sys/systm.h>
@@ -134,22 +134,22 @@ struct consdev cd;
* to pick a console early in boot before autoconfig or
* malloc are up.
*/
-integrate int dc_ds_kbd __P((int prom_slot));
-integrate int scc_kbd __P((int prom_slot));
-integrate int dtop_kbd __P((int prom_slot));
+integrate int dc_ds_kbd __P((int prom_slot));
+integrate int scc_kbd __P((int prom_slot));
+integrate int dtop_kbd __P((int prom_slot));
-integrate int pm_screen __P((int prom_slot));
-integrate int xcfb_screen __P((int prom_slot));
+integrate int pm_screen __P((int prom_slot));
+integrate int xcfb_screen __P((int prom_slot));
#if NRASTERCONSOLE > 0
-extern int tcfb_cnattach __P((int prom_slot));
+int tcfb_cnattach __P((int prom_slot));
#endif
-integrate int dc_ds_serial __P((int prom_slot));
-integrate int scc_serial __P((int prom_slot));
+integrate int dc_ds_serial __P((int prom_slot));
+integrate int scc_serial __P((int prom_slot));
-int find_kbd __P((int prom_slot));
-int find_screen __P((int prom_slot));
-int find_serial __P((int prom_slot));
+int find_kbd __P((int prom_slot));
+int find_screen __P((int prom_slot));
+int find_serial __P((int prom_slot));
extern struct consdev promcd;
diff --git a/sys/arch/pmax/dev/ims332.h b/sys/arch/pmax/dev/ims332.h
index 8c581e09ecd..b471b552cb8 100644
--- a/sys/arch/pmax/dev/ims332.h
+++ b/sys/arch/pmax/dev/ims332.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ims332.h,v 1.4 1999/12/09 00:16:14 simonb Exp $ */
+/* $NetBSD: ims332.h,v 1.5 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -167,13 +167,13 @@
#define IMS332_BOOT_64_BIT_MODE 0x000040 /* else 32 */
#define IMS332_BOOT_xxx 0xffff80 /* reserved, mbz */
-int ims332init (struct fbinfo *);
-void ims332InitColorMap (struct fbinfo *);
-int ims332LoadColorMap (struct fbinfo *, const u_char *, int, int);
-int ims332GetColorMap (struct fbinfo *, u_char *, int, int);
-int ims332_video_off (struct fbinfo *);
-int ims332_video_on (struct fbinfo *);
-void ims332PosCursor (struct fbinfo *, int, int);
-void ims332RestoreCursorColor (struct fbinfo *);
-void ims332CursorColor (struct fbinfo *, unsigned int []);
-void ims332LoadCursor (struct fbinfo *, u_short *);
+int ims332init __P((struct fbinfo *));
+void ims332InitColorMap __P((struct fbinfo *));
+int ims332LoadColorMap __P((struct fbinfo *, const u_char *, int, int));
+int ims332GetColorMap __P((struct fbinfo *, u_char *, int, int));
+int ims332_video_off __P((struct fbinfo *));
+int ims332_video_on __P((struct fbinfo *));
+void ims332PosCursor __P((struct fbinfo *, int, int));
+void ims332RestoreCursorColor __P((struct fbinfo *));
+void ims332CursorColor __P((struct fbinfo *, unsigned int []));
+void ims332LoadCursor __P((struct fbinfo *, u_short *));
diff --git a/sys/arch/pmax/dev/lk201.c b/sys/arch/pmax/dev/lk201.c
index 30a3310c6fc..a07e42a61db 100644
--- a/sys/arch/pmax/dev/lk201.c
+++ b/sys/arch/pmax/dev/lk201.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201.c,v 1.17 1999/12/23 15:42:06 ad Exp $ */
+/* $NetBSD: lk201.c,v 1.18 2000/01/08 01:02:35 simonb Exp $ */
/*
* The LK201 keycode mapping routine is here, along with initialization
@@ -384,7 +384,7 @@ lk_mapchar(cc, len)
*/
void
lk_divert(getfn, in_dev)
- int (*getfn) __P ((dev_t dev));
+ int (*getfn) __P((dev_t dev));
dev_t in_dev;
{
diff --git a/sys/arch/pmax/dev/lk201var.h b/sys/arch/pmax/dev/lk201var.h
index 37f5e3538b8..418916df852 100644
--- a/sys/arch/pmax/dev/lk201var.h
+++ b/sys/arch/pmax/dev/lk201var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201var.h,v 1.7 1999/12/23 15:34:18 ad Exp $ */
+/* $NetBSD: lk201var.h,v 1.8 2000/01/08 01:02:35 simonb Exp $ */
#ifndef _LK201VAR_H_
#define _LK201VAR_H_
@@ -6,12 +6,12 @@
#ifdef _KERNEL
char *lk_mapchar __P((int, int *));
-void lk_reset __P((dev_t, void (*)(dev_t, int)));
-void lk_mouseinit __P((dev_t, void (*)(dev_t, int), int (*)(dev_t)));
+void lk_reset __P((dev_t, void (*)(dev_t, int)));
+void lk_mouseinit __P((dev_t, void (*)(dev_t, int), int (*)(dev_t)));
-int lk_getc __P((dev_t dev));
-void lk_divert __P((int (*getfn) __P ((dev_t dev)), dev_t in_dev));
-void lk_bell __P ((int ring));
+int lk_getc __P((dev_t dev));
+void lk_divert __P((int (*getfn) __P((dev_t dev)), dev_t in_dev));
+void lk_bell __P((int ring));
#endif
#endif /* _LK201VAR_H_ */
diff --git a/sys/arch/pmax/dev/mfb.c b/sys/arch/pmax/dev/mfb.c
index 29e33ad46ab..3c83a7f48e9 100644
--- a/sys/arch/pmax/dev/mfb.c
+++ b/sys/arch/pmax/dev/mfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.41 1999/12/15 14:48:24 ad Exp $ */
+/* $NetBSD: mfb.c,v 1.42 2000/01/08 01:02:35 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.41 1999/12/15 14:48:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.42 2000/01/08 01:02:35 simonb Exp $");
#include "fb.h"
#include "mfb.h"
@@ -111,35 +111,35 @@ __KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.41 1999/12/15 14:48:24 ad Exp $");
struct fbuaccess mfbu;
struct pmax_fbtty mfbfb;
-void mfbPosCursor __P((struct fbinfo *fi, int x, int y));
+void mfbPosCursor __P((struct fbinfo *fi, int x, int y));
int mfbinit __P((struct fbinfo *fi, caddr_t mfbaddr, int unit, int silent));
#if 1 /* these go away when we use the abstracted-out chip drivers */
-static void mfbLoadCursor __P((struct fbinfo *fi, u_short *ptr));
-static void mfbRestoreCursorColor __P((struct fbinfo *fi));
-static void mfbCursorColor __P((struct fbinfo *fi, u_int *color));
-
-static void mfbInitColorMapBlack __P((struct fbinfo *fi, int blackpix));
-static void mfbInitColorMap __P((struct fbinfo *fi));
-static int mfbLoadColorMap __P((struct fbinfo *fi, u_char *mapbits,
- int index, int count));
-static int mfbLoadColorMapNoop __P((struct fbinfo *fi, const u_char *mapbits,
- int index, int count));
-#endif /* 0 */
+static void mfbLoadCursor __P((struct fbinfo *fi, u_short *ptr));
+static void mfbRestoreCursorColor __P((struct fbinfo *fi));
+static void mfbCursorColor __P((struct fbinfo *fi, u_int *color));
+
+static void mfbInitColorMapBlack __P((struct fbinfo *fi, int blackpix));
+static void mfbInitColorMap __P((struct fbinfo *fi));
+static int mfbLoadColorMap __P((struct fbinfo *fi, u_char *mapbits,
+ int index, int count));
+static int mfbLoadColorMapNoop __P((struct fbinfo *fi,
+ const u_char *mapbits, int index, int count));
+#endif /* 1 */
/* new-style raster-cons "driver" methods */
-int mfbGetColorMap __P((struct fbinfo *fi, u_char *, int, int));
+int mfbGetColorMap __P((struct fbinfo *fi, u_char *, int, int));
-static int bt455_video_on __P((struct fbinfo *));
-static int bt455_video_off __P((struct fbinfo *));
+static int bt455_video_on __P((struct fbinfo *));
+static int bt455_video_off __P((struct fbinfo *));
-static void bt431_init __P((bt431_regmap_t *regs));
-static void bt431_select_reg __P((bt431_regmap_t *regs, int regno));
-static void bt431_write_reg __P((bt431_regmap_t *regs, int regno, int val));
+static void bt431_init __P((bt431_regmap_t *regs));
+static void bt431_select_reg __P((bt431_regmap_t *regs, int regno));
+static void bt431_write_reg __P((bt431_regmap_t *regs, int regno, int val));
#ifdef notused
static u_char bt431_read_reg __P((bt431_regmap_t *regs, int regno));
@@ -188,9 +188,9 @@ struct fbdriver mfb_driver = {
/*
* driver frontend declaration for autoconfiguration.
*/
-int mfbmatch __P((struct device *, struct cfdata *, void *));
-void mfbattach __P((struct device *, struct device *, void *));
-int mfb_intr __P((void *sc));
+int mfbmatch __P((struct device *, struct cfdata *, void *));
+void mfbattach __P((struct device *, struct device *, void *));
+int mfb_intr __P((void *sc));
struct cfattach mfb_ca = {
sizeof(struct fbinfo), mfbmatch, mfbattach
diff --git a/sys/arch/pmax/dev/mfbvar.h b/sys/arch/pmax/dev/mfbvar.h
index 4ec29158092..d010ca4aa14 100644
--- a/sys/arch/pmax/dev/mfbvar.h
+++ b/sys/arch/pmax/dev/mfbvar.h
@@ -1,8 +1,7 @@
-/* $NetBSD: mfbvar.h,v 1.3 1999/04/24 08:01:05 simonb Exp $ */
+/* $NetBSD: mfbvar.h,v 1.4 2000/01/08 01:02:35 simonb Exp $ */
/*
* Initialize a Turbochannel MFB 1280x1024x1 2-d framebuffer,
* so it can be used as a bitmapped glass-tty console device.
*/
-extern int
-mfbinit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
+int mfbinit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
diff --git a/sys/arch/pmax/dev/pm.c b/sys/arch/pmax/dev/pm.c
index 789d4aeed57..f329a9e4230 100644
--- a/sys/arch/pmax/dev/pm.c
+++ b/sys/arch/pmax/dev/pm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pm.c,v 1.29 1999/09/05 11:34:30 simonb Exp $ */
+/* $NetBSD: pm.c,v 1.30 2000/01/08 01:02:36 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.29 1999/09/05 11:34:30 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.30 2000/01/08 01:02:36 simonb Exp $");
#include <sys/param.h>
@@ -97,22 +97,24 @@ struct pmax_fbtty pmfb;
/*
* Forward references.
*/
-extern void pmScreenInit __P((struct fbinfo *fi));
-static void pmLoadCursor __P((struct fbinfo *fi, u_short *ptr));
-void pmPosCursor __P((struct fbinfo *fi, int x, int y));
+void pmScreenInit __P((struct fbinfo *fi));
+static void pmLoadCursor __P((struct fbinfo *fi, u_short *ptr));
+void pmPosCursor __P((struct fbinfo *fi, int x, int y));
-void bt478CursorColor __P((struct fbinfo *fi, u_int *color));
-void bt478InitColorMap __P((struct fbinfo *fi));
+void bt478CursorColor __P((struct fbinfo *fi, u_int *color));
+void bt478InitColorMap __P((struct fbinfo *fi));
-void pccCursorOn __P((struct fbinfo *fi));
-void pccCursorOff __P((struct fbinfo *fi));
-void pmInitColorMap __P((struct fbinfo *fi));
+void pccCursorOn __P((struct fbinfo *fi));
+void pccCursorOff __P((struct fbinfo *fi));
+void pmInitColorMap __P((struct fbinfo *fi));
-int pminit __P((struct fbinfo *fi, caddr_t base, int unit, int console));
-int pmattach __P((struct fbinfo *fi, int unit, int cold_console_flag));
+int pminit __P((struct fbinfo *fi, caddr_t base, int unit,
+ int console));
+int pmattach __P((struct fbinfo *fi, int unit,
+ int cold_console_flag));
-static int pm_video_on __P ((struct fbinfo *));
-static int pm_video_off __P ((struct fbinfo *));
+static int pm_video_on __P((struct fbinfo *));
+static int pm_video_off __P((struct fbinfo *));
/* new-style raster-cons "driver" methods */
diff --git a/sys/arch/pmax/dev/pm_ds.c b/sys/arch/pmax/dev/pm_ds.c
index 8ef49b79809..0a8c85d426c 100644
--- a/sys/arch/pmax/dev/pm_ds.c
+++ b/sys/arch/pmax/dev/pm_ds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_ds.c,v 1.11 1999/11/16 06:00:12 nisimura Exp $ */
+/* $NetBSD: pm_ds.c,v 1.12 2000/01/08 01:02:36 simonb Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -39,7 +39,7 @@
#include "pm.h"
#include "dc.h"
-int ds_pm_init __P ((struct fbinfo *fi, int unti, int cold_console_flag));
+int ds_pm_init __P((struct fbinfo *fi, int unti, int cold_console_flag));
int pm_ds_match __P((struct device *, struct cfdata *, void *));
void pm_ds_attach __P((struct device *, struct device *, void *));
@@ -67,7 +67,7 @@ extern struct pmax_fbtty pmfb;
* we hardcode an entry point.
* XXX
*/
-void dcPutc __P((dev_t, int)); /* XXX */
+void dcPutc __P((dev_t, int)); /* XXX */
/*
diff --git a/sys/arch/pmax/dev/pmvar.h b/sys/arch/pmax/dev/pmvar.h
index 1b41a1f29cc..f8ed2f1158e 100644
--- a/sys/arch/pmax/dev/pmvar.h
+++ b/sys/arch/pmax/dev/pmvar.h
@@ -1,8 +1,8 @@
-/* $NetBSD: pmvar.h,v 1.5 1999/07/25 22:50:29 ad Exp $ */
+/* $NetBSD: pmvar.h,v 1.6 2000/01/08 01:02:36 simonb Exp $ */
/*
* Initialize a Decstation 3100/2100 baseboard framebuffer,
* so it can be used as a bitmapped glass-tty console device.
*/
-int pminit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
-int pmattach __P((struct fbinfo *fi, int unit, int silent));
+int pminit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
+int pmattach __P((struct fbinfo *fi, int unit, int silent));
diff --git a/sys/arch/pmax/dev/qvss_compat.c b/sys/arch/pmax/dev/qvss_compat.c
index ce302e3b670..572e9f581cf 100644
--- a/sys/arch/pmax/dev/qvss_compat.c
+++ b/sys/arch/pmax/dev/qvss_compat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qvss_compat.c,v 1.22 1999/12/30 00:57:29 simonb Exp $ */
+/* $NetBSD: qvss_compat.c,v 1.23 2000/01/08 01:02:36 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -109,15 +109,15 @@ struct termios; struct dcregs;
/*
* Prototypes of local functions
*/
-static void genKbdEvent __P((int ch));
-static void genMouseEvent __P((MouseReport *newRepPtr));
-static void genMouseButtons __P((MouseReport *newRepPtr));
+static void genKbdEvent __P((int ch));
+static void genMouseEvent __P((MouseReport *newRepPtr));
+static void genMouseButtons __P((MouseReport *newRepPtr));
#if NSCC > 0
-extern void (*sccDivertXInput) __P((int cc));
-extern void (*sccMouseEvent) __P((int));
-extern void (*sccMouseButtons) __P((int));
+extern void (*sccDivertXInput) __P((int cc));
+extern void (*sccMouseEvent) __P((int));
+extern void (*sccMouseButtons) __P((int));
#endif
extern struct fbinfo *firstfi;
@@ -588,26 +588,26 @@ genDeconfigMouse()
#if NDC > 0
case DS_PMAX:
case DS_3MAX:
- dcDivertXInput = (void (*) __P((int)) )0;
- dcMouseEvent = (void (*) __P((int)) )0;
- dcMouseButtons = (void (*) __P((int)) )0;
+ dcDivertXInput = (void (*) __P((int)))0;
+ dcMouseEvent = (void (*) __P((int)))0;
+ dcMouseButtons = (void (*) __P((int)))0;
break;
#endif /* NDC */
#if NSCC > 0
case DS_3MIN:
case DS_3MAXPLUS:
- sccDivertXInput = (void (*) __P((int)) )0;
- sccMouseEvent = (void (*) __P((int)) )0;
- sccMouseButtons = (void (*) __P((int)) )0;
+ sccDivertXInput = (void (*) __P((int)))0;
+ sccMouseEvent = (void (*) __P((int)))0;
+ sccMouseButtons = (void (*) __P((int)))0;
break;
#endif
#if NDTOP > 0
case DS_MAXINE:
- dtopDivertXInput = (void (*) __P((int)) )0;
- dtopMouseEvent = (void (*) __P((MouseReport *)) )0;
- dtopMouseButtons = (void (*) __P((MouseReport *)) )0;
+ dtopDivertXInput = (void (*) __P((int)))0;
+ dtopMouseEvent = (void (*) __P((MouseReport *)))0;
+ dtopMouseButtons = (void (*) __P((MouseReport *)))0;
break;
#endif
default:
diff --git a/sys/arch/pmax/dev/rcons.c b/sys/arch/pmax/dev/rcons.c
index 02bbd102f4b..eb7625a0886 100644
--- a/sys/arch/pmax/dev/rcons.c
+++ b/sys/arch/pmax/dev/rcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons.c,v 1.35 2000/01/07 13:43:02 simonb Exp $ */
+/* $NetBSD: rcons.c,v 1.36 2000/01/08 01:02:36 simonb Exp $ */
/*
* Copyright (c) 1995
@@ -97,13 +97,13 @@ char rcons_maxcols [20];
static struct rconsole rc;
void rasterconsoleattach __P((int n));
-void rcons_vputc __P ((dev_t dev, int c));
+void rcons_vputc __P((dev_t dev, int c));
void rconsreset __P((struct tty *tp, int rw));
void rcons_input __P((dev_t dev, int ic));
#ifdef notyet
-void rconsstart __P((struct tty *));
+void rconsstart __P((struct tty *));
static void rcons_later __P((void*));
#endif
@@ -225,7 +225,7 @@ rcons_vputc(dev, c)
* Call the pointer-to-function that rcons_init tried to give us,
* discarding the dev_t argument.
*/
- extern void rcons_cnputc __P((int c));
+ void rcons_cnputc __P((int c));
rcons_cnputc(c);
}
diff --git a/sys/arch/pmax/dev/rconsvar.h b/sys/arch/pmax/dev/rconsvar.h
index 8415f48fb51..993e5cf118a 100644
--- a/sys/arch/pmax/dev/rconsvar.h
+++ b/sys/arch/pmax/dev/rconsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rconsvar.h,v 1.5 1999/12/15 14:44:59 ad Exp $ */
+/* $NetBSD: rconsvar.h,v 1.6 2000/01/08 01:02:36 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -39,8 +39,8 @@ struct consdev;
struct fbinfo;
void rcons_connect __P((struct fbinfo *));
-void rcons_connect_native __P ((struct wsdisplay_emulops *, void *, int,
- int, int, int));
+void rcons_connect_native __P((struct wsdisplay_emulops *, void *, int,
+ int, int, int));
void rcons_indev __P((struct consdev *));
void rcons_vputc __P((dev_t, int)); /* XXX */
diff --git a/sys/arch/pmax/dev/rz.c b/sys/arch/pmax/dev/rz.c
index 4b1dd2b380c..281fd0ff210 100644
--- a/sys/arch/pmax/dev/rz.c
+++ b/sys/arch/pmax/dev/rz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rz.c,v 1.51 1999/12/06 02:53:50 simonb Exp $ */
+/* $NetBSD: rz.c,v 1.52 2000/01/08 01:02:36 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: rz.c,v 1.51 1999/12/06 02:53:50 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rz.c,v 1.52 2000/01/08 01:02:36 simonb Exp $");
/*
* SCSI CCS (Command Command Set) disk driver.
@@ -100,32 +100,32 @@ struct rz_softc;
struct scsi_mode_sense_data;
struct disk_parms;
-int rzprobe __P((void /*struct pmax_scsi_device*/ *sd));
-void rzgetdefaultlabel __P((struct rz_softc *, struct disklabel *lp));
-void rzstart __P((int unit));
-void rzdone __P((int unit, int error, int resid, int status));
-void rzgetinfo __P((dev_t dev));
-int rzsize __P((dev_t dev));
+int rzprobe __P((void /*struct pmax_scsi_device*/ *sd));
+void rzgetdefaultlabel __P((struct rz_softc *, struct disklabel *lp));
+void rzstart __P((int unit));
+void rzdone __P((int unit, int error, int resid, int status));
+void rzgetinfo __P((dev_t dev));
+int rzsize __P((dev_t dev));
/* Machinery for format and drive inquiry commands. */
-int rz_command __P((struct rz_softc *sc,
+int rz_command __P((struct rz_softc *sc,
struct scsipi_generic *scsipi_cmd, int cmdlen,
u_char *data_addr, int data_len,
int nretries, int timeout,
struct buf *bp, u_int flags));
-static int rz_mode_sense __P((struct rz_softc *sd,
- struct scsi_mode_sense_data *scsipi_sense,
- int page, int pagelen, int flags));
-static int rz_getsize __P((struct rz_softc *sc, int flags));
-void rzgetgeom __P((struct rz_softc *, int flags));
-void rz_setlabelgeom __P((struct disklabel *lp, struct disk_parms *dp));
-u_long rz_cdsize __P((struct rz_softc *cd, int flags));
+static int rz_mode_sense __P((struct rz_softc *sd,
+ struct scsi_mode_sense_data *scsipi_sense, int page,
+ int pagelen, int flags));
+static int rz_getsize __P((struct rz_softc *sc, int flags));
+void rzgetgeom __P((struct rz_softc *, int flags));
+void rz_setlabelgeom __P((struct disklabel *lp, struct disk_parms *dp));
+u_long rz_cdsize __P((struct rz_softc *cd, int flags));
struct pmax_driver rzdriver = {
"rz", rzprobe,
- (void (*) __P((struct ScsiCmd *cmd))) rzstart,
+ (void (*) __P((struct ScsiCmd *cmd))) rzstart,
rzdone,
};
@@ -156,17 +156,15 @@ static struct size rzdefaultpart[MAXPARTITIONS] = {
};
-extern char *
-readdisklabel __P((dev_t dev, void (*strat) __P((struct buf *bp)),
- struct disklabel *lp, struct cpu_disklabel *osdep));
+char *readdisklabel __P((dev_t dev, void (*strat) __P((struct buf *bp)),
+ struct disklabel *lp, struct cpu_disklabel *osdep));
/*
* Ultrix disklabel declarations
*/
#ifdef COMPAT_ULTRIX
-extern char *
-compat_label __P((dev_t dev, void (*strat) __P((struct buf *bp)),
- struct disklabel *lp, struct cpu_disklabel *osdep));
+char *compat_label __P((dev_t dev, void (*strat) __P((struct buf *bp)),
+ struct disklabel *lp, struct cpu_disklabel *osdep));
#endif /* COMPAT_ULTRIX */
struct rzstats {
@@ -269,8 +267,8 @@ static char legal_cmds[256] = {
/*
* Private forward declarations
*/
-static int rzready __P((register struct rz_softc *sc));
-static void rzlblkstrat __P((register struct buf *bp, register int bsize));
+static int rzready __P((register struct rz_softc *sc));
+static void rzlblkstrat __P((register struct buf *bp, register int bsize));
/*
* Test to see if the unit is ready and if not, try to make it ready.
diff --git a/sys/arch/pmax/dev/scsi.h b/sys/arch/pmax/dev/scsi.h
index 356c825ac29..185c2037588 100644
--- a/sys/arch/pmax/dev/scsi.h
+++ b/sys/arch/pmax/dev/scsi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.h,v 1.10 1999/10/11 16:08:47 mrg Exp $ */
+/* $NetBSD: scsi.h,v 1.11 2000/01/08 01:02:36 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -565,20 +565,20 @@ struct scsi_fmt_sense {
/*
* Routines.
*/
-extern void scsiGroup0Cmd __P((unsigned cmd, /* group0 SCSI command */
- unsigned lun, /* Logical Unit Number */
- register unsigned block,
- unsigned count,
- register ScsiGroup0Cmd *c));
-
-extern void scsiGroup1Cmd __P((unsigned cmd, /* group0 SCSI command */
- unsigned lun, /* Logical Unit Number */
- register unsigned block,
- unsigned count,
- register ScsiGroup1Cmd *c));
-
-extern void scsiPrintSense __P((register ScsiClass7Sense *sp, int len));
-extern void scsiPrintInquiry __P((ScsiInquiryData *inqbuf, int len));
+void scsiGroup0Cmd __P((unsigned cmd, /* group0 SCSI command */
+ unsigned lun, /* Logical Unit Number */
+ register unsigned block,
+ unsigned count,
+ register ScsiGroup0Cmd *c));
+
+void scsiGroup1Cmd __P((unsigned cmd, /* group0 SCSI command */
+ unsigned lun, /* Logical Unit Number */
+ register unsigned block,
+ unsigned count,
+ register ScsiGroup1Cmd *c));
+
+void scsiPrintSense __P((register ScsiClass7Sense *sp, int len));
+void scsiPrintInquiry __P((ScsiInquiryData *inqbuf, int len));
#endif /* _KERNEL */
#endif /* _SCSI_H */
diff --git a/sys/arch/pmax/dev/sfb.c b/sys/arch/pmax/dev/sfb.c
index b0bc0c10dc7..0fd1da4bd1c 100644
--- a/sys/arch/pmax/dev/sfb.c
+++ b/sys/arch/pmax/dev/sfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.33 1999/09/05 11:34:30 simonb Exp $ */
+/* $NetBSD: sfb.c,v 1.34 2000/01/08 01:02:36 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -117,11 +117,11 @@ struct pmax_fbtty sfbfb;
* Forward references.
*/
-int sfbinit __P((struct fbinfo *fi, caddr_t sfbaddr, int unit, int silent));
+int sfbinit __P((struct fbinfo *fi, caddr_t sfbaddr, int unit, int silent));
-int sfbmatch __P((struct device *, struct cfdata *, void *));
-void sfbattach __P((struct device *, struct device *, void *));
-int sfb_intr __P((void *sc));
+int sfbmatch __P((struct device *, struct cfdata *, void *));
+void sfbattach __P((struct device *, struct device *, void *));
+int sfb_intr __P((void *sc));
struct cfattach sfb_ca = {
sizeof(struct fbinfo), sfbmatch, sfbattach
diff --git a/sys/arch/pmax/dev/sfbvar.h b/sys/arch/pmax/dev/sfbvar.h
index 69ec2f1a6ec..952a6158f9f 100644
--- a/sys/arch/pmax/dev/sfbvar.h
+++ b/sys/arch/pmax/dev/sfbvar.h
@@ -1,8 +1,7 @@
-/* $NetBSD: sfbvar.h,v 1.3 1999/04/24 08:01:08 simonb Exp $ */
+/* $NetBSD: sfbvar.h,v 1.4 2000/01/08 01:02:36 simonb Exp $ */
/*
* Initialize a Turbochannel SFB 2-d framebuffer,
* so it can be used as a bitmapped glass-tty console device.
*/
-extern int
-sfbinit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
+int sfbinit __P((struct fbinfo *fi, caddr_t base, int unit, int silent));
diff --git a/sys/arch/pmax/dev/sii.c b/sys/arch/pmax/dev/sii.c
index 69bf186666f..b880179e1fb 100644
--- a/sys/arch/pmax/dev/sii.c
+++ b/sys/arch/pmax/dev/sii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sii.c,v 1.36 1999/06/08 23:41:59 simonb Exp $ */
+/* $NetBSD: sii.c,v 1.37 2000/01/08 01:02:36 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -79,8 +79,7 @@ void siiattach __P((struct siisoftc *sc));
extern struct cfdriver sii_cd;
-int siiprint(void*, char*);
-int siiintr __P((void *sc));
+int siiintr __P((void *sc));
#ifdef USE_NEW_SCSI
/* Glue to the machine-independent scsi */
@@ -166,19 +165,19 @@ u_char sii_buf[256]; /* used for extended messages */
* Other forward references
*/
-static void sii_Reset __P((register struct siisoftc *sc, int resetbus));
-static void sii_StartCmd __P((register struct siisoftc *sc, int target));
-static void sii_CmdDone __P((register struct siisoftc *sc, int target,
- int error));
-static void sii_DoIntr __P((register struct siisoftc *sc, u_int dstat));
-static void sii_StateChg __P((register struct siisoftc *sc, u_int cstat));
-static int sii_GetByte __P((register SIIRegs *regs, int phase, int ack));
-static void sii_DoSync __P((register SIIRegs *regs, register State *state));
-static void sii_StartDMA __P((register SIIRegs *regs, int phase,
- u_short *dmaAddr, int size));
-
-void siistart __P((register ScsiCmd *scsicmd));
-void sii_DumpLog __P((void));
+static void sii_Reset __P((register struct siisoftc *sc, int resetbus));
+static void sii_StartCmd __P((register struct siisoftc *sc, int target));
+static void sii_CmdDone __P((register struct siisoftc *sc, int target,
+ int error));
+static void sii_DoIntr __P((register struct siisoftc *sc, u_int dstat));
+static void sii_StateChg __P((register struct siisoftc *sc, u_int cstat));
+static int sii_GetByte __P((register SIIRegs *regs, int phase, int ack));
+static void sii_DoSync __P((register SIIRegs *regs, register State *state));
+static void sii_StartDMA __P((register SIIRegs *regs, int phase,
+ u_short *dmaAddr, int size));
+
+void siistart __P((register ScsiCmd *scsicmd));
+void sii_DumpLog __P((void));
/*
diff --git a/sys/arch/pmax/dev/sii_ds.c b/sys/arch/pmax/dev/sii_ds.c
index 8bec5473ce9..aea981141e8 100644
--- a/sys/arch/pmax/dev/sii_ds.c
+++ b/sys/arch/pmax/dev/sii_ds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sii_ds.c,v 1.9 1999/11/15 09:54:42 nisimura Exp $ */
+/* $NetBSD: sii_ds.c,v 1.10 2000/01/08 01:02:36 simonb Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -36,7 +36,7 @@
/*
* Autoconfig definition of driver front-end
*/
-int sii_ds_match __P((struct device* parent, struct cfdata *match,
+int sii_ds_match __P((struct device* parent, struct cfdata *match,
void *aux));
void sii_ds_attach __P((struct device *parent, struct device *self, void *aux));
@@ -46,17 +46,17 @@ struct cfattach sii_ds_ca = {
sizeof(struct siisoftc), sii_ds_match, sii_ds_attach
};
-extern void CopyToBuffer __P((u_short *src, /* NB: must be short aligned */
- volatile u_short *dst, int length));
-extern void CopyFromBuffer __P((volatile u_short *src, char *dst, int length));
+void CopyToBuffer __P((u_short *src, /* NB: must be short aligned */
+ volatile u_short *dst, int length));
+void CopyFromBuffer __P((volatile u_short *src, char *dst, int length));
void kn230_copytobuf __P((u_short *src, /* NB: must be short aligned */
- volatile u_short *dst, int length));
+ volatile u_short *dst, int length));
void kn230_copyfrombuf __P((volatile u_short *src, char *dst, int length));
void kn01_copytobuf __P((u_short *src, /* NB: must be short aligned */
- volatile u_short *dst, int length));
+ volatile u_short *dst, int length));
void kn01_copyfrombuf __P((volatile u_short *src, char *dst, int length));
diff --git a/sys/arch/pmax/dev/siivar.h b/sys/arch/pmax/dev/siivar.h
index 835c1ac827c..90598ba886a 100644
--- a/sys/arch/pmax/dev/siivar.h
+++ b/sys/arch/pmax/dev/siivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: siivar.h,v 1.4 1998/05/08 00:05:19 simonb Exp $ */
+/* $NetBSD: siivar.h,v 1.5 2000/01/08 01:02:36 simonb Exp $ */
#ifndef _SIIVAR_H
#define _SIIVAR_H
@@ -46,7 +46,7 @@ struct siisoftc {
#endif
};
-int siiintr __P((void *sc));
+int siiintr __P((void *sc));
/* Machine-indepedent back-end attach entry point */
void siiattach __P((struct siisoftc *sc));
diff --git a/sys/arch/pmax/dev/tz.c b/sys/arch/pmax/dev/tz.c
index 3b32f54c3e2..2b95cb17da5 100644
--- a/sys/arch/pmax/dev/tz.c
+++ b/sys/arch/pmax/dev/tz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tz.c,v 1.23 1999/11/19 03:04:39 simonb Exp $ */
+/* $NetBSD: tz.c,v 1.24 2000/01/08 01:02:36 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -68,7 +68,7 @@
static int tzprobe __P((void *sd /*struct pmax_scsi_device *sd*/));
static int tzcommand __P((dev_t dev, int command, int code,
- int count, caddr_t data));
+ int count, caddr_t data));
static void tzstart __P((int unit));
static void tzdone __P((int unit, int error, int resid, int status));
static int tzmount __P((dev_t dev));
diff --git a/sys/arch/pmax/dev/xcfb.c b/sys/arch/pmax/dev/xcfb.c
index 427354979b5..fb67d1e3226 100644
--- a/sys/arch/pmax/dev/xcfb.c
+++ b/sys/arch/pmax/dev/xcfb.c
@@ -1,4 +1,4 @@
- /* $NetBSD: xcfb.c,v 1.30 1999/12/23 16:07:58 ad Exp $ */
+ /* $NetBSD: xcfb.c,v 1.31 2000/01/08 01:02:36 simonb Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -151,8 +151,8 @@ struct fbdriver xcfb_driver = {
* code is completely gone.
*/
-int xcfbmatch __P((struct device *, struct cfdata *, void *));
-void xcfbattach __P((struct device *, struct device *, void *));
+int xcfbmatch __P((struct device *, struct cfdata *, void *));
+void xcfbattach __P((struct device *, struct device *, void *));
struct cfattach xcfb_ca = {
sizeof(struct device), xcfbmatch, xcfbattach
diff --git a/sys/arch/pmax/ibus/ibus_3max.c b/sys/arch/pmax/ibus/ibus_3max.c
index 0abdb12d3ae..35812a2a8bc 100644
--- a/sys/arch/pmax/ibus/ibus_3max.c
+++ b/sys/arch/pmax/ibus/ibus_3max.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_3max.c,v 1.4 1999/12/11 13:49:18 simonb Exp $ */
+/* $NetBSD: ibus_3max.c,v 1.5 2000/01/08 01:02:37 simonb Exp $ */
/*
* Copyright (c) 1999 Tohru Nishimura. All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.4 1999/12/11 13:49:18 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.5 2000/01/08 01:02:37 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,8 @@ struct ibus_attach_args kn02sys_devs[] = {
};
const int kn02sys_ndevs = sizeof(kn02sys_devs) / sizeof(kn02sys_devs[0]);
-static int kn02sys_match __P((struct device *, struct cfdata *, void *));
-static void kn02sys_attach __P((struct device *, struct device *, void *));
+static int kn02sys_match __P((struct device *, struct cfdata *, void *));
+static void kn02sys_attach __P((struct device *, struct device *, void *));
struct cfattach kn02sys_ca = {
sizeof(struct ibus_softc), kn02sys_match, kn02sys_attach,
diff --git a/sys/arch/pmax/ibus/ibus_pmax.c b/sys/arch/pmax/ibus/ibus_pmax.c
index e5e66a64c6d..2f617048230 100644
--- a/sys/arch/pmax/ibus/ibus_pmax.c
+++ b/sys/arch/pmax/ibus/ibus_pmax.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_pmax.c,v 1.11 1999/12/08 00:04:11 simonb Exp $ */
+/* $NetBSD: ibus_pmax.c,v 1.12 2000/01/08 01:02:37 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.11 1999/12/08 00:04:11 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.12 2000/01/08 01:02:37 simonb Exp $");
#include "opt_dec_3100.h"
#include "opt_dec_5100.h"
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.11 1999/12/08 00:04:11 simonb Exp $"
#include <pmax/pmax/pmaxtype.h>
-static int ibus_pmax_match __P((struct device *, struct cfdata *, void *));
-static void ibus_pmax_attach __P((struct device *, struct device *, void *));
+static int ibus_pmax_match __P((struct device *, struct cfdata *, void *));
+static void ibus_pmax_attach __P((struct device *, struct device *, void *));
struct cfattach ibus_pmax_ca = {
sizeof(struct ibus_softc), ibus_pmax_match, ibus_pmax_attach
diff --git a/sys/arch/pmax/ibus/ibusvar.h b/sys/arch/pmax/ibus/ibusvar.h
index ec7987a67ea..2e377fbf219 100644
--- a/sys/arch/pmax/ibus/ibusvar.h
+++ b/sys/arch/pmax/ibus/ibusvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ibusvar.h,v 1.11 1999/11/24 00:04:06 thorpej Exp $ */
+/* $NetBSD: ibusvar.h,v 1.12 2000/01/08 01:02:37 simonb Exp $ */
#ifndef _IBUSVAR_H_
#define _IBUSVAR_H_ 1
@@ -11,7 +11,7 @@ struct ibus_softc {
struct device sc_dev;
void (*sc_intr_establish) __P((struct device *, void *,
- int, int (*)(void *), void *));
+ int, int (*)(void *), void *));
void (*sc_intr_disestablish) __P((struct device *, void *));
};
@@ -25,7 +25,7 @@ struct ibus_dev_attach_args {
int ida_ndevs;
struct ibus_attach_args *ida_devs;
void (*ida_establish) __P((struct device *, void *,
- int, int (*)(void *), void *));
+ int, int (*)(void *), void *));
void (*ida_disestablish) __P((struct device *, void *));
};
@@ -39,20 +39,20 @@ struct ibus_attach_args {
int ia_basz; /* badaddr() size */
};
-void ibusattach __P((struct device *, struct device *, void *));
-int ibusprint __P((void *, const char *));
-void ibus_intr_establish __P((struct device *, void * cookie, int level,
- int (*handler)(void *), void *arg));
-void ibus_intr_disestablish __P((struct device *, void *));
+void ibusattach __P((struct device *, struct device *, void *));
+int ibusprint __P((void *, const char *));
+void ibus_intr_establish __P((struct device *, void * cookie, int level,
+ int (*handler)(void *), void *arg));
+void ibus_intr_disestablish __P((struct device *, void *));
-int badaddr __P((void *, u_int));
+int badaddr __P((void *, u_int));
-void dec_3100_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
-void dec_3100_intr_disestablish __P((struct device *, void *));
+void dec_3100_intr_establish __P((struct device *, void *,
+ int, int (*)(void *), void *));
+void dec_3100_intr_disestablish __P((struct device *, void *));
-void dec_5100_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
-void dec_5100_intr_disestablish __P((struct device *, void *));
+void dec_5100_intr_establish __P((struct device *, void *,
+ int, int (*)(void *), void *));
+void dec_5100_intr_disestablish __P((struct device *, void *));
#endif /* _IBUSVAR_H_ */
diff --git a/sys/arch/pmax/include/autoconf.h b/sys/arch/pmax/include/autoconf.h
index 1cc07ddc10e..348fd7bc961 100644
--- a/sys/arch/pmax/include/autoconf.h
+++ b/sys/arch/pmax/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.14 1999/11/15 09:50:17 nisimura Exp $ */
+/* $NetBSD: autoconf.h,v 1.15 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -37,5 +37,5 @@ struct mainbus_attach_args {
when attaching CPUs */
};
-int badaddr __P((void *, u_int));
+int badaddr __P((void *, u_int));
void makebootdev __P((char *));
diff --git a/sys/arch/pmax/include/bootinfo.h b/sys/arch/pmax/include/bootinfo.h
index f31458bd947..009e14015eb 100644
--- a/sys/arch/pmax/include/bootinfo.h
+++ b/sys/arch/pmax/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.3 1999/04/24 08:01:09 simonb Exp $ */
+/* $NetBSD: bootinfo.h,v 1.4 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1997
@@ -69,5 +69,5 @@ struct btinfo_symtab {
};
#ifdef _KERNEL
-void *lookup_bootinfo __P((int));
+void *lookup_bootinfo __P((int));
#endif
diff --git a/sys/arch/pmax/include/fbvar.h b/sys/arch/pmax/include/fbvar.h
index 15c373ec325..bd822852a1c 100644
--- a/sys/arch/pmax/include/fbvar.h
+++ b/sys/arch/pmax/include/fbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbvar.h,v 1.7 1999/12/09 00:16:14 simonb Exp $ */
+/* $NetBSD: fbvar.h,v 1.8 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -94,12 +94,12 @@ struct fbinfo {
struct fbdriver {
int (*fbd_unblank) __P((struct fbinfo *));
int (*fbd_blank) __P((struct fbinfo *));
- void (*fbd_initcmap) __P ((struct fbinfo *));
- int (*fbd_getcmap) __P ((struct fbinfo *, u_char *, int, int));
- int (*fbd_putcmap) __P ((struct fbinfo *, const u_char *, int, int));
- void (*fbd_poscursor) __P ((struct fbinfo *fi, int x, int y));
- void (*fbd_loadcursor) __P ((struct fbinfo *fi, u_short *cursor));
- void (*fbd_cursorcolor) __P ((struct fbinfo *fi, u_int *color));
+ void (*fbd_initcmap) __P((struct fbinfo *));
+ int (*fbd_getcmap) __P((struct fbinfo *, u_char *, int, int));
+ int (*fbd_putcmap) __P((struct fbinfo *, const u_char *, int, int));
+ void (*fbd_poscursor) __P((struct fbinfo *fi, int x, int y));
+ void (*fbd_loadcursor) __P((struct fbinfo *fi, u_short *cursor));
+ void (*fbd_cursorcolor) __P((struct fbinfo *fi, u_int *color));
};
#ifdef _KERNEL
@@ -107,7 +107,7 @@ struct fbdriver {
#define kbd_docmd(cmd, val) 0 /* For now, do nothing. */
#define romgetcursoraddr(xp, yp) 0
-void fbconnect __P ((char *name, struct fbinfo *info, int silent));
-int fballoc __P ((caddr_t base, struct fbinfo **fip));
+void fbconnect __P((char *name, struct fbinfo *info, int silent));
+int fballoc __P((caddr_t base, struct fbinfo **fip));
#endif /* _KERNEL */
diff --git a/sys/arch/pmax/include/intr.h b/sys/arch/pmax/include/intr.h
index 14578586296..50222be8266 100644
--- a/sys/arch/pmax/include/intr.h
+++ b/sys/arch/pmax/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.8 1999/08/05 18:08:13 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.9 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -48,13 +48,13 @@
#include <mips/cpuregs.h>
-extern int _splraise __P((int));
-extern int _spllower __P((int));
-extern int _splset __P((int));
-extern int _splget __P((void));
-extern void _splnone __P((void));
-extern void _setsoftintr __P((int));
-extern void _clrsoftintr __P((int));
+int _splraise __P((int));
+int _spllower __P((int));
+int _splset __P((int));
+int _splget __P((void));
+void _splnone __P((void));
+void _setsoftintr __P((int));
+void _clrsoftintr __P((int));
#define setsoftclock() _setsoftintr(MIPS_SOFT_INT_MASK_0)
#define setsoftnet() _setsoftintr(MIPS_SOFT_INT_MASK_1)
diff --git a/sys/arch/pmax/include/param.h b/sys/arch/pmax/include/param.h
index 32ad0d66586..73216c7c7da 100644
--- a/sys/arch/pmax/include/param.h
+++ b/sys/arch/pmax/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.28 1999/12/04 21:21:18 ragge Exp $ */
+/* $NetBSD: param.h,v 1.29 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -103,8 +103,8 @@
#ifdef _KERNEL
#ifndef _LOCORE
-extern void delay __P((int n));
-extern int cpuspeed;
+void delay __P((int n));
+extern int cpuspeed;
#define DELAY(n) { register int N = cpuspeed * (n); while (--N > 0); }
#endif /* !_LOCORE */
diff --git a/sys/arch/pmax/include/tc_machdep.h b/sys/arch/pmax/include/tc_machdep.h
index f4f63a5b599..6c76b2ce024 100644
--- a/sys/arch/pmax/include/tc_machdep.h
+++ b/sys/arch/pmax/include/tc_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_machdep.h,v 1.13 1999/11/16 02:48:24 nisimura Exp $ */
+/* $NetBSD: tc_machdep.h,v 1.14 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -82,7 +82,7 @@ typedef int32_t tc_offset_t;
#define TC_BUS_MATCHNAME(ta, name) \
(strncmp( (ta)->ta_modname, (name), TC_ROM_LLEN+1) == 0)
-extern int badaddr __P((void *, u_int));
+int badaddr __P((void *, u_int));
#define TC_KV(x) ((tc_addr_t)MIPS_PHYS_TO_KSEG1(x))
#define TC_C(x) ((void *)(u_long)(x))
diff --git a/sys/arch/pmax/pmax/autoconf.c b/sys/arch/pmax/pmax/autoconf.c
index 40eccb68e47..2608df12d5c 100644
--- a/sys/arch/pmax/pmax/autoconf.c
+++ b/sys/arch/pmax/pmax/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.42 1999/11/15 09:50:22 nisimura Exp $ */
+/* $NetBSD: autoconf.c,v 1.43 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.42 1999/11/15 09:50:22 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.43 2000/01/08 01:02:38 simonb Exp $");
/*
* Setup the system to run on the current machine.
@@ -84,10 +84,10 @@ int cpuspeed = 30; /* approx # instr per usec. */
tc_option_t tc_slot_info[TC_MAX_LOGICAL_SLOTS];
-void configure_scsi __P((void));
+void configure_scsi __P((void));
-void findroot __P((struct device **, int *));
-void makebootdev __P((char *));
+void findroot __P((struct device **, int *));
+void makebootdev __P((char *));
/*
* Determine mass storage and memory configuration for a machine.
diff --git a/sys/arch/pmax/pmax/bus_dma.c b/sys/arch/pmax/pmax/bus_dma.c
index 6aad24fb0de..a3912f34a17 100644
--- a/sys/arch/pmax/pmax/bus_dma.c
+++ b/sys/arch/pmax/pmax/bus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.17 1999/11/13 00:30:43 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.18 2000/01/08 01:02:38 simonb Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@ int _bus_dmamap_load_buffer __P((bus_dmamap_t,
void *, bus_size_t, struct proc *, int, vaddr_t *,
int *, int));
-extern paddr_t kvtophys __P((vaddr_t)); /* XXX */
+paddr_t kvtophys __P((vaddr_t)); /* XXX */
/*
* The default DMA tag for all busses on the DECstation.
diff --git a/sys/arch/pmax/pmax/conf-glue.c b/sys/arch/pmax/pmax/conf-glue.c
index 77b3cfa8cd4..c4792b0f3c1 100644
--- a/sys/arch/pmax/pmax/conf-glue.c
+++ b/sys/arch/pmax/pmax/conf-glue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf-glue.c,v 1.20 1999/11/15 09:50:18 nisimura Exp $ */
+/* $NetBSD: conf-glue.c,v 1.21 2000/01/08 01:02:38 simonb Exp $ */
/*
* conf-glue.c:
@@ -117,7 +117,7 @@ struct pmax_scsi_device scsi_dinit[] = {
};
-int nomatch __P((struct device *parent, struct cfdata *cf, void *aux));
+int nomatch __P((struct device *parent, struct cfdata *cf, void *aux));
void noattach __P((struct device *parent, struct device *self, void *aux));
diff --git a/sys/arch/pmax/pmax/cpu.c b/sys/arch/pmax/pmax/cpu.c
index cc71021d5a3..defdbc40643 100644
--- a/sys/arch/pmax/pmax/cpu.c
+++ b/sys/arch/pmax/pmax/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.13 1999/11/15 09:50:20 nisimura Exp $ */
+/* $NetBSD: cpu.c,v 1.14 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -34,15 +34,15 @@
#include <machine/cpu.h>
#include <machine/autoconf.h>
-static int cpumatch __P((struct device *, struct cfdata *, void *));
-static void cpuattach __P((struct device *, struct device *, void *));
+static int cpumatch __P((struct device *, struct cfdata *, void *));
+static void cpuattach __P((struct device *, struct device *, void *));
struct cfattach cpu_ca = {
sizeof (struct device), cpumatch, cpuattach
};
extern struct cfdriver cpu_cd;
-extern void cpu_identify __P((void));
+void cpu_identify __P((void));
static int
cpumatch(parent, cf, aux)
diff --git a/sys/arch/pmax/pmax/dec_3100.c b/sys/arch/pmax/pmax/dec_3100.c
index 9356f570731..39b72e478d2 100644
--- a/sys/arch/pmax/pmax/dec_3100.c
+++ b/sys/arch/pmax/pmax/dec_3100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3100.c,v 1.19 1999/12/22 22:10:07 simonb Exp $ */
+/* $NetBSD: dec_3100.c,v 1.20 2000/01/08 01:02:38 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -97,9 +97,8 @@
void dec_3100_init __P((void));
void dec_3100_bus_reset __P((void));
-void dec_3100_enable_intr
- __P ((unsigned slotno, int (*handler)(void *),
- void *sc, int onoff));
+void dec_3100_enable_intr __P((unsigned slotno,
+ int (*handler)(void *), void *sc, int onoff));
int dec_3100_intr __P((unsigned, unsigned, unsigned, unsigned));
void dec_3100_cons_init __P((void));
void dec_3100_device_register __P((struct device *, void *));
diff --git a/sys/arch/pmax/pmax/dec_3max.c b/sys/arch/pmax/pmax/dec_3max.c
index 5ebfd3d7e37..8df8da29582 100644
--- a/sys/arch/pmax/pmax/dec_3max.c
+++ b/sys/arch/pmax/pmax/dec_3max.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3max.c,v 1.19 1999/12/03 03:34:36 simonb Exp $ */
+/* $NetBSD: dec_3max.c,v 1.20 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.19 1999/12/03 03:34:36 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.20 2000/01/08 01:02:39 simonb Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -98,9 +98,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.19 1999/12/03 03:34:36 simonb Exp $")
void dec_3max_init __P((void));
void dec_3max_bus_reset __P((void));
-void dec_3max_enable_intr
- __P ((unsigned slotno, int (*handler)(void *),
- void *sc, int onoff));
+void dec_3max_enable_intr __P((unsigned slotno,
+ int (*handler)(void *), void *sc, int onoff));
int dec_3max_intr __P((unsigned, unsigned, unsigned, unsigned));
void dec_3max_cons_init __P((void));
void dec_3max_device_register __P((struct device *, void *));
diff --git a/sys/arch/pmax/pmax/dec_3maxplus.c b/sys/arch/pmax/pmax/dec_3maxplus.c
index cd7927f44f7..04509d78c87 100644
--- a/sys/arch/pmax/pmax/dec_3maxplus.c
+++ b/sys/arch/pmax/pmax/dec_3maxplus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.30 1999/12/03 03:06:11 nisimura Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.31 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.30 1999/12/03 03:06:11 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.31 2000/01/08 01:02:39 simonb Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -103,13 +103,12 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.30 1999/12/03 03:06:11 nisimura E
*/
void dec_3maxplus_init __P((void));
void dec_3maxplus_bus_reset __P((void));
-void dec_3maxplus_enable_intr
- __P ((unsigned slotno, int (*handler)(void *),
- void *sc, int onoff));
+void dec_3maxplus_enable_intr __P((unsigned slotno,
+ int (*handler)(void *), void *sc, int onoff));
int dec_3maxplus_intr __P((unsigned, unsigned, unsigned, unsigned));
void dec_3maxplus_cons_init __P((void));
void dec_3maxplus_device_register __P((struct device *, void *));
-static void dec_3maxplus_errintr __P ((void));
+static void dec_3maxplus_errintr __P((void));
/*
diff --git a/sys/arch/pmax/pmax/dec_3min.c b/sys/arch/pmax/pmax/dec_3min.c
index be627aea327..3f6fc7c2664 100644
--- a/sys/arch/pmax/pmax/dec_3min.c
+++ b/sys/arch/pmax/pmax/dec_3min.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.29 1999/12/03 03:06:11 nisimura Exp $ */
+/* $NetBSD: dec_3min.c,v 1.30 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.29 1999/12/03 03:06:11 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.30 2000/01/08 01:02:39 simonb Exp $");
#include <sys/types.h>
@@ -106,9 +106,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.29 1999/12/03 03:06:11 nisimura Exp $
void dec_3min_init __P((void));
void dec_3min_bus_reset __P((void));
-void dec_3min_enable_intr
- __P ((unsigned slotno, int (*handler)(void *),
- void *sc, int onoff));
+void dec_3min_enable_intr __P((unsigned slotno,
+ int (*handler)(void *), void *sc, int onoff));
int dec_3min_intr __P((unsigned, unsigned, unsigned, unsigned));
void dec_3min_device_register __P((struct device *, void *));
void dec_3min_cons_init __P((void));
@@ -123,8 +122,8 @@ unsigned kn02ba_clkread __P((void));
static u_int32_t kmin_tc3_imask;
#ifdef MIPS3
-static unsigned latched_cycle_cnt;
-extern u_int32_t mips3_cycle_count __P((void));
+static unsigned latched_cycle_cnt;
+u_int32_t mips3_cycle_count __P((void));
#endif
diff --git a/sys/arch/pmax/pmax/dec_5100.c b/sys/arch/pmax/pmax/dec_5100.c
index a782196d730..2b15c8d3842 100644
--- a/sys/arch/pmax/pmax/dec_5100.c
+++ b/sys/arch/pmax/pmax/dec_5100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_5100.c,v 1.14 1999/12/03 03:06:11 nisimura Exp $ */
+/* $NetBSD: dec_5100.c,v 1.15 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -62,19 +62,18 @@
/*
* Forward declarations
*/
-void dec_5100_init __P((void));
-void dec_5100_bus_reset __P((void));
+void dec_5100_init __P((void));
+void dec_5100_bus_reset __P((void));
-void dec_5100_enable_intr
- __P ((unsigned slotno, int (*handler)(void *),
- void *sc, int onoff));
-int dec_5100_intr __P((unsigned, unsigned, unsigned, unsigned));
-void dec_5100_cons_init __P((void));
-void dec_5100_device_register __P((struct device *, void *));
+void dec_5100_enable_intr __P((unsigned slotno,
+ int (*handler)(void *), void *sc, int onoff));
+int dec_5100_intr __P((unsigned, unsigned, unsigned, unsigned));
+void dec_5100_cons_init __P((void));
+void dec_5100_device_register __P((struct device *, void *));
-void dec_5100_memintr __P((void));
+void dec_5100_memintr __P((void));
-extern void kn230_wbflush __P((void));
+void kn230_wbflush __P((void));
void
dec_5100_init()
diff --git a/sys/arch/pmax/pmax/dec_maxine.c b/sys/arch/pmax/pmax/dec_maxine.c
index 341bfbd2fd2..ac4fba39f0a 100644
--- a/sys/arch/pmax/pmax/dec_maxine.c
+++ b/sys/arch/pmax/pmax/dec_maxine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_maxine.c,v 1.21 1999/12/03 03:06:11 nisimura Exp $ */
+/* $NetBSD: dec_maxine.c,v 1.22 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.21 1999/12/03 03:06:11 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.22 2000/01/08 01:02:39 simonb Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -103,9 +103,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.21 1999/12/03 03:06:11 nisimura Exp
*/
void dec_maxine_init __P((void));
void dec_maxine_bus_reset __P((void));
-void dec_maxine_enable_intr
- __P ((unsigned slotno, int (*handler)(void *),
- void *sc, int onoff));
+void dec_maxine_enable_intr __P((unsigned slotno,
+ int (*handler)(void *), void *sc, int onoff));
int dec_maxine_intr __P((unsigned, unsigned, unsigned, unsigned));
void dec_maxine_device_register __P((struct device *, void *));
void dec_maxine_cons_init __P((void));
diff --git a/sys/arch/pmax/pmax/disksubr.c b/sys/arch/pmax/pmax/disksubr.c
index 89d7dd5622a..b0413e095d7 100644
--- a/sys/arch/pmax/pmax/disksubr.c
+++ b/sys/arch/pmax/pmax/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.22 1999/11/28 04:55:39 simonb Exp $ */
+/* $NetBSD: disksubr.c,v 1.23 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -50,15 +50,15 @@
#ifdef COMPAT_ULTRIX
#include <machine/dec_boot.h>
-extern char *
-compat_label __P((dev_t dev, void (*strat) __P((struct buf *bp)),
- struct disklabel *lp, struct cpu_disklabel *osdep));
+char *compat_label __P((dev_t dev,
+ void (*strat) __P((struct buf *bp)), struct disklabel *lp,
+ struct cpu_disklabel *osdep));
#endif
-char* readdisklabel __P((dev_t dev, void (*strat) __P((struct buf *bp)),
- struct disklabel *lp,
- struct cpu_disklabel *osdep));
+char *readdisklabel __P((dev_t dev,
+ void (*strat) __P((struct buf *bp)), struct disklabel *lp,
+ struct cpu_disklabel *osdep));
/*
* Attempt to read a disk label from a device
diff --git a/sys/arch/pmax/pmax/machdep.c b/sys/arch/pmax/pmax/machdep.c
index 737b416d2e9..d5462c388c3 100644
--- a/sys/arch/pmax/pmax/machdep.c
+++ b/sys/arch/pmax/pmax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.154 1999/12/04 21:21:19 ragge Exp $ */
+/* $NetBSD: machdep.c,v 1.155 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.154 1999/12/04 21:21:19 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.155 2000/01/08 01:02:39 simonb Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -132,7 +132,7 @@ void mach_init __P((int, char *[], int, int, u_int, char *));
/* Old 4.4bsd/pmax-derived interrupt-enable method */
-void (*tc_enable_interrupt) __P ((unsigned, int (*)(void *), void *, int));
+void (*tc_enable_interrupt) __P((unsigned, int (*)(void *), void *, int));
/*XXXjrs*/
const struct callback *callv; /* pointer to PROM entry points */
@@ -140,7 +140,7 @@ const struct callback *callv; /* pointer to PROM entry points */
#ifdef DEBUG
/* stacktrace code violates prototypes to get callee's registers */
-extern void stacktrace __P((void)); /*XXX*/
+void stacktrace __P((void)); /*XXX*/
#endif
/* Motherboard or system-specific initialization vector */
@@ -190,7 +190,7 @@ mach_init(argc, argv, code, cv, bim, bip)
struct btinfo_symtab *bi_syms;
struct exec *aout; /* XXX backwards compatilbity for DDB */
#endif
- extern void makebootdev __P((char *));
+ void makebootdev __P((char *));
extern char edata[], end[];
/* Set up bootinfo structure. Note that we can't print messages yet! */
diff --git a/sys/arch/pmax/pmax/memc.h b/sys/arch/pmax/pmax/memc.h
index 38c3a57fd5e..d683c7d7c53 100644
--- a/sys/arch/pmax/pmax/memc.h
+++ b/sys/arch/pmax/pmax/memc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: memc.h,v 1.2 1999/08/16 13:13:00 simonb Exp $ */
+/* $NetBSD: memc.h,v 1.3 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -37,6 +37,6 @@
void dec_mtasic_err __P((u_int32_t erradr, u_int32_t errsyn,
u_int32_t bnk32m));
-void kn02ba_errintr __P ((void));
+void kn02ba_errintr __P((void));
#endif
diff --git a/sys/arch/pmax/pmax/memc_3min.c b/sys/arch/pmax/pmax/memc_3min.c
index 1938b0b5e81..95e7b86771d 100644
--- a/sys/arch/pmax/pmax/memc_3min.c
+++ b/sys/arch/pmax/pmax/memc_3min.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memc_3min.c,v 1.5 1999/05/26 04:23:59 nisimura Exp $ */
+/* $NetBSD: memc_3min.c,v 1.6 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: memc_3min.c,v 1.5 1999/05/26 04:23:59 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memc_3min.c,v 1.6 2000/01/08 01:02:39 simonb Exp $");
/*
* Motherboard memory error contoller used in both
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: memc_3min.c,v 1.5 1999/05/26 04:23:59 nisimura Exp $
/* forward declarations */
-static unsigned kn02ba_recover_erradr __P((u_int phys, u_int mer));
+static unsigned kn02ba_recover_erradr __P((u_int phys, u_int mer));
static unsigned
diff --git a/sys/arch/pmax/pmax/sysconf.c b/sys/arch/pmax/pmax/sysconf.c
index 2b6d4c1ff7d..a0ebe558877 100644
--- a/sys/arch/pmax/pmax/sysconf.c
+++ b/sys/arch/pmax/pmax/sysconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.c,v 1.4 1999/03/25 01:17:53 simonb Exp $ */
+/* $NetBSD: sysconf.c,v 1.5 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -38,14 +38,14 @@
#include "opt_dec_3100.h"
#ifdef DEC_3100
- extern void dec_3100_init __P((void));
+ void dec_3100_init __P((void));
#else
# define dec_3100_init platform_not_configured
#endif
#include "opt_dec_3max.h"
#ifdef DEC_3MAX
- extern void dec_3max_init __P((void));
+ void dec_3max_init __P((void));
#else
# define dec_3max_init platform_not_configured
#endif
@@ -53,7 +53,7 @@
#include "opt_dec_3min.h"
#ifdef DEC_3MIN
- extern void dec_3min_init __P((void));
+ void dec_3min_init __P((void));
#else
# define dec_3min_init platform_not_configured
#endif
@@ -61,35 +61,35 @@
#include "opt_dec_maxine.h"
#ifdef DEC_MAXINE
- extern void dec_maxine_init __P((void));
+ void dec_maxine_init __P((void));
#else
# define dec_maxine_init platform_not_configured
#endif
#include "opt_dec_3maxplus.h"
#ifdef DEC_3MAXPLUS
- extern void dec_3maxplus_init __P((void));
+ void dec_3maxplus_init __P((void));
#else
# define dec_3maxplus_init platform_not_configured
#endif
#include "opt_dec_5100.h"
#ifdef DEC_5100
- extern void dec_5100_init __P((void));
+ void dec_5100_init __P((void));
#else
# define dec_5100_init platform_not_configured
#endif
#include "opt_dec_5400.h"
#ifdef DEC_5400
- extern void dec_5400_init __P((void));
+ void dec_5400_init __P((void));
#else
# define dec_5400_init platform_not_configured
#endif
#include "opt_dec_5500.h"
#ifdef DEC_5500
- extern void dec_5500_init __P((void));
+ void dec_5500_init __P((void));
#else
# define dec_5500_init platform_not_configured
#endif
@@ -97,7 +97,7 @@
#include "opt_dec_5800.h"
#ifdef DEC_5800
- extern void dec_5800_init __P((void));
+ void dec_5800_init __P((void));
#else
# define dec_5800_init platform_not_configured
#endif
diff --git a/sys/arch/pmax/pmax/turbochannel.h b/sys/arch/pmax/pmax/turbochannel.h
index 4b27395acb5..e7df771a945 100644
--- a/sys/arch/pmax/pmax/turbochannel.h
+++ b/sys/arch/pmax/pmax/turbochannel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: turbochannel.h,v 1.10 1999/11/15 09:50:19 nisimura Exp $ */
+/* $NetBSD: turbochannel.h,v 1.11 2000/01/08 01:02:39 simonb Exp $ */
/*-
@@ -125,16 +125,15 @@ typedef struct {
void *sc; /* Device softc */
char module_name[TC_ROM_LLEN+1]; /* ROM name */
char module_id[TC_ROM_LLEN * 2+1]; /* vendor and rev */
- u_long k1seg_address; /* TC starting address */
- char *driver_name; /* software name */
- int (*intr) __P((void*)); /* interrupt routine */
+ u_long k1seg_address; /* TC starting address */
+ char *driver_name; /* software name */
+ int (*intr) __P((void*)); /* interrupt routine */
} tc_option_t;
#ifdef _KERNEL
extern tc_option_t tc_slot_info[];
-extern void (*tc_enable_interrupt) __P ((u_int slotno,
- int (*handler) __P ((void *)),
- void *sc, int onoff));
+extern void (*tc_enable_interrupt) __P((u_int slotno,
+ int (*handler) __P((void *)), void *sc, int onoff));
#endif /* _KERNEL */
diff --git a/sys/arch/pmax/tc/ioasic.c b/sys/arch/pmax/tc/ioasic.c
index e0e31ff4e85..56b64bb0c69 100644
--- a/sys/arch/pmax/tc/ioasic.c
+++ b/sys/arch/pmax/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic.c,v 1.3 1999/12/06 11:52:36 simonb Exp $ */
+/* $NetBSD: ioasic.c,v 1.4 2000/01/08 01:02:39 simonb Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -93,8 +93,8 @@ static int kn03_builtin_ndevs = ARRAY_SIZEOF(kn03_ioasic_devs) - 3;
static int kn03_ioasic_ndevs = ARRAY_SIZEOF(kn03_ioasic_devs);
#endif
-static int ioasicmatch __P((struct device *, struct cfdata *, void *));
-static void ioasicattach __P((struct device *, struct device *, void *));
+static int ioasicmatch __P((struct device *, struct cfdata *, void *));
+static void ioasicattach __P((struct device *, struct device *, void *));
const struct cfattach ioasic_ca = {
sizeof(struct ioasic_softc), ioasicmatch, ioasicattach
diff --git a/sys/arch/pmax/tc/mcclock_ioasic.c b/sys/arch/pmax/tc/mcclock_ioasic.c
index 786fd9732a3..033b43a3788 100644
--- a/sys/arch/pmax/tc/mcclock_ioasic.c
+++ b/sys/arch/pmax/tc/mcclock_ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_ioasic.c,v 1.9 1999/11/15 09:50:43 nisimura Exp $ */
+/* $NetBSD: mcclock_ioasic.c,v 1.10 2000/01/08 01:02:40 simonb Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.9 1999/11/15 09:50:43 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.10 2000/01/08 01:02:40 simonb Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.9 1999/11/15 09:50:43 nisimura
#include <dev/dec/mcclock_pad32.h>
-int mcclock_ioasic_match __P((struct device *, struct cfdata *, void *));
-void mcclock_ioasic_attach __P((struct device *, struct device *, void *));
+int mcclock_ioasic_match __P((struct device *, struct cfdata *, void *));
+void mcclock_ioasic_attach __P((struct device *, struct device *, void *));
struct cfattach mcclock_ioasic_ca = {
sizeof (struct mcclock_pad32_softc),
diff --git a/sys/arch/pmax/tc/scc.c b/sys/arch/pmax/tc/scc.c
index f8b17fbe282..fc2ad90f1b0 100644
--- a/sys/arch/pmax/tc/scc.c
+++ b/sys/arch/pmax/tc/scc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scc.c,v 1.58 2000/01/07 14:12:51 simonb Exp $ */
+/* $NetBSD: scc.c,v 1.59 2000/01/08 01:02:40 simonb Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.58 2000/01/07 14:12:51 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.59 2000/01/08 01:02:40 simonb Exp $");
#include "opt_ddb.h"
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.58 2000/01/07 14:12:51 simonb Exp $");
#include "rasterconsole.h"
-extern void ttrstrt __P((void *));
+void ttrstrt __P((void *));
/*
@@ -263,7 +263,7 @@ static struct scc_softc coldcons_softc;
static struct consdev scccons = {
NULL, NULL, sccGetc, sccPutc, sccPollc, NODEV, 0
};
-void scc_consinit __P((dev_t dev, struct scc_regmap *sccaddr));
+void scc_consinit __P((dev_t dev, struct scc_regmap *sccaddr));
/*
diff --git a/sys/arch/pmax/tc/sccvar.h b/sys/arch/pmax/tc/sccvar.h
index 41e42834349..249dfc4089b 100644
--- a/sys/arch/pmax/tc/sccvar.h
+++ b/sys/arch/pmax/tc/sccvar.h
@@ -1,13 +1,13 @@
-/* $NetBSD: sccvar.h,v 1.3 1998/11/15 11:21:53 jonathan Exp $ */
+/* $NetBSD: sccvar.h,v 1.4 2000/01/08 01:02:40 simonb Exp $ */
/*
*
*/
-extern int sccGetc __P((dev_t));
-extern void sccPutc __P((dev_t, int));
-extern int sccparam __P((struct tty *, struct termios *));
+int sccGetc __P((dev_t));
+void sccPutc __P((dev_t, int));
+int sccparam __P((struct tty *, struct termios *));
struct scc_regmap;
-void scc_consinit __P((dev_t dev, struct scc_regmap *sccaddr));
+void scc_consinit __P((dev_t dev, struct scc_regmap *sccaddr));
/*
* Minor device numbers for scc. Weird because B channel comes
diff --git a/sys/arch/pmax/tc/tcbus.c b/sys/arch/pmax/tc/tcbus.c
index 170319af21b..d1de8d077f2 100644
--- a/sys/arch/pmax/tc/tcbus.c
+++ b/sys/arch/pmax/tc/tcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcbus.c,v 1.3 1999/11/17 03:42:20 nisimura Exp $ */
+/* $NetBSD: tcbus.c,v 1.4 2000/01/08 01:02:40 simonb Exp $ */
/*
* Copyright (c) 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.3 1999/11/17 03:42:20 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.4 2000/01/08 01:02:40 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.3 1999/11/17 03:42:20 nisimura Exp $");
void tc_ds_intr_establish __P((struct device *, void *,
int, int (*)(void *), void *));
void tc_ds_intr_disestablish __P((struct device *, void *));
-extern void (*tc_enable_interrupt) __P ((unsigned, int (*)(void *), void *, int));
+extern void (*tc_enable_interrupt) __P((unsigned, int (*)(void *), void *, int));
/* XXX XXX XXX XXX XXX XXX XXX */
bus_dma_tag_t tc_ds_get_dma_tag __P((int));
@@ -206,7 +206,7 @@ tc_ds_intr_disestablish(dev, arg)
#include <pmax/dev/mfbvar.h>
#include <pmax/dev/sfbvar.h>
-extern int px_init __P((struct fbinfo*, char *, int, int));
+int px_init __P((struct fbinfo*, char *, int, int));
#include <machine/dec_prom.h>