diff options
Diffstat (limited to 'sys/arch/amiga/include')
30 files changed, 63 insertions, 89 deletions
diff --git a/sys/arch/amiga/include/ansi.h b/sys/arch/amiga/include/ansi.h index d2286176862..46114eee1f6 100644 --- a/sys/arch/amiga/include/ansi.h +++ b/sys/arch/amiga/include/ansi.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ansi.h,v 1.2 1997/01/16 09:25:41 niklas Exp $ */ /* $NetBSD: ansi.h,v 1.8 1994/10/26 02:05:55 cgd Exp $ */ #ifndef _MACHINE_ANSI_H_ diff --git a/sys/arch/amiga/include/asm.h b/sys/arch/amiga/include/asm.h index 3e9ddfbf3b7..c77d57177b9 100644 --- a/sys/arch/amiga/include/asm.h +++ b/sys/arch/amiga/include/asm.h @@ -1,3 +1,4 @@ +/* $OpenBSD: asm.h,v 1.2 1997/01/16 09:25:43 niklas Exp $ */ /* $NetBSD: asm.h,v 1.4 1994/10/26 02:05:57 cgd Exp $ */ #ifndef _MACHINE_ASM_H_ diff --git a/sys/arch/amiga/include/cdefs.h b/sys/arch/amiga/include/cdefs.h index a3c9c4377d7..aa33d6d365a 100644 --- a/sys/arch/amiga/include/cdefs.h +++ b/sys/arch/amiga/include/cdefs.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cdefs.h,v 1.2 1997/01/16 09:25:45 niklas Exp $ */ /* $NetBSD: cdefs.h,v 1.1 1995/01/19 01:38:36 jtc Exp $ */ #ifndef _MACHINE_CDEFS_H_ diff --git a/sys/arch/amiga/include/conf.h b/sys/arch/amiga/include/conf.h index 98ded5dd89d..e3bfee98297 100644 --- a/sys/arch/amiga/include/conf.h +++ b/sys/arch/amiga/include/conf.h @@ -1,5 +1,5 @@ -/* $OpenBSD: conf.h,v 1.5 1996/09/04 22:44:22 niklas Exp $ */ -/* $NetBSD: conf.h,v 1.1 1996/04/21 21:13:16 veego Exp $ */ +/* $OpenBSD: conf.h,v 1.6 1997/01/16 09:25:45 niklas Exp $ */ +/* $NetBSD: conf.h,v 1.4 1996/11/30 01:13:07 is Exp $ */ /* * Copyright (c) 1996 Bernd Ernesti. All rights reserved. @@ -37,6 +37,8 @@ cdev_decl(com); cdev_decl(ctty); +cdev_decl(drcom); + bdev_decl(fd); cdev_decl(fd); diff --git a/sys/arch/amiga/include/cpu.h b/sys/arch/amiga/include/cpu.h index 8ddb9c5b888..d63e077db00 100644 --- a/sys/arch/amiga/include/cpu.h +++ b/sys/arch/amiga/include/cpu.h @@ -1,5 +1,5 @@ -/* $OpenBSD: cpu.h,v 1.8 1996/05/29 10:15:50 niklas Exp $ */ -/* $NetBSD: cpu.h,v 1.35 1996/05/19 15:35:43 is Exp $ */ +/* $OpenBSD: cpu.h,v 1.9 1997/01/16 09:25:46 niklas Exp $ */ +/* $NetBSD: cpu.h,v 1.36 1996/09/11 00:11:42 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -51,6 +51,12 @@ #include <machine/psl.h> /* + * Get common m68k CPU definitions. + */ +#include <m68k/cpu.h> +#define M68K_MMU_MOTOROLA + +/* * definitions of cpu-dependent requirements * referenced in generic code */ @@ -123,88 +129,11 @@ int want_resched; /* resched() was called */ #define AMIGA_FPU40 (1L<<6) #define AMIGA_68060 (1L<<7) -/* values for fputype */ -#define FPU_NONE 0 -#define FPU_68881 1 -#define FPU_68882 2 -#define FPU_68040 3 - -/* values for mmutype (assigned for quick testing) */ -#define MMU_68030 -1 /* 68030 on-chip subset of 68851 */ -#define MMU_68851 1 /* Motorola 68851 */ -#define MMU_68040 -2 /* 68040 on-chip subsubset */ - #ifdef _KERNEL -int machineid, mmutype, fputype; +int machineid; #endif /* - * 68851 and 68030 MMU - */ -#define PMMU_LVLMASK 0x0007 -#define PMMU_INV 0x0400 -#define PMMU_WP 0x0800 -#define PMMU_ALV 0x1000 -#define PMMU_SO 0x2000 -#define PMMU_LV 0x4000 -#define PMMU_BE 0x8000 -#define PMMU_FAULT (PMMU_WP|PMMU_INV) - -/* 680X0 function codes */ -#define FC_USERD 1 /* user data space */ -#define FC_USERP 2 /* user program 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 */ - -/* additional fields in the 68030 cache control register */ -#define IC_BE 0x0010 /* instruction burst enable */ -#define DC_ENABLE 0x0100 /* data cache enable */ -#define DC_FREEZE 0x0200 /* data cache freeze */ -#define DC_CE 0x0400 /* clear data cache entry */ -#define DC_CLR 0x0800 /* clear entire data cache */ -#define DC_BE 0x1000 /* data burst enable */ -#define DC_WA 0x2000 /* write allocate */ - -/* fields in the 68040 cache control register */ -#define IC40_ENABLE 0x00008000 /* enable instruction cache */ -#define DC40_ENABLE 0x80000000 /* enable data cache */ - -/* additional fields in the 68060 cache control register */ - -#define DC60_NAD 0x40000000 /* no allocate mode, data cache */ -#define DC60_ESB 0x20000000 /* enable store buffer */ -#define DC60_DPI 0x10000000 /* disable CPUSH invalidation */ -#define DC60_FOC 0x08000000 /* four kB data cache mode (else 8) */ - -#define IC60_EBC 0x00800000 /* enable branch cache */ -#define IC60_CABC 0x00400000 /* clear all branch cache entries */ -#define IC60_CUBC 0x00200000 /* clear user branch cache entries */ - -#define IC60_NAI 0x00004000 /* no allocate mode, instr. cache */ -#define IC60_FIC 0x00002000 /* four kB instr. cache (else 8) */ - - -#define CACHE_ON (DC_WA|DC_BE|DC_CLR|DC_ENABLE|IC_BE|IC_CLR|IC_ENABLE) -#define CACHE_OFF (DC_CLR|IC_CLR) -#define CACHE_CLR (CACHE_ON) -#define IC_CLEAR (DC_WA|DC_BE|DC_ENABLE|IC_BE|IC_CLR|IC_ENABLE) -#define DC_CLEAR (DC_WA|DC_BE|DC_CLR|DC_ENABLE|IC_BE|IC_ENABLE) - -/* 68040 cache control */ -#define CACHE40_ON (IC40_ENABLE|DC40_ENABLE) -#define CACHE40_OFF 0x00000000 - -#define CACHE60_ON (CACHE40_ON |IC60_CABC|IC60_EBC|DC60_ESB) -#define CACHE60_OFF (CACHE40_OFF|IC60_CABC) - -/* * CTL_MACHDEP definitions. */ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ diff --git a/sys/arch/amiga/include/cpufunc.h b/sys/arch/amiga/include/cpufunc.h index 04242c01797..5e7f1a45881 100644 --- a/sys/arch/amiga/include/cpufunc.h +++ b/sys/arch/amiga/include/cpufunc.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cpufunc.h,v 1.2 1997/01/16 09:25:48 niklas Exp $ */ /* $NetBSD: cpufunc.h,v 1.7 1994/10/26 02:06:02 cgd Exp $ */ /* diff --git a/sys/arch/amiga/include/db_machdep.h b/sys/arch/amiga/include/db_machdep.h index bd9b4fa03e2..c851880fa83 100644 --- a/sys/arch/amiga/include/db_machdep.h +++ b/sys/arch/amiga/include/db_machdep.h @@ -1,3 +1,4 @@ +/* $OpenBSD: db_machdep.h,v 1.2 1997/01/16 09:25:49 niklas Exp $ */ /* $NetBSD: db_machdep.h,v 1.4 1994/10/26 02:06:03 cgd Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ diff --git a/sys/arch/amiga/include/exec.h b/sys/arch/amiga/include/exec.h index 4850a249ac2..84f2fd5b686 100644 --- a/sys/arch/amiga/include/exec.h +++ b/sys/arch/amiga/include/exec.h @@ -1,3 +1,4 @@ +/* $OpenBSD: exec.h,v 1.4 1997/01/16 09:25:50 niklas Exp $ */ /* $NetBSD: exec.h,v 1.8 1994/10/26 02:06:11 cgd Exp $ */ /* diff --git a/sys/arch/amiga/include/fbio.h b/sys/arch/amiga/include/fbio.h index 2f6dd29abbb..19d88410a4c 100644 --- a/sys/arch/amiga/include/fbio.h +++ b/sys/arch/amiga/include/fbio.h @@ -1,3 +1,4 @@ +/* $OpenBSD: fbio.h,v 1.2 1997/01/16 09:25:51 niklas Exp $ */ /* $NetBSD: fbio.h,v 1.1 1996/05/19 20:06:12 is Exp $ */ /* diff --git a/sys/arch/amiga/include/float.h b/sys/arch/amiga/include/float.h index c4910de3ce3..121b9698b36 100644 --- a/sys/arch/amiga/include/float.h +++ b/sys/arch/amiga/include/float.h @@ -1,3 +1,4 @@ +/* $OpenBSD: float.h,v 1.2 1997/01/16 09:25:52 niklas Exp $ */ /* $NetBSD: float.h,v 1.8 1994/10/26 02:06:13 cgd Exp $ */ #ifndef _MACHINE_FLOAT_H_ diff --git a/sys/arch/amiga/include/frame.h b/sys/arch/amiga/include/frame.h index 2a4df888355..50a90d0e811 100644 --- a/sys/arch/amiga/include/frame.h +++ b/sys/arch/amiga/include/frame.h @@ -1,3 +1,4 @@ +/* $OpenBSD: frame.h,v 1.2 1997/01/16 09:25:53 niklas Exp $ */ /* $NetBSD: frame.h,v 1.7 1994/10/26 02:06:15 cgd Exp $ */ #ifndef _MACHINE_FRAME_H_ diff --git a/sys/arch/amiga/include/ieeefp.h b/sys/arch/amiga/include/ieeefp.h index 1e1bfc2a13d..37374060bfc 100644 --- a/sys/arch/amiga/include/ieeefp.h +++ b/sys/arch/amiga/include/ieeefp.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ieeefp.h,v 1.2 1997/01/16 09:25:54 niklas Exp $ */ /* $NetBSD: ieeefp.h,v 1.2 1995/04/16 16:47:03 jtc Exp $ */ /* Just use the common m68k definition */ diff --git a/sys/arch/amiga/include/kcore.h b/sys/arch/amiga/include/kcore.h index e303289aaef..cab7e69a459 100644 --- a/sys/arch/amiga/include/kcore.h +++ b/sys/arch/amiga/include/kcore.h @@ -1,3 +1,4 @@ +/* $OpenBSD: kcore.h,v 1.2 1997/01/16 09:25:55 niklas Exp $ */ /* $NetBSD: kcore.h,v 1.1 1996/05/12 02:47:46 mhitch Exp $ */ #ifndef _MACHINE_KCORE_H_ diff --git a/sys/arch/amiga/include/limits.h b/sys/arch/amiga/include/limits.h index e88ce065d54..b02a1612c80 100644 --- a/sys/arch/amiga/include/limits.h +++ b/sys/arch/amiga/include/limits.h @@ -1,3 +1,4 @@ +/* $OpenBSD: limits.h,v 1.2 1997/01/16 09:25:56 niklas Exp $ */ /* $NetBSD: limits.h,v 1.8 1994/10/26 02:06:16 cgd Exp $ */ #ifndef _MACHINE_LIMITS_H_ diff --git a/sys/arch/amiga/include/mtpr.h b/sys/arch/amiga/include/mtpr.h index 5d85d6e656b..623c88ab546 100644 --- a/sys/arch/amiga/include/mtpr.h +++ b/sys/arch/amiga/include/mtpr.h @@ -1,3 +1,4 @@ +/* $OpenBSD: mtpr.h,v 1.3 1997/01/16 09:25:57 niklas Exp $ */ /* $NetBSD: mtpr.h,v 1.10 1996/05/09 20:31:53 is Exp $ */ /* diff --git a/sys/arch/amiga/include/param.h b/sys/arch/amiga/include/param.h index 22ea7f2bbfb..6fad68ccfcc 100644 --- a/sys/arch/amiga/include/param.h +++ b/sys/arch/amiga/include/param.h @@ -1,5 +1,5 @@ -/* $OpenBSD: param.h,v 1.7 1996/05/04 09:29:50 niklas Exp $ */ -/* $NetBSD: param.h,v 1.29 1996/04/21 21:13:20 veego Exp $ */ +/* $OpenBSD: param.h,v 1.8 1997/01/16 09:25:58 niklas Exp $ */ +/* $NetBSD: param.h,v 1.30 1996/09/28 15:54:04 mhitch Exp $ */ /* * Copyright (c) 1988 University of Utah. diff --git a/sys/arch/amiga/include/pcb.h b/sys/arch/amiga/include/pcb.h index fd78f0f1cb2..79988a800c5 100644 --- a/sys/arch/amiga/include/pcb.h +++ b/sys/arch/amiga/include/pcb.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pcb.h,v 1.2 1997/01/16 09:25:59 niklas Exp $ */ /* $NetBSD: pcb.h,v 1.9 1995/05/11 23:05:57 chopps Exp $ */ /* diff --git a/sys/arch/amiga/include/pmap.h b/sys/arch/amiga/include/pmap.h index 0b830babf4e..e627e170091 100644 --- a/sys/arch/amiga/include/pmap.h +++ b/sys/arch/amiga/include/pmap.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pmap.h,v 1.2 1997/01/16 09:26:01 niklas Exp $ */ /* $NetBSD: pmap.h,v 1.16 1995/09/29 13:52:08 chopps Exp $ */ /* diff --git a/sys/arch/amiga/include/proc.h b/sys/arch/amiga/include/proc.h index 03e0110ba2e..22e636ee922 100644 --- a/sys/arch/amiga/include/proc.h +++ b/sys/arch/amiga/include/proc.h @@ -1,3 +1,4 @@ +/* $OpenBSD: proc.h,v 1.3 1997/01/16 09:26:02 niklas Exp $ */ /* $NetBSD: proc.h,v 1.10 1994/10/26 02:06:27 cgd Exp $ */ /* diff --git a/sys/arch/amiga/include/profile.h b/sys/arch/amiga/include/profile.h index e29f9651cd3..94824ec7d6d 100644 --- a/sys/arch/amiga/include/profile.h +++ b/sys/arch/amiga/include/profile.h @@ -1,3 +1,4 @@ +/* $OpenBSD: profile.h,v 1.2 1997/01/16 09:26:03 niklas Exp $ */ /* $NetBSD: profile.h,v 1.2 1994/10/26 02:06:29 cgd Exp $ */ #ifndef _MACHINE_PROFILE_H_ diff --git a/sys/arch/amiga/include/psl.h b/sys/arch/amiga/include/psl.h index 069f4839d90..e3c5def73aa 100644 --- a/sys/arch/amiga/include/psl.h +++ b/sys/arch/amiga/include/psl.h @@ -1,5 +1,5 @@ -/* $OpenBSD: psl.h,v 1.7 1996/05/31 10:46:29 niklas Exp $ */ -/* $NetBSD: psl.h,v 1.8 1996/04/21 21:13:22 veego Exp $ */ +/* $OpenBSD: psl.h,v 1.8 1997/01/16 09:26:04 niklas Exp $ */ +/* $NetBSD: psl.h,v 1.11 1996/11/30 00:33:49 is Exp $ */ #ifndef _MACHINE_PSL_H_ #define _MACHINE_PSL_H_ @@ -103,8 +103,25 @@ spllower(npsl) */ #define splbio() spl3() #define splnet() spl3() -#define spltty() spl4() -#define splimp() spl4() + +/* + * spltty hack, idea by Jason Thorpe. + * drivers which need it (at the present only drcom) raise the variable to + * spl5 (the idea being that only ser.c really wants it below 5, and ser + * and drcom will never be present at the same time). + * + * XXX ttyspl is statically initialized in drcom.c at the moment; should + * be some driver independent file. + * + * XXX should ttyspl be volatile? I think not; it is intended to be set only + * during xxx_attach() time, and will be used only later. + * -is + */ + +extern u_int16_t amiga_ttyspl; +#define spltty() splexact(amiga_ttyspl) +#define splimp() spltty() /* XXX for the full story, see i386 */ + #if defined(LEV6_DEFER) || defined(IPL_REMAP_1) || defined(IPL_REMAP_2) #define splclock() spl4() #else diff --git a/sys/arch/amiga/include/pte.h b/sys/arch/amiga/include/pte.h index 8617b5f3213..97e7444d5f5 100644 --- a/sys/arch/amiga/include/pte.h +++ b/sys/arch/amiga/include/pte.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pte.h,v 1.2 1997/01/16 09:26:05 niklas Exp $ */ /* $NetBSD: pte.h,v 1.14 1995/09/29 13:52:09 chopps Exp $ */ /* diff --git a/sys/arch/amiga/include/ptrace.h b/sys/arch/amiga/include/ptrace.h index 24aa91a2e64..72c16112e45 100644 --- a/sys/arch/amiga/include/ptrace.h +++ b/sys/arch/amiga/include/ptrace.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ptrace.h,v 1.2 1997/01/16 09:26:06 niklas Exp $ */ /* $NetBSD: ptrace.h,v 1.4 1994/10/26 02:06:36 cgd Exp $ */ #ifndef _MACHINE_PTRACE_H_ diff --git a/sys/arch/amiga/include/reg.h b/sys/arch/amiga/include/reg.h index b485e45d618..92bf5dd84fe 100644 --- a/sys/arch/amiga/include/reg.h +++ b/sys/arch/amiga/include/reg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: reg.h,v 1.2 1997/01/16 09:26:08 niklas Exp $ */ /* $NetBSD: reg.h,v 1.11 1994/10/26 02:06:37 cgd Exp $ */ #ifndef _MACHINE_REG_H_ diff --git a/sys/arch/amiga/include/setjmp.h b/sys/arch/amiga/include/setjmp.h index 7c4f40837b4..34b1f7af05e 100644 --- a/sys/arch/amiga/include/setjmp.h +++ b/sys/arch/amiga/include/setjmp.h @@ -1,3 +1,4 @@ +/* $OpenBSD: setjmp.h,v 1.2 1997/01/16 09:26:09 niklas Exp $ */ /* $NetBSD: setjmp.h,v 1.1 1994/12/20 10:36:27 cgd Exp $ */ #include <m68k/setjmp.h> diff --git a/sys/arch/amiga/include/signal.h b/sys/arch/amiga/include/signal.h index 20a114a32e4..d72674fa0c1 100644 --- a/sys/arch/amiga/include/signal.h +++ b/sys/arch/amiga/include/signal.h @@ -1,3 +1,4 @@ +/* $OpenBSD: signal.h,v 1.2 1997/01/16 09:26:10 niklas Exp $ */ /* $NetBSD: signal.h,v 1.5 1994/10/26 02:06:39 cgd Exp $ */ #ifndef _MACHINE_SIGNAL_H_ diff --git a/sys/arch/amiga/include/stdarg.h b/sys/arch/amiga/include/stdarg.h index 0717f83d839..c9b3a89d5af 100644 --- a/sys/arch/amiga/include/stdarg.h +++ b/sys/arch/amiga/include/stdarg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: stdarg.h,v 1.2 1997/01/16 09:26:11 niklas Exp $ */ /* $NetBSD: stdarg.h,v 1.8 1994/10/26 02:06:40 cgd Exp $ */ /* Just use the common m68k definition */ diff --git a/sys/arch/amiga/include/trap.h b/sys/arch/amiga/include/trap.h index 2da4dd73844..d1b64809762 100644 --- a/sys/arch/amiga/include/trap.h +++ b/sys/arch/amiga/include/trap.h @@ -1,3 +1,4 @@ +/* $OpenBSD: trap.h,v 1.2 1997/01/16 09:26:12 niklas Exp $ */ /* $NetBSD: trap.h,v 1.8 1995/02/12 19:19:39 chopps Exp $ */ #ifndef _MACHINE_TRAP_H_ diff --git a/sys/arch/amiga/include/types.h b/sys/arch/amiga/include/types.h index 3c8c13b2d3c..278c36f9511 100644 --- a/sys/arch/amiga/include/types.h +++ b/sys/arch/amiga/include/types.h @@ -1,4 +1,5 @@ -/* $NetBSD: types.h,v 1.9 1995/09/16 16:11:40 chopps Exp $ */ +/* $OpenBSD: types.h,v 1.2 1997/01/16 09:26:13 niklas Exp $ */ +/* $NetBSD: types.h,v 1.11 1996/12/23 09:16:20 veego Exp $ */ #ifndef _MACHINE_TYPES_H_ #define _MACHINE_TYPES_H_ diff --git a/sys/arch/amiga/include/varargs.h b/sys/arch/amiga/include/varargs.h index 24a0e69b483..1d6d4f5a2aa 100644 --- a/sys/arch/amiga/include/varargs.h +++ b/sys/arch/amiga/include/varargs.h @@ -1,3 +1,4 @@ +/* $OpenBSD: varargs.h,v 1.2 1997/01/16 09:26:14 niklas Exp $ */ /* $NetBSD: varargs.h,v 1.6 1994/10/26 02:06:46 cgd Exp $ */ /* Just use the common m68k definition */ |