diff options
-rw-r--r-- | sys/arch/mac68k/include/ansi.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/asm.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/autoconf.h | 9 | ||||
-rw-r--r-- | sys/arch/mac68k/include/db_machdep.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/grfioctl.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/ieeefp.h | 8 | ||||
-rw-r--r-- | sys/arch/mac68k/include/keyboard.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/pio.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/proc.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/ptrace.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/scsi_5380.h | 6 | ||||
-rw-r--r-- | sys/arch/mac68k/include/setjmp.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/signal.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/stdarg.h | 8 | ||||
-rw-r--r-- | sys/arch/mac68k/include/trap.h | 7 | ||||
-rw-r--r-- | sys/arch/mac68k/include/varargs.h | 8 | ||||
-rw-r--r-- | sys/arch/mac68k/include/viareg.h | 30 | ||||
-rw-r--r-- | sys/arch/mac68k/include/vmparam.h | 6 | ||||
-rw-r--r-- | sys/arch/mac68k/include/z8530var.h | 15 |
19 files changed, 131 insertions, 36 deletions
diff --git a/sys/arch/mac68k/include/ansi.h b/sys/arch/mac68k/include/ansi.h index cf477ea2591..c5044c79b50 100644 --- a/sys/arch/mac68k/include/ansi.h +++ b/sys/arch/mac68k/include/ansi.h @@ -1,4 +1,9 @@ -/* $OpenBSD: ansi.h,v 1.2 1996/05/26 18:35:43 briggs Exp $ */ +/* $OpenBSD: ansi.h,v 1.3 1997/11/30 06:10:28 gene Exp $ */ /* $NetBSD: ansi.h,v 1.4 1994/10/26 08:46:24 cgd Exp $ */ +#ifndef _MAC68K_ANSI_H_ +#define _MAC68K_ANSI_H_ + #include <m68k/ansi.h> + +#endif diff --git a/sys/arch/mac68k/include/asm.h b/sys/arch/mac68k/include/asm.h index 95e715f052f..e8e1274d44e 100644 --- a/sys/arch/mac68k/include/asm.h +++ b/sys/arch/mac68k/include/asm.h @@ -1,4 +1,9 @@ -/* $OpenBSD: asm.h,v 1.2 1996/05/26 18:35:44 briggs Exp $ */ +/* $OpenBSD: asm.h,v 1.3 1997/11/30 06:10:29 gene Exp $ */ /* $NetBSD: asm.h,v 1.2 1994/10/26 08:46:25 cgd Exp $ */ +#ifndef _MAC68K_ASM_H_ +#define _MAC68K_ASM_H_ + #include <m68k/asm.h> + +#endif diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h index 00413f0d62f..ba1fd0f7bff 100644 --- a/sys/arch/mac68k/include/autoconf.h +++ b/sys/arch/mac68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.5 1997/04/06 02:59:54 briggs Exp $ */ +/* $OpenBSD: autoconf.h,v 1.6 1997/11/30 06:10:29 gene Exp $ */ /* $NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $ */ /* @@ -33,11 +33,15 @@ * SUCH DAMAGE. */ +#ifndef _MAC68K_AUTOCONF_H_ +#define _MAC68K_AUTOCONF_H_ + /* * Autoconfiguration information. * From sun3 port--adapted for mac68k platform by Allen Briggs. */ +#ifdef _KERNEL /* autoconf.c */ void setconf __P((void)); void configure __P((void)); @@ -63,3 +67,6 @@ void startrtclock __P((void)); /* macrom.c */ void mrg_init __P((void)); +#endif /* _KERNEL */ + +#endif /* _MAC68K_AUTOCONF_H_ */ diff --git a/sys/arch/mac68k/include/db_machdep.h b/sys/arch/mac68k/include/db_machdep.h index 91012c67821..1b99e8c7ea7 100644 --- a/sys/arch/mac68k/include/db_machdep.h +++ b/sys/arch/mac68k/include/db_machdep.h @@ -1,4 +1,9 @@ -/* $OpenBSD: db_machdep.h,v 1.2 1996/05/26 18:35:47 briggs Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.3 1997/11/30 06:10:30 gene Exp $ */ /* $NetBSD: db_machdep.h,v 1.3 1994/10/26 08:46:27 cgd Exp $ */ +#ifndef _MAC68K_DB_MACHDEP_H_ +#define _MAC68K_DB_MACHDEP_H_ + #include <m68k/db_machdep.h> + +#endif /* _MAC68K_DB_MACHDEP_H_ */ diff --git a/sys/arch/mac68k/include/grfioctl.h b/sys/arch/mac68k/include/grfioctl.h index 78a84410203..3ff5713810e 100644 --- a/sys/arch/mac68k/include/grfioctl.h +++ b/sys/arch/mac68k/include/grfioctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfioctl.h,v 1.2 1996/05/26 18:35:51 briggs Exp $ */ +/* $OpenBSD: grfioctl.h,v 1.3 1997/11/30 06:10:30 gene Exp $ */ /* $NetBSD: grfioctl.h,v 1.5 1995/07/02 05:26:45 briggs Exp $ */ /* @@ -43,6 +43,9 @@ * @(#)grfioctl.h 7.2 (Berkeley) 11/4/90 */ +#ifndef _MAC68K_GRFIOCTL_H_ +#define _MAC68K_GRFIOCTL_H_ + struct grfmode { u_int8_t mode_id; /* Identifier for mode */ caddr_t fbbase; /* Base of page of frame buffer */ @@ -98,3 +101,5 @@ struct grfinfo { int gd_dheight; /* displayed part height */ int gd_pad[6]; /* for future expansion */ }; + +#endif /* _MAC68K_GRFIOCTL_H_ */ diff --git a/sys/arch/mac68k/include/ieeefp.h b/sys/arch/mac68k/include/ieeefp.h index c5d44845690..c4872b03a52 100644 --- a/sys/arch/mac68k/include/ieeefp.h +++ b/sys/arch/mac68k/include/ieeefp.h @@ -1,5 +1,9 @@ -/* $OpenBSD: ieeefp.h,v 1.2 1996/05/26 18:35:52 briggs Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.3 1997/11/30 06:10:31 gene Exp $ */ /* $NetBSD: ieeefp.h,v 1.2 1995/04/16 16:47:07 jtc Exp $ */ -/* Just use the common m68k definition */ +#ifndef _MAC68K_IEEEFP_H_ +#define _MAC68K_IEEEFP_H_ + #include <m68k/ieeefp.h> + +#endif /* _MAC68K_IEEEFP_H_ */ diff --git a/sys/arch/mac68k/include/keyboard.h b/sys/arch/mac68k/include/keyboard.h index e6a3940bc4c..bf3e22e8ae8 100644 --- a/sys/arch/mac68k/include/keyboard.h +++ b/sys/arch/mac68k/include/keyboard.h @@ -1,4 +1,4 @@ -/* $OpenBSD: keyboard.h,v 1.4 1997/04/09 14:34:29 briggs Exp $ */ +/* $OpenBSD: keyboard.h,v 1.5 1997/11/30 06:10:31 gene Exp $ */ /* $NetBSD: keyboard.h,v 1.5 1996/02/23 05:43:48 scottr Exp $ */ /*- @@ -34,6 +34,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _MAC68K_KEYBOARD_H_ +#define _MAC68K_KEYBOARD_H_ + #define ADBK_LEFT 0x3B #define ADBK_RIGHT 0x3C #define ADBK_UP 0x3E @@ -207,3 +210,5 @@ unsigned char keyboard[128][3] = { { /* 0x7F, */ 0x00, 0x00, 0x00 } }; #endif /* KEYBOARD_ARRAY */ + +#endif /* _MAC68K_KEYBOARD_H_ */ diff --git a/sys/arch/mac68k/include/pio.h b/sys/arch/mac68k/include/pio.h index 033b7baa8c6..88fef151f5f 100644 --- a/sys/arch/mac68k/include/pio.h +++ b/sys/arch/mac68k/include/pio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pio.h,v 1.2 1996/05/26 18:35:57 briggs Exp $ */ +/* $OpenBSD: pio.h,v 1.3 1997/11/30 06:10:32 gene Exp $ */ /* $NetBSD: pio.h,v 1.3 1994/10/26 08:46:38 cgd Exp $ */ /* @@ -8,6 +8,9 @@ * the terms and conditions for use and redistribution. */ +#ifndef _MAC68K_PIO_H_ +#define _MAC68K_PIO_H_ + #define inl(y) \ ({ unsigned long _tmp__; \ asm volatile("inl %1, %0" : "=a" (_tmp__) : "d" ((unsigned short)(y))); \ @@ -34,3 +37,5 @@ #define outb(x, y) \ { asm volatile("outb %0, %1" : : "a" ((unsigned char)(y)) , "d" ((unsigned short)(x))); } + +#endif /* _MAC68K_PIO_H_ */ diff --git a/sys/arch/mac68k/include/proc.h b/sys/arch/mac68k/include/proc.h index 88eea6c609b..d6b099d1ecf 100644 --- a/sys/arch/mac68k/include/proc.h +++ b/sys/arch/mac68k/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.3 1996/05/26 18:35:59 briggs Exp $ */ +/* $OpenBSD: proc.h,v 1.4 1997/11/30 06:10:33 gene Exp $ */ /* $NetBSD: proc.h,v 1.5 1994/10/26 08:46:40 cgd Exp $ */ /* @@ -39,6 +39,9 @@ /* * Machine-dependent part of the proc structure for hp300. */ +#ifndef _MAC68K_PROC_H_ +#define _MAC68K_PROC_H_ + struct mdproc { int md_flags; /* machine-dependent flags */ int *md_regs; /* registers on current frame */ @@ -51,3 +54,5 @@ struct mdproc { ERESTART. */ #define MDP_UNCACHE_WX 0x0004 /* The process might modify code, so don't cache writeable executable pages. */ + +#endif /* _MAC68K_PROC_H_ */ diff --git a/sys/arch/mac68k/include/ptrace.h b/sys/arch/mac68k/include/ptrace.h index a8d63f1c601..a9568f813a9 100644 --- a/sys/arch/mac68k/include/ptrace.h +++ b/sys/arch/mac68k/include/ptrace.h @@ -1,4 +1,9 @@ -/* $OpenBSD: ptrace.h,v 1.2 1996/05/26 18:36:01 briggs Exp $ */ +/* $OpenBSD: ptrace.h,v 1.3 1997/11/30 06:10:33 gene Exp $ */ /* $NetBSD: ptrace.h,v 1.2 1994/10/26 08:46:43 cgd Exp $ */ +#ifndef _MAC68K_PTRACE_H_ +#define _MAC68K_PTRACE_H_ + #include <m68k/ptrace.h> + +#endif diff --git a/sys/arch/mac68k/include/scsi_5380.h b/sys/arch/mac68k/include/scsi_5380.h index efce3b0d5d3..2a180f31d7f 100644 --- a/sys/arch/mac68k/include/scsi_5380.h +++ b/sys/arch/mac68k/include/scsi_5380.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_5380.h,v 1.2 1996/05/26 18:36:04 briggs Exp $ */ +/* $OpenBSD: scsi_5380.h,v 1.3 1997/11/30 06:10:34 gene Exp $ */ /* $NetBSD: scsi_5380.h,v 1.3 1994/10/26 08:46:46 cgd Exp $ */ /* @@ -34,6 +34,9 @@ * Defines for the NCR 5380 (SCSI chip), aka Am5380 */ +#ifndef _MAC68K_SCSI5380_H_ +#define _MAC68K_SCSI5380_H_ + /* * Register map */ @@ -141,3 +144,4 @@ typedef struct { #define SCI_CSR_DREQ 0x40 /* r: DMA request */ #define SCI_CSR_DONE 0x80 /* r: DMA count is zero */ +#endif /* _MAC68K_SCSI5380_H_ */ diff --git a/sys/arch/mac68k/include/setjmp.h b/sys/arch/mac68k/include/setjmp.h index 6bd162d3b7c..7723d37167d 100644 --- a/sys/arch/mac68k/include/setjmp.h +++ b/sys/arch/mac68k/include/setjmp.h @@ -1,4 +1,9 @@ -/* $OpenBSD: setjmp.h,v 1.2 1996/05/26 18:36:04 briggs Exp $ */ +/* $OpenBSD: setjmp.h,v 1.3 1997/11/30 06:10:34 gene Exp $ */ /* $NetBSD: setjmp.h,v 1.1 1994/12/20 10:36:57 cgd Exp $ */ +#ifndef _MAC68K_SETJMP_H_ +#define _MAC68K_SETJMP_H_ + #include <m68k/setjmp.h> + +#endif diff --git a/sys/arch/mac68k/include/signal.h b/sys/arch/mac68k/include/signal.h index 645ba2d8fd3..de8f84dbf23 100644 --- a/sys/arch/mac68k/include/signal.h +++ b/sys/arch/mac68k/include/signal.h @@ -1,4 +1,9 @@ -/* $OpenBSD: signal.h,v 1.2 1996/05/26 18:36:06 briggs Exp $ */ +/* $OpenBSD: signal.h,v 1.3 1997/11/30 06:10:35 gene Exp $ */ /* $NetBSD: signal.h,v 1.3 1994/10/26 08:46:47 cgd Exp $ */ +#ifndef _MAC68K_SIGNAL_H_ +#define _MAC68K_SIGNAL_H_ + #include <m68k/signal.h> + +#endif diff --git a/sys/arch/mac68k/include/stdarg.h b/sys/arch/mac68k/include/stdarg.h index 400cdda0124..1343263b0ab 100644 --- a/sys/arch/mac68k/include/stdarg.h +++ b/sys/arch/mac68k/include/stdarg.h @@ -1,5 +1,9 @@ -/* $OpenBSD: stdarg.h,v 1.2 1996/05/26 18:36:07 briggs Exp $ */ +/* $OpenBSD: stdarg.h,v 1.3 1997/11/30 06:10:35 gene Exp $ */ /* $NetBSD: stdarg.h,v 1.5 1994/10/26 08:46:48 cgd Exp $ */ -/* Just use the common m68k definition */ +#ifndef _MAC68K_STDARG_H_ +#define _MAC68K_STDARG_H_ + #include <m68k/stdarg.h> + +#endif diff --git a/sys/arch/mac68k/include/trap.h b/sys/arch/mac68k/include/trap.h index 3044085f211..e817d72270e 100644 --- a/sys/arch/mac68k/include/trap.h +++ b/sys/arch/mac68k/include/trap.h @@ -1,4 +1,9 @@ -/* $OpenBSD: trap.h,v 1.2 1996/05/26 18:36:07 briggs Exp $ */ +/* $OpenBSD: trap.h,v 1.3 1997/11/30 06:10:36 gene Exp $ */ /* $NetBSD: trap.h,v 1.5 1994/10/26 08:46:49 cgd Exp $ */ +#ifndef _MAC68K_TRAP_H_ +#define _MAC68K_TRAP_H_ + #include <m68k/trap.h> + +#endif diff --git a/sys/arch/mac68k/include/varargs.h b/sys/arch/mac68k/include/varargs.h index e9219c1e24e..5b09d808011 100644 --- a/sys/arch/mac68k/include/varargs.h +++ b/sys/arch/mac68k/include/varargs.h @@ -1,5 +1,9 @@ -/* $OpenBSD: varargs.h,v 1.2 1996/05/26 18:36:09 briggs Exp $ */ +/* $OpenBSD: varargs.h,v 1.3 1997/11/30 06:10:36 gene Exp $ */ /* $NetBSD: varargs.h,v 1.2 1994/10/26 08:46:51 cgd Exp $ */ -/* Just use the common m68k definition */ +#ifndef _MAC68K_VARARGS_H_ +#define _MAC68K_VARARGS_H_ + #include <m68k/varargs.h> + +#endif diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h index fbfc255854c..0939ec0c55b 100644 --- a/sys/arch/mac68k/include/viareg.h +++ b/sys/arch/mac68k/include/viareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viareg.h,v 1.6 1997/03/08 16:17:01 briggs Exp $ */ +/* $OpenBSD: viareg.h,v 1.7 1997/11/30 06:10:37 gene Exp $ */ /* $NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $ */ /*- @@ -34,16 +34,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -/* - - Prototype VIA control definitions - - 06/04/92,22:33:57 BG Let's see what I can do. - -*/ +/* + * Prototype VIA control definitions + */ +#ifndef _MAC68K_VIAREG_H_ +#define _MAC68K_VIAREG_H_ - /* VIA1 data register A */ +/* VIA1 data register A */ #define DA1I_vSCCWrReq 0x80 #define DA1O_vPage2 0x40 #define DA1I_CPU_ID1 0x40 @@ -54,7 +52,7 @@ #define DA1O_RESERVED1 0x02 #define DA1O_RESERVED0 0x01 - /* VIA1 data register B */ +/* VIA1 data register B */ #define DB1I_Par_Err 0x80 #define DB1O_vSndEnb 0x80 #define DB1O_Par_Enb 0x40 @@ -66,7 +64,7 @@ #define DB1O_rTCData 0x01 #define DB1I_rTCData 0x01 - /* VIA2 data register A */ +/* VIA2 data register A */ #define DA2O_v2Ram1 0x80 #define DA2O_v2Ram0 0x40 #define DA2I_v2IRQ0 0x40 @@ -77,7 +75,7 @@ #define DA2I_v2IRQA 0x02 #define DA2I_v2IRQ9 0x01 - /* VIA2 data register B */ +/* VIA2 data register B */ #define DB2O_v2VBL 0x80 #define DB2O_Par_Test 0x80 #define DB2I_v2SNDEXT 0x40 @@ -167,7 +165,7 @@ extern int VIA2; #define vIFR 0x1a00 /* interrupt flag register */ #define vIER 0x1c00 /* interrupt enable register */ - /* RBV interface registers */ +/* RBV interface registers */ #define rBufB 0 /* register B */ #define rBufA 2 /* register A */ #define rIFR 0x3 /* interrupt flag register (writes?) */ @@ -175,7 +173,7 @@ extern int VIA2; #define rMonitor 0x10 /* Monitor type */ #define rSlotInt 0x12 /* Slot interrupt */ - /* RBV monitor type flags and masks */ +/* RBV monitor type flags and masks */ #define RBVDepthMask 0x07 /* depth in bits */ #define RBVMonitorMask 0x38 /* Type numbers */ #define RBVOff 0x40 /* monitor turn off */ @@ -191,6 +189,7 @@ extern int VIA2; #define vDirA_ADBState 0x30 +#ifdef _KERNEL void VIA_initialize __P((void)); int rbv_vidstatus __P((void)); void via_shutdown __P((void)); @@ -202,3 +201,6 @@ void via2_register_irq __P((int, void (*)(void *), void *)); extern void (*via1itab[7]) __P((void *)); extern void (*via2itab[7]) __P((void *)); +#endif /* _KERNEL */ + +#endif /* _MAC68K_VIAREG_H_ */ diff --git a/sys/arch/mac68k/include/vmparam.h b/sys/arch/mac68k/include/vmparam.h index 7975e2e9001..5f0d3e75d64 100644 --- a/sys/arch/mac68k/include/vmparam.h +++ b/sys/arch/mac68k/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.3 1997/01/24 01:35:42 briggs Exp $ */ +/* $OpenBSD: vmparam.h,v 1.4 1997/11/30 06:10:37 gene Exp $ */ /* $NetBSD: vmparam.h,v 1.8 1996/11/15 14:21:00 briggs Exp $ */ /* @@ -80,6 +80,8 @@ /* * Machine dependent constants for mac68k -- mostly derived from hp300. */ +#ifndef _MAC68K_VMPARAM_H_ +#define _MAC68K_VMPARAM_H_ /* * USRTEXT is the start of the user text/data space, while USRSTACK @@ -274,3 +276,5 @@ /* pcb base */ #define pcbb(p) ((u_int)(p)->p_addr) + +#endif /* _MAC68K_VMPARAM_H_ */ diff --git a/sys/arch/mac68k/include/z8530var.h b/sys/arch/mac68k/include/z8530var.h index f88b31f9c39..adbd0511da3 100644 --- a/sys/arch/mac68k/include/z8530var.h +++ b/sys/arch/mac68k/include/z8530var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530var.h,v 1.3 1996/06/08 16:21:15 briggs Exp $ */ +/* $OpenBSD: z8530var.h,v 1.4 1997/11/30 06:10:38 gene Exp $ */ /* $NetBSD: z8530var.h,v 1.2 1996/06/07 10:27:19 briggs Exp $ */ /* @@ -46,6 +46,10 @@ * @(#)zsvar.h 8.1 (Berkeley) 6/11/93 */ +#ifndef _MAC68K_Z8530VAR_H_ +#define _MAC68K_Z8530VAR_H_ + +#ifdef _KERNEL #include <arch/mac68k/dev/z8530sc.h> #include <arch/mac68k/dev/z8530tty.h> @@ -53,7 +57,7 @@ * Functions to read and write individual registers in a channel. * The ZS chip requires a 1.6 uSec. recovery time between accesses, * and the Sun3 hardware does NOT take care of this for you. - * MacII hardware DOES dake care of the delay for us. :-) + * MacII hardware DOES dake care of the delay for us. */ u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg)); @@ -63,6 +67,7 @@ u_char zs_read_data __P((struct zs_chanstate *cs)); void zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val)); void zs_write_csr __P((struct zs_chanstate *cs, u_char val)); void zs_write_data __P((struct zs_chanstate *cs, u_char val)); +#endif /* _KERNEL */ /* * abort detection on console will now timeout after iterating on a loop @@ -75,6 +80,7 @@ void zs_write_data __P((struct zs_chanstate *cs, u_char val)); * How to request a "soft" interrupt. * This could be a macro if you like. */ +#ifdef _KERNEL void zsc_req_softint __P((struct zsc_softc *zsc)); /* Handle user request to enter kernel debugger. */ @@ -90,6 +96,7 @@ void zstty_mdattach __P((struct zsc_softc *zsc, struct zstty_softc *zst, /* Callback for "external" clock sources */ void zsmd_setclock __P((struct zs_chanstate *cs)); +#endif /* _KERNEL */ /* * Some warts needed by z8530tty.c - @@ -108,4 +115,8 @@ void zsmd_setclock __P((struct zs_chanstate *cs)); #define ZSMAC_RAW 0x01 #define ZSMAC_LOCALTALK 0x02 +#ifdef _KERNEL #define zsprintf printf +#endif /* _KERNEL */ + +#endif /* _MAC68K_Z8530VAR_H_ */ |