[src/trunk]: src/sys/arch/sun2/include Just include a common header.

[fredette <fredette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/612f1e2e0b6c
branches:  trunk
changeset: 511828:612f1e2e0b6c
user:      fredette <fredette%NetBSD.org@localhost>
date:      Wed Jun 27 19:19:22 2001 +0000

description:
Just include a common header.

diffstat:

 sys/arch/sun2/include/cpu.h        |  150 +------------------------------------
 sys/arch/sun2/include/kbd.h        |    3 +
 sys/arch/sun2/include/kbio.h       |    3 +
 sys/arch/sun2/include/vuid_event.h |    3 +
 4 files changed, 11 insertions(+), 148 deletions(-)

diffs (176 lines):

diff -r 217e0785d5d4 -r 612f1e2e0b6c sys/arch/sun2/include/cpu.h
--- a/sys/arch/sun2/include/cpu.h       Wed Jun 27 19:08:58 2001 +0000
+++ b/sys/arch/sun2/include/cpu.h       Wed Jun 27 19:19:22 2001 +0000
@@ -1,149 +1,3 @@
-/*     $NetBSD: cpu.h,v 1.2 2001/05/30 12:28:51 mrg 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
- */
-
-#ifndef _CPU_H_
-#define _CPU_H_
-
-#if defined(_KERNEL_OPT)
-#include "opt_lockdebug.h"
-#endif
-
-#include <m68k/m68k.h>
-
-#ifdef _KERNEL
-
-/*
- * External definitions unique to sun2/68k cpu support.
- * These are the "public" declarations - those needed in
- * machine-independent source code.  The "priviate" ones
- * are in machdep.h (used only inside sys/arch/sun2).
- *
- * Note that the name of this file is NOT meant to imply
- * that it has anything to do with mc68010 CPU stuff.
- * The name "cpu" is historical, and used in the common
- * code to identify machine-dependent functions, etc.
- */
+/*     $NetBSD: cpu.h,v 1.3 2001/06/27 19:19:22 fredette Exp $ */
 
-#include <sys/sched.h>
-struct cpu_info {
-       struct schedstate_percpu ci_schedstate; /* scheduler state */
-#if defined(DIAGNOSTIC) || defined(LOCKDEBUG)
-       u_long ci_spin_locks;           /* # of spin locks held */
-       u_long ci_simple_locks;         /* # of simple locks held */
-#endif
-};
-
-extern struct cpu_info cpu_info_store;
-
-#define        curcpu()                        (&cpu_info_store)
-
-/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define        cpu_wait(p)                     /* nothing */
-#define        cpu_number()                    0
-
-/*
- * Arguments to hardclock and gatherstats encapsulate the previous
- * machine state in an opaque clockframe.  One the sun2, we use
- * what the locore.s glue puts on the stack before calling C-code.
- */
-struct clockframe {
-       u_int   cf_regs[4];     /* d0,d1,a0,a1 */
-       u_short cf_sr;          /* sr at time of interrupt */
-       u_long  cf_pc;          /* pc at time of interrupt */
-       u_short cf_vo;          /* vector offset (4-word frame) */
-} __attribute__((packed));
-
-#define        CLKF_USERMODE(framep)   (((framep)->cf_sr & PSL_S) == 0)
-#define        CLKF_BASEPRI(framep)    (((framep)->cf_sr & PSL_IPL) == 0)
-#define        CLKF_PC(framep)         ((framep)->cf_pc)
-#if 0
-/* We would like to do it this way... */
-#define        CLKF_INTR(framep)       (((framep)->cf_sr & PSL_M) == 0)
-#else
-/* but until we start using PSL_M, we have to do this instead */
-#define        CLKF_INTR(framep)       (0)     /* XXX */
-#endif
-
-extern int astpending;  /* need to trap before returning to user mode */
-#define aston() (astpending = 1)
-
-/*
- * Preempt the current process if in interrupt from user mode,
- * or after the current trap/syscall if in system mode.
- */
-extern int want_resched;        /* resched() was called */
-#define        need_resched(ci)        { want_resched = 1; aston(); }
-
-/*
- * Give a profiling tick to the current process when the user profiling
- * buffer pages are invalid.  On the sun2, request an ast to send us
- * through trap, marking the proc as needing a profiling tick.
- */
-#define        need_proftick(p)        ((p)->p_flag |= P_OWEUPC, aston())
-
-/*
- * Notify the current process (p) that it has a signal pending,
- * process as soon as possible.
- */
-#define        signotify(p)    aston()
-
-#include <machine/intr.h>
-extern void *softnet_cookie;
-#define setsoftnet()   softintr_schedule(softnet_cookie)
-
-/*
- * For some reason the sparc has this prototype in its machine/cpu.h,
- * so for now we do the same.
- */
-void   fb_unblank __P((void));
-
-#endif /* _KERNEL */
-
-#include <m68k/sysctl.h>
-#endif /* _CPU_H_ */
+#include <sun68k/cpu.h>
diff -r 217e0785d5d4 -r 612f1e2e0b6c sys/arch/sun2/include/kbd.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sun2/include/kbd.h       Wed Jun 27 19:19:22 2001 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: kbd.h,v 1.1 2001/06/27 19:19:23 fredette Exp $ */
+
+#include <dev/sun/kbd_reg.h>
diff -r 217e0785d5d4 -r 612f1e2e0b6c sys/arch/sun2/include/kbio.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sun2/include/kbio.h      Wed Jun 27 19:19:22 2001 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: kbio.h,v 1.1 2001/06/27 19:19:23 fredette Exp $        */
+
+#include <dev/sun/kbio.h>
diff -r 217e0785d5d4 -r 612f1e2e0b6c sys/arch/sun2/include/vuid_event.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sun2/include/vuid_event.h        Wed Jun 27 19:19:22 2001 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: vuid_event.h,v 1.1 2001/06/27 19:19:23 fredette Exp $  */
+
+#include <dev/sun/vuid_event.h>