Cosmetic changes only, primarily making comments line up nicely after the

__P removal.

15 files changed, 91 insertions, 78 deletions

diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c
index b458a76d0ac..bfba120fca3 100644
--- a/sys/arch/alpha/tc/scc.c
+++ b/sys/arch/alpha/tc/scc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scc.c,v 1.13 2002/03/14 01:26:28 millert Exp $	*/
+/*	$OpenBSD: scc.c,v 1.14 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: scc.c,v 1.28 1996/12/05 01:39:43 cgd Exp $	*/
 
 /*
@@ -115,8 +115,8 @@
 #define	SCCLINE(dev)	(minor(dev) & 0x1)
 
 /* QVSS-compatible in-kernel X input event parser, pointer tracker */
-void	(*sccDivertXInput)(int cc); /* X windows keyboard input routine */
-void	(*sccMouseEvent)(int);	/* X windows mouse motion event routine */
+void	(*sccDivertXInput)(int cc);	/* X windows keyboard input routine */
+void	(*sccMouseEvent)(int);		/* X windows mouse motion event routine */
 void	(*sccMouseButtons)(int);	/* X windows mouse buttons event routine */
 #ifdef DEBUG
 int	debugChar;
diff --git a/sys/arch/alpha/tc/tcdsvar.h b/sys/arch/alpha/tc/tcdsvar.h
index d9de6cf829c..5c73d575a94 100644
--- a/sys/arch/alpha/tc/tcdsvar.h
+++ b/sys/arch/alpha/tc/tcdsvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcdsvar.h,v 1.7 2002/03/14 03:15:51 millert Exp $	*/
+/*	$OpenBSD: tcdsvar.h,v 1.8 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: tcdsvar.h,v 1.5 1996/11/13 21:13:38 cgd Exp $	*/
 
 /*
@@ -35,7 +35,7 @@ struct tcds_slotconfig {
 	int	sc_slot;
 	struct tcds_softc *sc_tcds;		/* to frob TCDS regs */
 	struct esp_softc *sc_esp;		/* to frob child's regs */
-	int	(*sc_intrhand)(void *);	/* intr. handler */
+	int	(*sc_intrhand)(void *);		/* intr. handler */
 	void	*sc_intrarg;			/* intr. handler arg. */
 
 	/*
diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c
index 6a49c7fbae6..d12e5dc52c0 100644
--- a/sys/arch/amiga/amiga/swapgeneric.c
+++ b/sys/arch/amiga/amiga/swapgeneric.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swapgeneric.c,v 1.14 2002/03/14 01:26:28 millert Exp $	*/
+/*	$OpenBSD: swapgeneric.c,v 1.15 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: swapgeneric.c,v 1.27 1997/01/26 22:58:32 rat Exp $	*/
 
 /*
@@ -110,7 +110,7 @@ struct genericconf genericconf[] = {
 	{ 0 },
 };
 
-struct genericconf * getgenconf(char *); 
+struct genericconf *getgenconf(char *); 
 
 struct genericconf *
 getgenconf(bp)
diff --git a/sys/arch/amiga/dev/sfasvar.h b/sys/arch/amiga/dev/sfasvar.h
index dff16f4596d..9905bd76ac9 100644
--- a/sys/arch/amiga/dev/sfasvar.h
+++ b/sys/arch/amiga/dev/sfasvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfasvar.h,v 1.4 2002/03/14 01:26:29 millert Exp $	*/
+/*	$OpenBSD: sfasvar.h,v 1.5 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: sfasvar.h,v 1.4 1996/04/21 21:12:33 veego Exp $	*/
 
 /*
@@ -204,12 +204,12 @@ struct	sfas_softc {
 
 /* Generic DMA functions */
 	int		       (*sc_setup_dma)(struct sfas_softc *sc,
-					    vm_offset_t ptr, int len, int mode);
+				    vm_offset_t ptr, int len, int mode);
 	int		       (*sc_build_dma_chain)(struct sfas_softc *sc,
-					    struct sfas_dma_chain *chain,
-					    void *p, int l);
+				    struct sfas_dma_chain *chain,
+				    void *p, int l);
 	int		       (*sc_need_bump)(struct sfas_softc *sc,
-					    vm_offset_t ptr, int len);
+				    vm_offset_t ptr, int len);
 
 /* Generic Led data */
 	int			 sc_led_status;
