[src/trunk]: src/sys/arch Revert previous.

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

details:   https://anonhg.NetBSD.org/src/rev/901e0236f798
branches:  trunk
changeset: 484081:901e0236f798
user:      soren <soren%NetBSD.org@localhost>
date:      Fri Mar 24 23:06:03 2000 +0000

description:
Revert previous.

diffstat:

 sys/arch/arc/include/cpu.h      |  13 +------------
 sys/arch/cobalt/include/cpu.h   |  13 +------------
 sys/arch/hpcmips/include/cpu.h  |  13 +------------
 sys/arch/mips/include/cpu.h     |  18 +++++++++++++++++-
 sys/arch/newsmips/include/cpu.h |  11 +----------
 sys/arch/pmax/include/cpu.h     |  15 +--------------
 6 files changed, 22 insertions(+), 61 deletions(-)

diffs (155 lines):

diff -r 46a88dd0fb36 -r 901e0236f798 sys/arch/arc/include/cpu.h
--- a/sys/arch/arc/include/cpu.h        Fri Mar 24 22:57:58 2000 +0000
+++ b/sys/arch/arc/include/cpu.h        Fri Mar 24 23:06:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.9 2000/03/24 21:30:58 soren Exp $    */
+/*     $NetBSD: cpu.h,v 1.10 2000/03/24 23:06:03 soren Exp $   */
 /*     $OpenBSD: cpu.h,v 1.9 1998/01/28 13:46:10 pefo Exp $ */
 
 #ifndef _ARC_CPU_H_
@@ -26,15 +26,4 @@
 extern void mips3_TLBWriteIndexedVPS __P((u_int index, struct tlb *tlb));
 #endif /* ! _LOCORE */
 
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_CONSDEV            1       /* dev_t: console terminal device */
-#define CPU_MAXID              2       /* number of valid machdep ids */
-
-#define CTL_MACHDEP_NAMES { \
-       { 0, 0 }, \
-       { "console_device", CTLTYPE_STRUCT }, \
-}
-
 #endif /* _ARC_CPU_H_ */
diff -r 46a88dd0fb36 -r 901e0236f798 sys/arch/cobalt/include/cpu.h
--- a/sys/arch/cobalt/include/cpu.h     Fri Mar 24 22:57:58 2000 +0000
+++ b/sys/arch/cobalt/include/cpu.h     Fri Mar 24 23:06:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.2 2000/03/24 21:30:59 soren Exp $    */
+/*     $NetBSD: cpu.h,v 1.3 2000/03/24 23:06:04 soren Exp $    */
 
 #define MIPS3_INTERNAL_TIMER_INTERRUPT
 
@@ -6,14 +6,3 @@
 #include <mips/cpuregs.h>
 
 #define INT_MASK_REAL_DEV      MIPS_HARD_INT_MASK
-
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_BOOTSTRING 1               /* Command given to the firmware. */
-#define CPU_MAXID      2
-
-#define CTL_MACHDEP_NAMES { \  
-       { 0, 0 }, \
-       { "bootstring", CTLTYPE_STRING }, \
-}
diff -r 46a88dd0fb36 -r 901e0236f798 sys/arch/hpcmips/include/cpu.h
--- a/sys/arch/hpcmips/include/cpu.h    Fri Mar 24 22:57:58 2000 +0000
+++ b/sys/arch/hpcmips/include/cpu.h    Fri Mar 24 23:06:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.3 2000/03/24 21:30:59 soren Exp $    */
+/*     $NetBSD: cpu.h,v 1.4 2000/03/24 23:06:04 soren Exp $    */
 
 #ifndef __HPCMIPS_CPU_H
 #define __HPCMIPS_CPU_H
