diff options
Diffstat (limited to 'sys/arch/mac68k/include')
| -rw-r--r-- | sys/arch/mac68k/include/autoconf.h | 22 | ||||
| -rw-r--r-- | sys/arch/mac68k/include/cpu.h | 28 | ||||
| -rw-r--r-- | sys/arch/mac68k/include/types.h | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/include/viareg.h | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/include/vmparam.h | 6 |
5 files changed, 26 insertions, 38 deletions
diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h index 20e971e25c6..c44a5259ed0 100644 --- a/sys/arch/mac68k/include/autoconf.h +++ b/sys/arch/mac68k/include/autoconf.h @@ -1,5 +1,5 @@ -/* $OpenBSD: autoconf.h,v 1.3 1996/11/23 21:45:56 kstailey Exp $ */ -/* $NetBSD: autoconf.h,v 1.2 1996/05/18 18:52:48 briggs Exp $ */ +/* $OpenBSD: autoconf.h,v 1.4 1997/01/24 01:35:40 briggs Exp $ */ +/* $NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -40,24 +40,8 @@ * From sun3 port--adapted for mac68k platform by Allen Briggs. */ -/* These are the "bus" types: */ -#define BUS_OBIO 0 /* On-board I/O */ -#define BUS_NUBUS 1 /* "nubus" */ - -/* - * This is the "args" parameter to the bus match/attach functions. - */ -struct confargs { - int ca_bustype; /* BUS_INTERNAL0, ... */ - int slot; -}; - /* autoconf.c */ void setconf __P((void)); -int bus_scan __P((struct device *, void *, void *)); -int bus_print __P((void *, const char *)); -int bus_peek __P((int, vm_offset_t, int)); -char *bus_mapin __P((int, int, int)); void configure __P((void)); /* machdep.c */ @@ -67,8 +51,6 @@ int badbaddr __P((register caddr_t addr)); int badwaddr __P((register caddr_t addr)); int badladdr __P((register caddr_t addr)); -int mac68k_name_match __P((struct device *, void *, void *)); - /* clock.h */ void enablertclock __P((void)); diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h index d29efa99efa..bf16662a8f3 100644 --- a/sys/arch/mac68k/include/cpu.h +++ b/sys/arch/mac68k/include/cpu.h @@ -1,5 +1,5 @@ -/* $OpenBSD: cpu.h,v 1.12 1996/10/28 14:34:06 briggs Exp $ */ -/* $NetBSD: cpu.h,v 1.43 1996/10/15 14:42:49 scottr Exp $ */ +/* $OpenBSD: cpu.h,v 1.13 1997/01/24 01:35:40 briggs Exp $ */ +/* $NetBSD: cpu.h,v 1.44 1997/01/20 05:08:00 scottr Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -135,16 +135,20 @@ int want_resched; /* resched() was called */ /* * simulated software interrupt register */ -extern unsigned char ssir; - -#define SIR_NET 0x1 -#define SIR_CLOCK 0x2 -#define SIR_SERIAL 0x4 - -#define siroff(x) ssir &= ~(x) -#define setsoftnet() ssir |= SIR_NET -#define setsoftclock() ssir |= SIR_CLOCK -#define setsoftserial() ssir |= SIR_SERIAL +extern volatile u_int8_t ssir; + +#define SIR_NET 0x01 +#define SIR_CLOCK 0x02 +#define SIR_SERIAL 0x04 + +#define siroff(mask) \ + __asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask))); +#define setsoftnet() \ + __asm __volatile ( "orb %0,_ssir" : : "i" (SIR_NET)) +#define setsoftclock() \ + __asm __volatile ( "orb %0,_ssir" : : "i" (SIR_CLOCK)) +#define setsoftserial() \ + __asm __volatile ( "orb %0,_ssir" : : "i" (SIR_SERIAL)) #define CPU_CONSDEV 1 #define CPU_MAXID 2 diff --git a/sys/arch/mac68k/include/types.h b/sys/arch/mac68k/include/types.h index f6573615d51..21442c0b967 100644 --- a/sys/arch/mac68k/include/types.h +++ b/sys/arch/mac68k/include/types.h @@ -1,5 +1,5 @@ -/* $OpenBSD: types.h,v 1.3 1996/05/26 18:36:08 briggs Exp $ */ -/* $NetBSD: types.h,v 1.8 1996/05/05 06:18:05 briggs Exp $ */ +/* $OpenBSD: types.h,v 1.4 1997/01/24 01:35:41 briggs Exp $ */ +/* $NetBSD: types.h,v 1.10 1996/12/17 07:00:12 scottr Exp $ */ #ifndef _TYPES_MACHINE_ #define _TYPES_MACHINE_ diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h index 6179e3e8f7e..0883aa36d26 100644 --- a/sys/arch/mac68k/include/viareg.h +++ b/sys/arch/mac68k/include/viareg.h @@ -1,5 +1,5 @@ -/* $OpenBSD: viareg.h,v 1.4 1996/10/28 14:49:08 briggs Exp $ */ -/* $NetBSD: viareg.h,v 1.4 1996/06/07 10:41:37 briggs Exp $ */ +/* $OpenBSD: viareg.h,v 1.5 1997/01/24 01:35:41 briggs Exp $ */ +/* $NetBSD: viareg.h,v 1.5 1996/10/29 05:42:16 briggs Exp $ */ /*- * Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo, diff --git a/sys/arch/mac68k/include/vmparam.h b/sys/arch/mac68k/include/vmparam.h index 90787f96124..7975e2e9001 100644 --- a/sys/arch/mac68k/include/vmparam.h +++ b/sys/arch/mac68k/include/vmparam.h @@ -1,5 +1,5 @@ -/* $OpenBSD: vmparam.h,v 1.2 1996/05/26 18:36:11 briggs Exp $ */ -/* $NetBSD: vmparam.h,v 1.7 1995/06/21 03:17:06 briggs Exp $ */ +/* $OpenBSD: vmparam.h,v 1.3 1997/01/24 01:35:42 briggs Exp $ */ +/* $NetBSD: vmparam.h,v 1.8 1996/11/15 14:21:00 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -267,6 +267,8 @@ #define VM_KMEM_SIZE (NKMEMCLUSTERS*CLBYTES) #define VM_PHYS_SIZE (USRIOSIZE*CLBYTES) +#define MACHINE_NONCONTIG /* VM <=> pmap interface modifier */ + /* # of kernel PT pages (initial only, can grow dynamically) */ #define VM_KERNEL_PT_PAGES ((vm_size_t)2) /* XXX: SYSPTSIZE */ |