diff --git a/sys/arch/hp300/stand/include/kbdvar.h b/sys/arch/hp300/stand/include/kbdvar.h
index ab2b96ec854..00074065f7d 100644
--- a/sys/arch/hp300/stand/include/kbdvar.h
+++ b/sys/arch/hp300/stand/include/kbdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbdvar.h,v 1.2 2002/03/14 01:26:31 millert Exp $	*/
+/*	$OpenBSD: kbdvar.h,v 1.3 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: kbdvar.h,v 1.1 1997/04/14 19:00:13 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@
 
 struct kbdsw {
 	int	(*k_getc)(void);	/* get character */
-	void	(*k_nmi)(void);	/* handle non-maskable interrupt */
+	void	(*k_nmi)(void);		/* handle non-maskable interrupt */
 	int	(*k_init)(void);	/* probe/initialize keyboard */
 };
 
diff --git a/sys/arch/hppa/include/iomod.h b/sys/arch/hppa/include/iomod.h
index 17cc3e47ed2..d7d3c40f106 100644
--- a/sys/arch/hppa/include/iomod.h
+++ b/sys/arch/hppa/include/iomod.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iomod.h,v 1.10 2002/03/14 01:26:32 millert Exp $	*/
+/*	$OpenBSD: iomod.h,v 1.11 2002/03/15 01:20:04 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -151,10 +151,10 @@
 struct pagezero {
 	/* [0x000] Initialize Vectors */
 	int	ivec_special;		/* must be zero */
-	int	(*ivec_mempf)(void); /* powerfail recovery software */
+	int	(*ivec_mempf)(void);	/* powerfail recovery software */
 	int	(*ivec_toc)(void);	/* exec'd after Transfer Of Control */
 	u_int	ivec_toclen;		/* bytes of ivec_toc code */
-	int	(*ivec_rendz)(void); /* exec'd after Rendezvous Signal */
+	int	(*ivec_rendz)(void);	/* exec'd after Rendezvous Signal */
 	u_int	ivec_mempflen;		/* bytes of ivec_mempf code */
 	u_int	ivec_resv[2];		/* (reserved) */
 	u_int	ivec_mbz;		/* must be zero */
diff --git a/sys/arch/mac68k/mac68k/macrom.h b/sys/arch/mac68k/mac68k/macrom.h
index 1d0cd52770b..987517c302f 100644
--- a/sys/arch/mac68k/mac68k/macrom.h
+++ b/sys/arch/mac68k/mac68k/macrom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macrom.h,v 1.9 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: macrom.h,v 1.10 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: macrom.h,v 1.9 1996/05/25 14:45:35 briggs Exp $	*/
 
 /*-
@@ -41,14 +41,14 @@ extern caddr_t		ROMBase;	/* Base address of ROM space */
 extern caddr_t		ADBBase;	/* Base address of ADB scratch */
 extern caddr_t		ADBYMM; 	/* Base address of yet more ADB mem */
 extern caddr_t		ADBState;	/* Base address of ADB scratch ? */
