summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorbriggs <briggs@cvs.openbsd.org>1996-10-20 23:40:55 +0000
committerbriggs <briggs@cvs.openbsd.org>1996-10-20 23:40:55 +0000
commit2d66277db65bd1131735560227bbb367cfa506a2 (patch)
treeb6623812edf09dbb0a00bdcea2ef080cf39f11cb /sys
parent05158961d422365f7a5fbb1d9b989b3336d553a4 (diff)
Out of NetBSD (scottr):
Define MACH_CLASSQ2, used by Performa 575. Remove susword() because of prototype conflict with <sys/systm.h>.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mac68k/include/cpu.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 214456ac9f0..2271195b749 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: cpu.h,v 1.10 1996/10/14 01:06:58 briggs Exp $ */
-/* $NetBSD: cpu.h,v 1.42 1996/10/12 07:35:29 scottr Exp $ */
+/* $OpenBSD: cpu.h,v 1.11 1996/10/20 23:40:54 briggs Exp $ */
+/* $NetBSD: cpu.h,v 1.43 1996/10/15 14:42:49 scottr Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -221,6 +221,7 @@ extern unsigned char ssir;
#define MACH_CLASSIIfx 0x0080 /* The IIfx is in a class by itself. */
#define MACH_CLASSQ 0x0100 /* non-A/V Centris/Quadras. */
#define MACH_CLASSAV 0x0101 /* A/V Centris/Quadras. */
+#define MACH_CLASSQ2 0x0102 /* More Centris/Quadras, different sccA. */
#define MACH_68020 0
#define MACH_68030 1
@@ -316,7 +317,6 @@ void DCIU __P((void));
void ICIA __P((void));
void DCFL __P((vm_offset_t));
int suline __P((caddr_t, caddr_t));
-int susword __P((caddr_t, u_int));
void savectx __P((struct pcb *));
void proc_trampoline __P((void));