@@ -18,15 +18,4 @@
 #define        INT_MASK_REAL_DEV       MIPS3_HARD_INT_MASK     /* XXX */
 #endif
 
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_CONSDEV            1       /* dev_t: console terminal device */
-#define CPU_MAXID              2       /* number of valid machdep ids */
-
-#define CTL_MACHDEP_NAMES { \
-       { 0, 0 }, \
-       { "console_device", CTLTYPE_STRUCT }, \
-}
-
 #endif __HPCMIPS_CPU_H
diff -r 46a88dd0fb36 -r 901e0236f798 sys/arch/mips/include/cpu.h
--- a/sys/arch/mips/include/cpu.h       Fri Mar 24 22:57:58 2000 +0000
+++ b/sys/arch/mips/include/cpu.h       Fri Mar 24 23:06:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.35 2000/03/24 21:30:59 soren Exp $   */
+/*     $NetBSD: cpu.h,v 1.36 2000/03/24 23:06:04 soren Exp $   */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -45,6 +45,22 @@
  * Exported definitions unique to NetBSD/mips cpu support.
  */
 
+/*
+ * CTL_MACHDEP definitions.
+ */
+#define CPU_CONSDEV            1       /* dev_t: console terminal device */
+#define CPU_BOOTED_KERNEL      2       /* string: booted kernel name */
+#define CPU_ROOT_DEVICE                3       /* string: root device name */
+#define CPU_MAXID              4       /* number of valid machdep ids */
+
+#define CTL_MACHDEP_NAMES { \
+       { 0, 0 }, \
+       { "console_device", CTLTYPE_STRUCT }, \
+       { "booted_kernel", CTLTYPE_STRING }, \
+       { "root_device", CTLTYPE_STRING }, \
+}
+
+
 #ifdef _KERNEL
 #ifndef _LOCORE
 
diff -r 46a88dd0fb36 -r 901e0236f798 sys/arch/newsmips/include/cpu.h
--- a/sys/arch/newsmips/include/cpu.h   Fri Mar 24 22:57:58 2000 +0000
+++ b/sys/arch/newsmips/include/cpu.h   Fri Mar 24 23:06:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.5 2000/03/24 21:31:00 soren Exp $    */
+/*     $NetBSD: cpu.h,v 1.6 2000/03/24 23:06:05 soren Exp $    */
 
 #ifndef _MACHINE_CPU_H_
 #define _MACHINE_CPU_H_
@@ -19,12 +19,3 @@
 
 #endif /* _LOCORE */
 #endif /* _MACHINE_CPU_H_ */
-
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_MAXID              1       /* number of valid machdep ids */
-
-#define CTL_MACHDEP_NAMES { \
-       { 0, 0 }, \
-}
diff -r 46a88dd0fb36 -r 901e0236f798 sys/arch/pmax/include/cpu.h
--- a/sys/arch/pmax/include/cpu.h       Fri Mar 24 22:57:58 2000 +0000
+++ b/sys/arch/pmax/include/cpu.h       Fri Mar 24 23:06:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.21 2000/03/24 21:31:00 soren Exp $   */
+/*     $NetBSD: cpu.h,v 1.22 2000/03/24 23:06:05 soren Exp $   */
 
 #ifndef _PMAX_CPU_H_
 #define _PMAX_CPU_H_
@@ -14,17 +14,4 @@
 #define        INT_MASK_REAL_DEV       (MIPS_HARD_INT_MASK &~ MIPS_INT_MASK_5)
 #define        INT_MASK_FPU_DEAL       MIPS_INT_MASK_5
 
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_CONSDEV            1       /* dev_t: console terminal device */
-#define CPU_BOOTED_KERNEL      2       /* string: booted kernel name */
-#define CPU_MAXID              3       /* number of valid machdep ids */
-
-#define CTL_MACHDEP_NAMES { \
-       { 0, 0 }, \
-       { "console_device", CTLTYPE_STRUCT }, \
-       { "booted_kernel", CTLTYPE_STRING }, \
-}
-
 #endif /* !_PMAX_CPU_H_ */