-extern void	(*JADBProc)(void); /* ADBReInit pre/post processing */
-extern void	(*Lvl1DT[8])(void); /* VIA1 interrupt table by bit */
-extern void	(*Lvl2DT[8])(void); /* VIA2 interrupt table by bit */
+extern void	(*JADBProc)(void);	/* ADBReInit pre/post processing */
+extern void	(*Lvl1DT[8])(void);	/* VIA1 interrupt table by bit */
+extern void	(*Lvl2DT[8])(void);	/* VIA2 interrupt table by bit */
 extern void	(*jADBOp)(void);	/* low memory pointer to ADBOp */
 extern void	(*jUnimplTrap)(void);	/* Unimplemented trap */
 	/* loglob(KbdLast, 0x218)	* addr of last kbd to send */
 	/* loglob(KbdType, 0x21E)	* type of last kbd to send */
-extern void	(*JKybdTask)(void); /* Keyboard task ptr? */
+extern void	(*JKybdTask)(void);	/* Keyboard task ptr? */
 extern u_char		CPUFlag;	/* Type of CPU in this machine */
 extern void	(*MacJmp)(void);	/* ??? */
 extern u_long		Lo3Bytes;	/* 0x00ffffff */
@@ -65,13 +65,13 @@ extern caddr_t		VIA;		/* VIA1 base address */
 extern caddr_t		mrg_VIA2;	/* VIA2 base address */
 extern caddr_t		SCCRd;		/* SCC read base address */
 extern u_char		FinderName[20]; /* FinderName - Pascal string */
-extern void	(*jSwapMMU)(void); /* Pointer to MMU Swap routine */
+extern void	(*jSwapMMU)(void);	/* Pointer to MMU Swap routine */
 extern void	(*jEgret)(void);	/* Pointer to MMU Swap routine */
 extern u_int16_t	HwCfgFlags;	/* Hardware config flags */
 extern u_int32_t	HwCfgFlags2;	/* more hardware config flags */
 extern u_int32_t	HwCfgFlags3;	/* more hardware config flags */
 extern u_int32_t	ADBReInit_JTBL;	/* pointer to patch table */
-extern void	(*jClkNoMem)(void); /* pointer to ClkNoMem */
+extern void	(*jClkNoMem)(void);	/* pointer to ClkNoMem */
 extern u_char		SysParam[20];	/* Place where PRam data gets stored */
 extern caddr_t		ExpandMem;	/* pointer to Expanded Memory used by */
 					/*  newer ADB routines (since LCIII) */
diff --git a/sys/arch/mvme88k/stand/sboot/sboot.h b/sys/arch/mvme88k/stand/sboot/sboot.h
index 3bc198324b4..f50701bfabf 100644
--- a/sys/arch/mvme88k/stand/sboot/sboot.h
+++ b/sys/arch/mvme88k/stand/sboot/sboot.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sboot.h,v 1.3 2002/03/14 01:26:41 millert Exp $	*/
+/*	$OpenBSD: sboot.h,v 1.4 2002/03/15 01:20:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
@@ -45,7 +45,7 @@ extern caddr_t end;
 
 #define NULL ((char *)0)
 
-void bcopy(const void *, void *, size_t);		/* libc_sa */
+void bcopy(const void *, void *, size_t);	/* libc_sa */
 void *memset(void *, int, size_t);		/* libc_sa */
 int printf(const char *, ...);			/* libc_sa */
 
diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h
index e465c56ae8e..525403a986a 100644
--- a/sys/arch/sparc/include/autoconf.h
+++ b/sys/arch/sparc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.10 2002/03/14 03:16:00 millert Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.11 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.20 1997/05/24 20:03:03 pk Exp $ */
 
 /*
@@ -126,8 +126,7 @@ struct confargs {
  * it will use that instead of creating one, but you must only do this if
  * you get it from ../sparc/vaddrs.h.
  */
