diff options
Diffstat (limited to 'sys/arch/sun3/include')
| -rw-r--r-- | sys/arch/sun3/include/autoconf.h | 12 | ||||
| -rw-r--r-- | sys/arch/sun3/include/conf.h | 4 | ||||
| -rw-r--r-- | sys/arch/sun3/include/cpu.h | 1 | ||||
| -rw-r--r-- | sys/arch/sun3/include/db_machdep.h | 7 | ||||
| -rw-r--r-- | sys/arch/sun3/include/dvma.h | 3 | ||||
| -rw-r--r-- | sys/arch/sun3/include/idprom.h | 6 | ||||
| -rw-r--r-- | sys/arch/sun3/include/isr.h | 47 | ||||
| -rw-r--r-- | sys/arch/sun3/include/machdep.h | 166 | ||||
| -rw-r--r-- | sys/arch/sun3/include/mon.h | 169 | ||||
| -rw-r--r-- | sys/arch/sun3/include/obio.h | 8 | ||||
| -rw-r--r-- | sys/arch/sun3/include/pmap.h | 4 | ||||
| -rw-r--r-- | sys/arch/sun3/include/psl.h | 4 | ||||
| -rw-r--r-- | sys/arch/sun3/include/z8530var.h | 2 |
13 files changed, 300 insertions, 133 deletions
diff --git a/sys/arch/sun3/include/autoconf.h b/sys/arch/sun3/include/autoconf.h index e1322fc8f12..bb03f2fc41f 100644 --- a/sys/arch/sun3/include/autoconf.h +++ b/sys/arch/sun3/include/autoconf.h @@ -1,3 +1,4 @@ +/* $OpenBSD: autoconf.h,v 1.7 1997/01/16 04:04:04 kstailey Exp $ */ /* $NetBSD: autoconf.h,v 1.12 1996/11/20 18:57:05 gwr Exp $ */ /*- @@ -66,3 +67,14 @@ int bus_print __P((void *, const char *)); int bus_peek __P((int, int, int)); char * bus_mapin __P((int, int, int)); +typedef int (*isr_func_t) __P((void *)); +void isr_add_custom __P((int, void *)); +void isr_add_autovect __P((isr_func_t, void *arg, int level)); +void isr_add_vectored __P((isr_func_t, void *arg, int pri, int vec)); + +void isr_soft_request __P((int level)); +void isr_soft_clear __P((int level)); + +/* Bus-error tolerant access to mapped address. */ +int peek_byte __P((caddr_t)); +int peek_word __P((caddr_t)); diff --git a/sys/arch/sun3/include/conf.h b/sys/arch/sun3/include/conf.h index b510287fa31..0e9edaf8da1 100644 --- a/sys/arch/sun3/include/conf.h +++ b/sys/arch/sun3/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.4 1997/01/07 23:36:15 kstailey Exp $ */ +/* $OpenBSD: conf.h,v 1.5 1997/01/16 04:04:05 kstailey Exp $ */ /*- * Copyright (c) 1996 Kenneth Stailey. All rights reserved. @@ -55,6 +55,8 @@ cdev_decl(fd); dev_decl(filedesc,open); +cdev_decl(idprom); + #define mmread mmrw #define mmwrite mmrw cdev_decl(mm); diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h index dfd987164cf..1a512e62670 100644 --- a/sys/arch/sun3/include/cpu.h +++ b/sys/arch/sun3/include/cpu.h @@ -111,6 +111,7 @@ extern int want_resched; /* resched() was called */ * isr_soft_request() so this scheme just multiplexes four * software interrupt `sources' on the level one handler. */ +extern void isr_soft_request __P((int level)); union sun3sir { int sir_any; char sir_which[4]; diff --git a/sys/arch/sun3/include/db_machdep.h b/sys/arch/sun3/include/db_machdep.h index 543f101428a..fcf395331a2 100644 --- a/sys/arch/sun3/include/db_machdep.h +++ b/sys/arch/sun3/include/db_machdep.h @@ -1,3 +1,4 @@ +/* $OpenBSD: db_machdep.h,v 1.4 1997/01/16 04:04:06 kstailey Exp $ */ /* $NetBSD: db_machdep.h,v 1.7 1995/02/07 04:34:45 gwr Exp $ */ #include <m68k/db_machdep.h> @@ -5,3 +6,9 @@ /* This enables some code in db_command.c */ #define DB_MACHINE_COMMANDS +void db_machine_init __P((void)); +void ddb_init __P((void)); + +/* These are in db_memrw.c */ +extern void db_read_bytes __P((vm_offset_t addr, size_t size, char *data)); +extern void db_write_bytes __P((vm_offset_t addr, size_t size, char *data)); diff --git a/sys/arch/sun3/include/dvma.h b/sys/arch/sun3/include/dvma.h index 796042aebac..9ebbdbe3bc8 100644 --- a/sys/arch/sun3/include/dvma.h +++ b/sys/arch/sun3/include/dvma.h @@ -1,3 +1,4 @@ +/* $OpenBSD: dvma.h,v 1.6 1997/01/16 04:04:06 kstailey Exp $ */ /* $NetBSD: dvma.h,v 1.4 1996/11/20 18:57:08 gwr Exp $ */ /*- @@ -75,6 +76,8 @@ #define DVMA_SPACE_START 0x0FF00000 #define DVMA_SPACE_END 0x0FFFE000 +void dvma_init __P((void)); + /* Allocate/free actual pages of DVMA space. */ caddr_t dvma_malloc(size_t bytes); void dvma_free(caddr_t addr, size_t bytes); diff --git a/sys/arch/sun3/include/idprom.h b/sys/arch/sun3/include/idprom.h index 42c30ce4ed1..50cd844a2d5 100644 --- a/sys/arch/sun3/include/idprom.h +++ b/sys/arch/sun3/include/idprom.h @@ -1,3 +1,4 @@ +/* $OpenBSD: idprom.h,v 1.5 1997/01/16 04:04:07 kstailey Exp $ */ /* $NetBSD: idprom.h,v 1.12 1996/11/20 18:57:10 gwr Exp $ */ /*- @@ -54,7 +55,10 @@ struct idprom { #define IDPROM_SIZE (sizeof(struct idprom)) #ifdef _KERNEL + extern struct idprom identity_prom; -int idprom_init(); + +int idprom_init __P((void)); void idprom_etheraddr __P((u_char *)); + #endif diff --git a/sys/arch/sun3/include/isr.h b/sys/arch/sun3/include/isr.h deleted file mode 100644 index 228708ea082..00000000000 --- a/sys/arch/sun3/include/isr.h +++ /dev/null @@ -1,47 +0,0 @@ -/* $NetBSD: isr.h,v 1.10 1996/11/20 18:57:11 gwr Exp $ */ - -/*- - * Copyright (c) 1996 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Adam Glass and Gordon W. Ross. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -void isr_init __P((void)); -void isr_config __P((void)); - -void isr_add_custom __P((int, void (*handler)())); -void isr_add_autovect __P((int (*handler)(), void *arg, int level)); -void isr_add_vectored __P((int (*handler)(), void *arg, int pri, int vec)); - -void isr_soft_request __P((int level)); -void isr_soft_clear __P((int level)); diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h new file mode 100644 index 00000000000..4519392539f --- /dev/null +++ b/sys/arch/sun3/include/machdep.h @@ -0,0 +1,166 @@ +/* $OpenBSD: machdep.h,v 1.1 1997/01/16 04:04:08 kstailey Exp $ */ +/* + * Copyright (c) 1994 Gordon W. Ross + * Copyright (c) 1993 Adam Glass + * Copyright (c) 1988 University of Utah. + * Copyright (c) 1982, 1990 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * the Systems Programming Group of the University of Utah Computer + * Science Department. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: Utah Hdr: cpu.h 1.16 91/03/25 + * from: @(#)cpu.h 7.7 (Berkeley) 6/27/91 + * cpu.h,v 1.2 1993/05/22 07:58:17 cgd Exp + */ + +#ifdef _KERNEL + +/* + * Internal definitions unique to sun3/68k cpu support. + * These are the "private" declarations - those needed + * only here in machine-independent code. The "public" + * definitions are in cpu.h (used by common code). + */ + +/* 680X0 function codes */ +#define FC_USERD 1 /* user data space */ +#define FC_USERP 2 /* user program space */ +#define FC_CONTROL 3 /* sun control space */ +#define FC_SUPERD 5 /* supervisor data space */ +#define FC_SUPERP 6 /* supervisor program space */ +#define FC_CPU 7 /* CPU space */ + +/* fields in the 68020 cache control register */ +#define IC_ENABLE 0x0001 /* enable instruction cache */ +#define IC_FREEZE 0x0002 /* freeze instruction cache */ +#define IC_CE 0x0004 /* clear instruction cache entry */ +#define IC_CLR 0x0008 /* clear entire instruction cache */ + +#define IC_CLEAR (IC_CLR|IC_ENABLE) + + +/* Prototypes... */ + +struct frame; +struct fpframe; +struct pcb; +struct proc; +struct reg; +struct trapframe; +struct pmap; + +extern int cache_size; +extern int cold; +extern int fpu_type; + +extern label_t *nofault; + +extern vm_offset_t vmmap; /* XXX - See mem.c */ + +/* Kernel virtual address space available: */ +extern vm_offset_t virtual_avail, virtual_end; +/* Physical address space available: */ +extern vm_offset_t avail_start, avail_end; +/* The "hole" (used to skip the Sun3/50 video RAM) */ +extern vm_offset_t hole_start, hole_size; + +void ICIA __P((void)); +void DCIA __P((void)); +void DCIU __P((void)); + +void cache_enable __P((void)); +void cache_flush_page(vm_offset_t pgva); +void cache_flush_segment(vm_offset_t sgva); +void cache_flush_context(void); + +int cachectl __P((int req, caddr_t addr, int len)); + +void child_return __P((struct proc *)); + +void configure __P((void)); +void cninit __P((void)); + +void dumpconf __P((void)); +void dumpsys __P((void)); + +void fb_unblank __P((void)); + +int fpu_emulate __P((struct frame *, struct fpframe *)); + +int getdfc __P((void)); +int getsfc __P((void)); + +void** getvbr __P((void)); + +vm_offset_t high_segment_alloc __P((int npages)); + +void initfpu __P((void)); + +void intreg_init __P((void)); + +void isr_init __P((void)); +void isr_config __P((void)); + +void m68881_save __P((struct fpframe *)); +void m68881_restore __P((struct fpframe *)); + +void netintr __P((void)); + +void proc_do_uret __P((void)); +void proc_trampoline __P((void)); + +void pmap_bootstrap __P((void)); +int pmap_fault_reload __P((struct pmap *, vm_offset_t, int)); +void pmap_get_ksegmap __P((u_char *)); +void pmap_get_pagemap __P((int *pt, int off)); + +int reboot2 __P((int, char *)); + +void regdump __P((struct frame *, int)); + +void savectx __P((struct pcb *)); + +void setvbr __P((void **)); + +void sun3_mon_abort __P((void)); +void sun3_mon_halt __P((void)); +void sun3_mon_reboot __P((char *)); +void sun3_pmeg_init __P((void)); +void sun3_reserve_pmeg __P((int pmeg_num)); + +void swapconf __P((void)); +void swapgeneric __P((void)); + +void switch_exit __P((struct proc *)); + +#endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h index 447e1629524..d142f001e57 100644 --- a/sys/arch/sun3/include/mon.h +++ b/sys/arch/sun3/include/mon.h @@ -1,3 +1,4 @@ +/* $OpenBSD: mon.h,v 1.5 1997/01/16 04:04:08 kstailey Exp $ */ /* $NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $ */ /*- @@ -103,41 +104,41 @@ typedef struct bootparam { * translate these structs into Sprite format. */ typedef struct { - char *initSp; /* Initial system stack ptr - * for hardware */ - int (*startMon)(); /* Initial PC for hardware */ + char *initSp; /* Initial system stack ptr + * for hardware */ + int (*startMon)__P((void)); /* Initial PC for hardware */ - int *diagberr; /* Bus err handler for diags */ + int *diagberr; /* Bus err handler for diags */ - /* + /* * Monitor and hardware revision and identification */ - struct bootparam **bootParam; /* Info for bootstrapped pgm */ - unsigned *memorySize; /* Usable memory in bytes */ + struct bootparam **bootParam; /* Info for bootstrapped pgm */ + u_int *memorySize; /* Usable memory in bytes */ - /* - * Single-character input and output + /* + * Single-character input and output */ - unsigned char (*getChar)(); /* Get char from input source */ - int (*putChar)(); /* Put char to output sink */ - int (*mayGet)(); /* Maybe get char, or -1 */ - int (*mayPut)(); /* Maybe put char, or -1 */ - unsigned char *echo; /* Should getchar echo? */ - unsigned char *inSource; /* Input source selector */ - unsigned char *outSink; /* Output sink selector */ + u_char (*getChar)__P((void)); /* Get char from input source */ + int (*putChar)__P((int)); /* Put char to output sink */ + int (*mayGet)__P((void)); /* Maybe get char, or -1 */ + int (*mayPut)__P((int)); /* Maybe put char, or -1 */ + u_char *echo; /* Should getchar echo? */ + u_char *inSource; /* Input source selector */ + u_char *outSink; /* Output sink selector */ - /* - * Keyboard input (scanned by monitor nmi routine) + /* + * Keyboard input (scanned by monitor nmi routine) */ - int (*getKey)(); /* Get next key if one exists */ - int (*initGetKey)(); /* Initialize get key */ - unsigned int *translation; /* Kbd translation selector - (see keyboard.h in sun + int (*getKey)__P((void)); /* Get next key if one exists */ + int (*initGetKey)__P((void*)); /* Initialize get key */ + u_int *translation; /* Kbd translation selector + (see keyboard.h in sun monitor code) */ - unsigned char *keyBid; /* Keyboard ID byte */ + u_char *keyBid; /* Keyboard ID byte */ int *screen_x; /* V2: Screen x pos (R/O) */ int *screen_y; /* V2: Screen y pos (R/O) */ struct keybuf *keyBuf; /* Up/down keycode buffer */ @@ -146,86 +147,88 @@ typedef struct { * Monitor revision level. */ - char *monId; + char *monId; - /* - * Frame buffer output and terminal emulation + /* + * Frame buffer output and terminal emulation */ - int (*fbWriteChar)(); /* Write a character to FB */ - int *fbAddr; /* Address of frame buffer */ - char **font; /* Font table for FB */ - int (*fbWriteStr)(); /* Quickly write string to FB */ + int (*fbWriteChar)__P((int)); /* Write a character to FB */ + int *fbAddr; /* Address of frame buffer */ + char **font; /* Font table for FB */ + /* Quickly write string to FB */ + int (*fbWriteStr)__P((char *buf, int len)); - /* - * Reboot interface routine -- resets and reboots system. No return. + /* + * Reboot interface routine -- resets and reboots system. No return. + * XXX should this be declared volatile? */ - int (*reBoot)(); /* e.g. reBoot("xy()vmunix") */ + int (*reBoot)__P((char *)); /* e.g. reBoot("sd()bsd") */ - /* - * Line input and parsing + /* + * Line input and parsing */ - unsigned char *lineBuf; /* The line input buffer */ - unsigned char **linePtr; /* Cur pointer into linebuf */ - int *lineSize; /* length of line in linebuf */ - int (*getLine)(); /* Get line from user */ - unsigned char (*getNextChar)(); /* Get next char from linebuf */ - unsigned char (*peekNextChar)(); /* Peek at next char */ - int *fbThere; /* =1 if frame buffer there */ - int (*getNum)(); /* Grab hex num from line */ - - /* - * Print formatted output to current output sink + u_char *lineBuf; /* The line input buffer */ + u_char **linePtr; /* Cur pointer into linebuf */ + int *lineSize; /* length of line in linebuf */ + int (*getLine)__P((int)); /* Get line from user */ + u_char (*getNextChar)__P((void)); /* Get next char from linebuf */ + u_char (*peekNextChar)__P((void)); /* Peek at next char */ + int *fbThere; /* =1 if frame buffer there */ + int (*getNum)__P((void)); /* Grab hex num from line */ + + /* + * Print formatted output to current output sink */ - int (*printf)(); /* Similar to "Kernel printf" */ - int (*printHex)(); /* Format N digits in hex */ + int (*printf)__P((char *, ...)); /* Similar to "Kernel printf" */ + int (*printHex)__P((int,int)); /* Format N digits in hex */ /* - * Led stuff + * Led stuff */ - unsigned char *leds; /* RAM copy of LED register */ - int (*setLeds)(); /* Sets LED's and RAM copy */ + u_char *leds; /* RAM copy of LED register */ + int (*setLeds)__P((int)); /* Sets LED's and RAM copy */ - /* + /* * Non-maskable interrupt (nmi) information - */ + */ - int (*nmiAddr)(); /* Addr for level 7 vector */ - int (*abortEntry)(); /* Entry for keyboard abort */ - int *nmiClock; /* Counts up in msec */ + int (*nmiAddr)__P((void*)); /* Addr for level 7 vector */ + int (*abortEntry)__P((void*)); /* Entry for keyboard abort */ + int *nmiClock; /* Counts up in msec */ /* - * Frame buffer type: see <sun/fbio.h> + * Frame buffer type: see <machine/fbio.h> */ - int *fbType; + int *fbType; - /* - * Assorted other things + /* + * Assorted other things */ - unsigned romvecVersion; /* Version # of Romvec */ + u_int romvecVersion; /* Version # of Romvec */ struct globram *globRam; /* monitor global variables */ caddr_t kbdZscc; /* Addr of keyboard in use */ - int *keyrInit; /* ms before kbd repeat */ - unsigned char *keyrTick; /* ms between repetitions */ - unsigned *memoryAvail; /* V1: Main mem usable size */ - long *resetAddr; /* where to jump on a reset */ - long *resetMap; /* pgmap entry for resetaddr */ + int *keyrInit; /* ms before kbd repeat */ + u_char *keyrTick; /* ms between repetitions */ + u_int *memoryAvail; /* V1: Main mem usable size */ + long *resetAddr; /* where to jump on a reset */ + long *resetMap; /* pgmap entry for resetaddr */ /* Really struct pgmapent * */ - int (*exitToMon)(); /* Exit from user program */ - unsigned char **memorybitmap; /* V1: &{0 or &bits} */ - void (*setcxsegmap)(); /* Set seg in any context */ - void (**vector_cmd)(); /* V2: Handler for 'v' cmd */ - int dummy1z; - int dummy2z; - int dummy3z; - int dummy4z; + int (*exitToMon)__P((void)); /* Exit from user program */ + u_char **memorybitmap; /* V1: &{0 or &bits} */ + void (*setcxsegmap)__P((int,int,int)); /* Set seg in any context */ + void (**vector_cmd)__P((int, char*)); /* V2: Handler for 'v' cmd */ + int dummy1z; + int dummy2z; + int dummy3z; + int dummy4z; } MachMonRomVector; /* @@ -239,13 +242,13 @@ typedef struct { * putChar -- Write the given character to the output source. * * void putChar(ch) - * char ch; + * char ch; * - * mayGet -- Maybe get a character from the current input source. Return -1 + * mayGet -- Maybe get a character from the current input source. Return -1 * if don't return a character. * * int mayGet() - * + * * mayPut -- Maybe put a character to the current output source. Return -1 * if no character output. * @@ -257,7 +260,7 @@ typedef struct { * NOKEY (if no key has been hit). * * int getKey() - * + * * initGetKey -- Initialize things for get key. * * void initGetKey() @@ -327,9 +330,9 @@ typedef struct { /* * MONSTART and MONEND denote the range of the damn monitor. - * + * * supposedly you can steal pmegs within this range that do not contain - * valid pages. + * valid pages. */ #define MONSTART 0x0FE00000 #define MONEND 0x0FF00000 @@ -346,8 +349,8 @@ typedef struct { * */ -#define MONSHORTPAGE 0x0FFFE000 -#define MONSHORTSEG 0x0FFE0000 +#define MONSHORTPAGE 0x0FFFE000 +#define MONSHORTSEG 0x0FFE0000 #endif /* _MACHMON */ -#endif /* MACHINE_MON_H */ +#endif /* MACHINE_MON_H */ diff --git a/sys/arch/sun3/include/obio.h b/sys/arch/sun3/include/obio.h index e687a5a4206..fad8ddcb560 100644 --- a/sys/arch/sun3/include/obio.h +++ b/sys/arch/sun3/include/obio.h @@ -1,3 +1,4 @@ +/* $OpenBSD: obio.h,v 1.6 1997/01/16 04:04:09 kstailey Exp $ */ /* $NetBSD: obio.h,v 1.16 1996/11/20 18:57:14 gwr Exp $ */ /*- @@ -82,4 +83,11 @@ caddr_t obio_alloc __P((int, int)); caddr_t obio_vm_alloc __P((int)); caddr_t obio_find_mapping __P((int pa, int size)); +/* routines called during earily startup */ +void obio_init __P((void)); +void zs_init __P((void)); +void eeprom_init __P((void)); +void intreg_init __P((void)); +void clock_init __P((void)); + #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h index 6f9c9ecb03c..c05f69142e3 100644 --- a/sys/arch/sun3/include/pmap.h +++ b/sys/arch/sun3/include/pmap.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pmap.h,v 1.6 1997/01/16 04:04:09 kstailey Exp $ */ /* $NetBSD: pmap.h,v 1.15 1996/11/20 18:57:16 gwr Exp $ */ /*- @@ -56,6 +57,9 @@ typedef struct pmap *pmap_t; #ifdef _KERNEL struct pmap kernel_pmap_store; +struct pcb; +void pmap_activate __P((pmap_t pmap, struct pcb *pcbp)); +void pmap_deactivate __P((pmap_t pmap, struct pcb *pcbp)); #define pmap_kernel() (&kernel_pmap_store) diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h index 4fe2914b7d0..d3daa930e6c 100644 --- a/sys/arch/sun3/include/psl.h +++ b/sys/arch/sun3/include/psl.h @@ -1,3 +1,4 @@ +/* $OpenBSD: psl.h,v 1.6 1997/01/16 04:04:10 kstailey Exp $ */ /* $NetBSD: psl.h,v 1.10 1996/11/20 18:57:17 gwr Exp $ */ /*- @@ -108,5 +109,8 @@ extern __inline__ int _spl(int new) #define splhigh() spl7() #define splsched() spl7() +/* Get current sr value (debug, etc.) */ +extern int getsr __P((void)); + #endif /* KERNEL && !_LOCORE */ #endif /* PSL_C */ diff --git a/sys/arch/sun3/include/z8530var.h b/sys/arch/sun3/include/z8530var.h index 1164ad3f7f7..87729496caf 100644 --- a/sys/arch/sun3/include/z8530var.h +++ b/sys/arch/sun3/include/z8530var.h @@ -71,7 +71,7 @@ void zs_write_data __P((struct zs_chanstate *cs, u_char val)); void zsc_req_softint __P((struct zsc_softc *zsc)); /* Handle user request to enter kernel debugger. */ -void zs_abort(); +void zs_abort __P((void)); /* * Some warts needed by z8530tty.c - |