diff options
Diffstat (limited to 'sys/arch/sparc')
| -rw-r--r-- | sys/arch/sparc/include/autoconf.h | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/include/oldmon.h | 24 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/cache.h | 26 |
3 files changed, 28 insertions, 27 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; 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); |