-void	*mapdev(struct rom_reg *pa, int va,
-		     int offset, int size);
+void	*mapdev(struct rom_reg *pa, int va, int offset, int size);
 #define	mapiodev(pa, offset, size) \
 	mapdev(pa, 0, offset, size)
 /*
diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h
index 0fc60a09c06..0a03845905a 100644
--- a/sys/arch/sparc/include/oldmon.h
+++ b/sys/arch/sparc/include/oldmon.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oldmon.h,v 1.8 2002/03/14 01:26:43 millert Exp $	*/
+/*	$OpenBSD: oldmon.h,v 1.9 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: oldmon.h,v 1.11 1996/03/31 22:21:38 pk Exp $ */
 
 /*
@@ -155,14 +155,14 @@ struct om_vector {
 	int	*diagberr;		/* Bus err handler for diags */
 
 	/* Monitor and hardware revision and identification */
-	struct om_bootparam **bootParam;	/* Info for bootstrapped pgm */
+	struct om_bootparam **bootParam;/* Info for bootstrapped pgm */
  	u_long	*memorySize;		/* Usable memory in bytes */
 
 	/* Single-character input and output */
 	int	(*getChar)(void);	/* Get char from input source */
 	void	(*putChar)(int);	/* Put char to output sink */
 	int	(*mayGet)(void);	/* Maybe get char, or -1 */
-	int	(*mayPut)(int);	/* Maybe put char, or -1 */
+	int	(*mayPut)(int);		/* Maybe put char, or -1 */
 	u_char	*echo;			/* Should getchar echo? */
 	u_char	*inSource;		/* Input source selector */
 	u_char	*outSink;		/* Output sink selector */
