summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/include
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-03-15 01:20:05 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-03-15 01:20:05 +0000
commit6fcfd0d23dbe0848151ef07c42448e40fc6e8d9d (patch)
tree2630a112207545f97f9229e94f6bc39db1236155 /sys/arch/sparc/include
parent410da4ddde062db4bb7b750a01b474d3cc2438f7 (diff)
Cosmetic changes only, primarily making comments line up nicely after the
__P removal.
Diffstat (limited to 'sys/arch/sparc/include')
-rw-r--r--sys/arch/sparc/include/autoconf.h5
-rw-r--r--sys/arch/sparc/include/oldmon.h24
2 files changed, 15 insertions, 14 deletions
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;