[src/netbsd-1-5]: src/sys/arch Pull up cpu_intr() prototype + platform depend...

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

details:   https://anonhg.NetBSD.org/src/rev/4cb3367e7ec2
branches:  netbsd-1-5
changeset: 488575:4cb3367e7ec2
user:      jeffs <jeffs%NetBSD.org@localhost>
date:      Wed Jul 19 00:25:25 2000 +0000

description:
Pull up cpu_intr() prototype + platform dependent machdeps.
(approved by thorepj).

diffstat:

 sys/arch/cobalt/cobalt/machdep.c     |   4 +---
 sys/arch/hpcmips/hpcmips/machdep.c   |   5 ++---
 sys/arch/mips/include/cpu.h          |  14 +++++++++++---
 sys/arch/newsmips/newsmips/machdep.c |   6 ++----
 sys/arch/pmax/pmax/machdep.c         |   5 ++---
 sys/arch/sgimips/sgimips/machdep.c   |   4 +---
 6 files changed, 19 insertions(+), 19 deletions(-)

diffs (164 lines):

diff -r 98e3150379d7 -r 4cb3367e7ec2 sys/arch/cobalt/cobalt/machdep.c
--- a/sys/arch/cobalt/cobalt/machdep.c  Tue Jul 18 22:01:47 2000 +0000
+++ b/sys/arch/cobalt/cobalt/machdep.c  Wed Jul 19 00:25:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.17 2000/06/14 16:40:58 soren Exp $       */
+/*     $NetBSD: machdep.c,v 1.17.2.1 2000/07/19 00:25:26 jeffs Exp $   */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -475,8 +475,6 @@
        return (void *)-1;
 }
 
-void cpu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
-
 void
 cpu_intr(status, cause, pc, ipending)
        u_int32_t status;
diff -r 98e3150379d7 -r 4cb3367e7ec2 sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c        Tue Jul 18 22:01:47 2000 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c        Wed Jul 19 00:25:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.26 2000/05/26 21:19:43 thorpej Exp $     */
+/*     $NetBSD: machdep.c,v 1.26.4.1 2000/07/19 00:25:26 jeffs Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2000/05/26 21:19:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26.4.1 2000/07/19 00:25:26 jeffs Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 #include "opt_vr41x1.h"
@@ -156,7 +156,6 @@
 struct splvec  splvec;                 /* XXX will go XXX */
 
 void mach_init __P((int, char *[], struct bootinfo*));
-void cpu_intr  __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
 
 static struct bootinfo bi_copy;
 struct bootinfo *bootinfo = NULL;
diff -r 98e3150379d7 -r 4cb3367e7ec2 sys/arch/mips/include/cpu.h
--- a/sys/arch/mips/include/cpu.h       Tue Jul 18 22:01:47 2000 +0000
+++ b/sys/arch/mips/include/cpu.h       Wed Jul 19 00:25:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.41 2000/05/30 02:05:36 nisimura Exp $        */
+/*     $NetBSD: cpu.h,v 1.41.2.1 2000/07/19 00:25:25 jeffs Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -51,6 +51,12 @@
 #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 */
+
+/*
+ * Platform can override, but note this breaks userland compatability
+ * with other mips platforms.
+ */
+#ifndef CPU_MAXID
 #define CPU_MAXID              4       /* number of valid machdep ids */
 
 #define CTL_MACHDEP_NAMES { \
@@ -59,7 +65,7 @@
        { "booted_kernel", CTLTYPE_STRING }, \
        { "root_device", CTLTYPE_STRING }, \
 }
-
+#endif
 
 #ifdef _KERNEL
 #ifndef _LOCORE
@@ -80,7 +86,7 @@
 
 #else /* run-time test */
 extern int cpu_arch;
-#define CPUISMIPS3     (cpu_arch == 3)
+#define CPUISMIPS3     (cpu_arch >= 3)
 #endif /* run-time test */
 
 /*
@@ -90,6 +96,8 @@
 #define        cpu_wait(p)                     /* nothing */
 #define        cpu_swapout(p)                  panic("cpu_swapout: can't get here");
 
+void cpu_intr __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
+
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
  * machine state in an opaque clockframe.
diff -r 98e3150379d7 -r 4cb3367e7ec2 sys/arch/newsmips/newsmips/machdep.c
--- a/sys/arch/newsmips/newsmips/machdep.c      Tue Jul 18 22:01:47 2000 +0000
+++ b/sys/arch/newsmips/newsmips/machdep.c      Wed Jul 19 00:25:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.41 2000/05/26 21:20:02 thorpej Exp $     */
+/*     $NetBSD: machdep.c,v 1.41.4.1 2000/07/19 00:25:26 jeffs Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2000/05/26 21:20:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41.4.1 2000/07/19 00:25:26 jeffs Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 
@@ -144,8 +144,6 @@
 /* initialize bss, etc. from kernel start, before main() is called. */
 void mach_init __P((int, int, int, int));
 
-void cpu_intr  __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
-
 void prom_halt __P((int)) __attribute__((__noreturn__));
 void to_monitor __P((int)) __attribute__((__noreturn__));
 
diff -r 98e3150379d7 -r 4cb3367e7ec2 sys/arch/pmax/pmax/machdep.c
--- a/sys/arch/pmax/pmax/machdep.c      Tue Jul 18 22:01:47 2000 +0000
+++ b/sys/arch/pmax/pmax/machdep.c      Wed Jul 19 00:25:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.173.2.1 2000/06/29 15:05:57 ad Exp $     */
+/*     $NetBSD: machdep.c,v 1.173.2.2 2000/07/19 00:25:26 jeffs Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173.2.1 2000/06/29 15:05:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173.2.2 2000/07/19 00:25:26 jeffs Exp $");
 
 #include "fs_mfs.h"
 #include "opt_ddb.h"
@@ -126,7 +126,6 @@
 struct splvec  splvec;                 /* XXX will go XXX */
 
 void   mach_init __P((int, char *[], int, int, u_int, char *)); /* XXX */
-void   cpu_intr  __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
 
 /* Motherboard or system-specific initialization vector */
 static void    unimpl_bus_reset __P((void));
diff -r 98e3150379d7 -r 4cb3367e7ec2 sys/arch/sgimips/sgimips/machdep.c
--- a/sys/arch/sgimips/sgimips/machdep.c        Tue Jul 18 22:01:47 2000 +0000
+++ b/sys/arch/sgimips/sgimips/machdep.c        Wed Jul 19 00:25:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.1 2000/06/14 16:02:47 soren Exp $        */
+/*     $NetBSD: machdep.c,v 1.1.2.1 2000/07/19 00:25:27 jeffs Exp $    */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -492,8 +492,6 @@
        while (--N > 0);
 }
 
-void cpu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
-
 extern int     crime_intr(void *);             /* XXX */
 
 void