@@ -173,7 +173,7 @@ struct om_vector {
 
 	/* Keyboard input (scanned by monitor nmi routine) */
 	int	(*getKey)(void);	/* Get next key if one exists */
-	int	(*initGetKey)(void);/* Initialize get key */
+	int	(*initGetKey)(void);	/* Initialize get key */
 	u_int	*translation;		/* Kbd translation selector */
 	u_char	*keyBid;		/* Keyboard ID byte */
 	int	*screen_x;		/* V2: Screen x pos (R/O) */
@@ -184,7 +184,7 @@ struct om_vector {
 	char	*monId;
 
 	/* Frame buffer output and terminal emulation */
-	int	(*fbWriteChar)(void);/* Write a character to FB */
+	int	(*fbWriteChar)(void);	/* Write a character to FB */
 	int	*fbAddr;		/* Address of frame buffer */
 	char	**font;			/* Font table for FB */
 	void	(*fbWriteStr)(char *, int);
@@ -198,14 +198,14 @@ struct om_vector {
 	u_char	**linePtr;		/* Cur pointer into linebuf */
 	int	*lineSize;		/* length of line in linebuf */
 	int	(*getLine)(void);	/* Get line from user */
-	u_char	(*getNextChar)(void);/* Get next char from linebuf */
-	u_char	(*peekNextChar)(void);/* Peek at next char */
+	u_char	(*getNextChar)(void);	/* Get next char from linebuf */
+	u_char	(*peekNextChar)(void);	/* Peek at next char */
 	int	*fbThere;		/* =1 if frame buffer there */
 	int	(*getNum)(void);	/* Grab hex num from line */
 
 	/* Print formatted output to current output sink */
 	int	(*printf)(void);	/* Similar to "Kernel printf" */
-	int	(*printHex)(void);/* Format N digits in hex */
+	int	(*printHex)(void);	/* Format N digits in hex */
 
 	/* Led stuff */
 	u_char	*leds;			/* RAM copy of LED register */
@@ -213,7 +213,7 @@ struct om_vector {
 
 	/* Non-maskable interrupt  (nmi) information */
 	int	(*nmiAddr)(void);	/* Addr for level 7 vector */
-	void	(*abortEntry)(void);/* Entry for keyboard abort */
+	void	(*abortEntry)(void);	/* Entry for keyboard abort */
 	int	*nmiClock;		/* Counts up in msec */
 
 	/* Frame buffer type: see <machine/fbio.h> */
@@ -231,9 +231,11 @@ struct om_vector {
 	long	*resetMap;		/* pgmap entry for resetaddr */
 					/* Really struct pgmapent *  */
 
-	void	(*exitToMon)(void) __attribute__((__noreturn__));/* Exit from user program */
+					/* Exit from user program */
+	void	(*exitToMon)(void) __attribute__((__noreturn__));
 	u_char	**memorybitmap;		/* V1: &{0 or &bits} */
-	void	(*setcxsegmap)		/* Set seg in any context */(int, caddr_t, int);
+					/* Set seg in any context */
+	void	(*setcxsegmap)(int, caddr_t, int);
 	void	(**vector_cmd)(u_long, char *);/* V2: Handler for 'v' cmd */
   	u_long	*ExpectedTrapSig;
   	u_long	*TrapVectorTable;
diff --git a/sys/arch/sparc/sparc/cache.h b/sys/arch/sparc/sparc/cache.h
index 9c0accc6c82..b1caebac505 100644
--- a/sys/arch/sparc/sparc/cache.h
+++ b/sys/arch/sparc/sparc/cache.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cache.h,v 1.7 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: cache.h,v 1.8 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: cache.h,v 1.16 1997/07/06 21:15:14 pk Exp $ */
 
 /*
@@ -151,24 +151,24 @@ extern int cache_alias_bits;
  * Routines for dealing with the cache.
  */
 void	sun4_cache_enable(void);		/* turn it on */
-void	ms1_cache_enable(void);		/* turn it on */
-void	viking_cache_enable(void);	/* turn it on */
-void	hypersparc_cache_enable(void);	/* turn it on */
+void	ms1_cache_enable(void);			/* turn it on */
+void	viking_cache_enable(void);		/* turn it on */
+void	hypersparc_cache_enable(void);		/* turn it on */
 void	swift_cache_enable(void);		/* turn it on */
-void	cypress_cache_enable(void);	/* turn it on */
-void	turbosparc_cache_enable(void);	/* turn it on */
+void	cypress_cache_enable(void);		/* turn it on */
+void	turbosparc_cache_enable(void);		/* turn it on */
 
 void	sun4_vcache_flush_context(void);	/* flush current context */
-void	sun4_vcache_flush_region(int);	/* flush region in cur ctx */
-void	sun4_vcache_flush_segment(int, int);/* flush seg in cur ctx */
-void	sun4_vcache_flush_page(int va);	/* flush page in cur ctx */
-void	sun4_cache_flush(caddr_t, u_int);/* flush region */
+void	sun4_vcache_flush_region(int);		/* flush region in cur ctx */
+void	sun4_vcache_flush_segment(int, int);	/* flush seg in cur ctx */
+void	sun4_vcache_flush_page(int va);		/* flush page in cur ctx */
+void	sun4_cache_flush(caddr_t, u_int);	/* flush region */
 
 void	srmmu_vcache_flush_context(void);	/* flush current context */
-void	srmmu_vcache_flush_region(int);	/* flush region in cur ctx */
-void	srmmu_vcache_flush_segment(int, int);/* flush seg in cur ctx */
+void	srmmu_vcache_flush_region(int);		/* flush region in cur ctx */
+void	srmmu_vcache_flush_segment(int, int);	/* flush seg in cur ctx */
 void	srmmu_vcache_flush_page(int va);	/* flush page in cur ctx */
-void	srmmu_cache_flush(caddr_t, u_int);/* flush region */
+void	srmmu_cache_flush(caddr_t, u_int);	/* flush region */
 void	hypersparc_pure_vcache_flush(void);
 
 void	ms1_cache_flush_all(void);
diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h
index 1164cca88cd..7fcdf41a0bf 100644
--- a/sys/arch/sun3/include/mon.h
+++ b/sys/arch/sun3/include/mon.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mon.h,v 1.7 2002/03/14 03:16:01 millert Exp $	*/
+/*	$OpenBSD: mon.h,v 1.8 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $	*/
 
 /*-
@@ -124,7 +124,7 @@ typedef struct {
 	u_char	(*getChar)(void);	/* Get char from input source */
 	int	(*putChar)(int);	/* Put char to output sink */
 	int	(*mayGet)(void);	/* Maybe get char, or -1 */
-	int	(*mayPut)(int);	/* Maybe put char, or -1 */
+	int	(*mayPut)(int);		/* Maybe put char, or -1 */
 	u_char	*echo;			/* Should getchar echo? */
 	u_char	*inSource;		/* Input source selector */
 	u_char	*outSink;		/* Output sink selector */
@@ -134,7 +134,7 @@ typedef struct {
 	 */
 
 	int	(*getKey)(void);		/* Get next key if one exists */
-	int	(*initGetKey)(void *);	/* Initialize get key */
+	int	(*initGetKey)(void *);		/* Initialize get key */
 	u_int	*translation;			/* Kbd translation selector
 						   (see keyboard.h in sun
 						    monitor code) */
@@ -153,7 +153,7 @@ typedef struct {
 	 * Frame buffer output and terminal emulation
 	 */
 
-	int	(*fbWriteChar)(int); /* Write a character to FB */
+	int	(*fbWriteChar)(int);	/* Write a character to FB */
 	int	*fbAddr;		/* Address of frame buffer */
 	char	**font;			/* Font table for FB */
 	/* Quickly write string to FB */
@@ -174,8 +174,8 @@ typedef struct {
 	u_char	**linePtr;			/* Cur pointer into linebuf */
 	int	*lineSize;			/* length of line in linebuf */
 	int	(*getLine)(int);		/* Get line from user */
-	u_char	(*getNextChar)(void);	/* Get next char from linebuf */
-	u_char	(*peekNextChar)(void);	/* Peek at next char */
+	u_char	(*getNextChar)(void);		/* Get next char from linebuf */
+	u_char	(*peekNextChar)(void);		/* Peek at next char */
 	int	*fbThere;			/* =1 if frame buffer there */
 	int	(*getNum)(void);		/* Grab hex num from line */
 
@@ -183,8 +183,8 @@ typedef struct {
 	 * Print formatted output to current output sink
 	 */
 
-	int	(*printf)(char *, ...);	/* Similar to "Kernel printf" */
-	int	(*printHex)(int,int);	/* Format N digits in hex */
+	int	(*printf)(char *, ...);		/* Similar to "Kernel printf" */
+	int	(*printHex)(int,int);		/* Format N digits in hex */
 
 	/*
 	 * Led stuff
diff --git a/sys/arch/vax/include/rpb.h b/sys/arch/vax/include/rpb.h
index 5e90a6c1752..e1971e5371a 100644
--- a/sys/arch/vax/include/rpb.h
+++ b/sys/arch/vax/include/rpb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpb.h,v 1.8 2002/03/14 01:26:48 millert Exp $ */
+/*	$OpenBSD: rpb.h,v 1.9 2002/03/15 01:20:04 millert Exp $ */
 /*	$NetBSD: rpb.h,v 1.6 1998/07/01 09:37:11 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -40,7 +40,7 @@
 
 struct rpb {		/* size		description */
 	struct rpb *rpb_base;	/* 4  physical base address of block */
-	void	(*rpb_restart)/* 4  physical address of restart routine */(void);
+	void	(*rpb_restart)(void);/* 4  physical address of restart routine */
 	long	rpb_chksum;/* 4  checksum of first 31 longwords of restart */
 	long	rpb_rstflg;	/* 4  Restart in progress flag */
 	long	rpb_haltpc;	/* 4  PC at HALT/restart */
diff --git a/sys/arch/vax/mscp/mscpvar.h b/sys/arch/vax/mscp/mscpvar.h
index e51901ec482..1469dc11c78 100644
--- a/sys/arch/vax/mscp/mscpvar.h
+++ b/sys/arch/vax/mscp/mscpvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscpvar.h,v 1.4 2002/03/14 01:26:48 millert Exp $	*/
+/*	$OpenBSD: mscpvar.h,v 1.5 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: mscpvar.h,v 1.7 1999/06/06 19:16:18 ragge Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -81,23 +81,35 @@ struct mscp_xi {
 };
 
 struct	mscp_ctlr {
-	void	(*mc_ctlrdone)		/* controller operation complete */(struct device *);
-	void	(*mc_go)		/* device-specific start routine */(struct device *, struct mscp_xi *);
-	void	(*mc_saerror)		/* ctlr error handling */(struct device *, int);
+					/* controller operation complete */
+	void	(*mc_ctlrdone)(struct device *);
+					/* device-specific start routine */
+	void	(*mc_go)(struct device *, struct mscp_xi *);
+					/* ctlr error handling */
+	void	(*mc_saerror)(struct device *, int);
 };
 
 struct mscp_softc;
 
 struct	mscp_device {
-	void	(*me_dgram)	/* error datagram */(struct device *, struct mscp *, struct mscp_softc *);
-	void	(*me_iodone)	/* normal I/O is done */(struct device *, struct buf *);
-	int	(*me_online)	/* drive on line */(struct device *, struct mscp *);
-	int	(*me_gotstatus) /* got unit status */(struct device *, struct mscp *);
-	void	(*me_replace)	/* replace done */(struct device *, struct mscp *);
-	int	(*me_ioerr)	/* read or write failed */(struct device *, struct mscp *, struct buf *);
-	void	(*me_bb)	/* B_BAD io done */(struct device *, struct mscp *, struct buf *);
-	void	(*me_fillin)	/* Fill in mscp info for this drive */(struct buf *,struct mscp *);
-	void	(*me_cmddone)	/* Non-data transfer operation is done */(struct device *, struct mscp *);
+				/* error datagram */
+	void	(*me_dgram)(struct device *, struct mscp *, struct mscp_softc *);
+				/* normal I/O is done */
+	void	(*me_iodone)(struct device *, struct buf *);
+				/* drive on line */
+	int	(*me_online)(struct device *, struct mscp *);
+				/* got unit status */
+	int	(*me_gotstatus)(struct device *, struct mscp *);
+				/* replace done */
+	void	(*me_replace)(struct device *, struct mscp *);
+				/* read or write failed */
+	int	(*me_ioerr)(struct device *, struct mscp *, struct buf *);
+				/* B_BAD io done */
+	void	(*me_bb)(struct device *, struct mscp *, struct buf *);
+				/* Fill in mscp info for this drive */
+	void	(*me_fillin)(struct buf *,struct mscp *);
+				/* Non-data transfer operation is done */
+	void	(*me_cmddone)(struct device *, struct mscp *);
 };
 
 /*
diff --git a/sys/arch/vax/uba/ubavar.h b/sys/arch/vax/uba/ubavar.h
index a397a841486..9647a831952 100644
--- a/sys/arch/vax/uba/ubavar.h
+++ b/sys/arch/vax/uba/ubavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubavar.h,v 1.11 2002/03/14 01:26:48 millert Exp $	*/
+/*	$OpenBSD: ubavar.h,v 1.12 2002/03/15 01:20:04 millert Exp $	*/
 /*	$NetBSD: ubavar.h,v 1.21 1999/01/19 21:04:48 ragge Exp $	*/
 
 /*
@@ -79,7 +79,7 @@ struct	uba_softc {
 	struct	pte *uh_mr;		/* start of page map */
 	int	uh_memsize;		/* size of uba memory, pages */
 	caddr_t	uh_iopage;		/* start of uba io page */
-	void	(**uh_reset)(int);/* UBA reset function array */
+	void	(**uh_reset)(int);	/* UBA reset function array */
 	int	*uh_resarg;		/* array of ubareset args */
 	int	uh_resno;		/* Number of devices to reset */
 	short	uh_mrwant;		/* someone is waiting for map reg */