[src/trunk]: src/sys/arch/amigappc/include remove things that were copied ver...

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

details:   https://anonhg.NetBSD.org/src/rev/8c25472d8777
branches:  trunk
changeset: 518664:8c25472d8777
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Mon Dec 03 21:15:15 2001 +0000

description:
remove things that were copied verbatim from powerpc_cpu.h
and #include <powepc/powerpc_cpu.h>

diffstat:

 sys/arch/amigappc/include/cpu.h |  34 ++++------------------------------
 1 files changed, 4 insertions(+), 30 deletions(-)

diffs (69 lines):

diff -r c33430d43a8f -r 8c25472d8777 sys/arch/amigappc/include/cpu.h
--- a/sys/arch/amigappc/include/cpu.h   Mon Dec 03 21:12:57 2001 +0000
+++ b/sys/arch/amigappc/include/cpu.h   Mon Dec 03 21:15:15 2001 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: cpu.h,v 1.7 2001/05/30 12:28:39 mrg Exp $ */
+/*      $NetBSD: cpu.h,v 1.8 2001/12/03 21:15:15 aymeric Exp $ */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -42,13 +42,6 @@
 #include <machine/intr.h>
 
 #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
-};
 
 #ifdef _KERNEL
 extern struct cpu_info cpu_info_store;
@@ -60,6 +53,8 @@
 
 #endif /* _KERNEL */
 
+#define CPU_MAXNUM     1
+
 /* ADAM: taken from macppc/cpu.h */
 #define CLKF_USERMODE(frame)    (((frame)->srr1 & PSL_PR) != 0)
 #define CLKF_BASEPRI(frame)     ((frame)->pri == 0)
@@ -88,8 +83,7 @@
 #define CACHELINESIZE   32
 #endif
 
-/* ADAM: commented out to avoid CTL_MACHDEP_NAMES redefiniton (see below) */
-/*#include <powerpc/cpu.h>*/
+#include <powerpc/cpu.h>
 
 /* end of ADAM */
 
@@ -110,26 +104,6 @@
 int machineid;
 #endif
 
-/* ADAM: copied from powerpc/cpu.h */
-#ifndef _POWERPC_CPU_H_
-#define _POWERPC_CPU_H_
-
-extern void __syncicache __P((void *, int));
-
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_CACHELINE   1
-#define CPU_MAXID       2
-
-#endif  /* _POWERPC_CPU_H_ */
-
-/* ADAM: copied from amiga/cpu.h */
-#define CTL_MACHDEP_NAMES { \
-       { 0, 0 }, \
-       { "console_device", CTLTYPE_STRUCT }, \
-}
-
 #ifdef _KERNEL
 /*
  * Prototypes from amiga_init.c