[src/trunk]: src/sys/arch/playstation2/include Adapt to -current

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

details:   https://anonhg.NetBSD.org/src/rev/31e6b1ce9435
branches:  trunk
changeset: 328326:31e6b1ce9435
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Mar 31 11:41:01 2014 +0000

description:
Adapt to -current

diffstat:

 sys/arch/playstation2/include/intr.h    |  42 +-------------------------------
 sys/arch/playstation2/include/param.h   |   4 +--
 sys/arch/playstation2/include/vmparam.h |   7 +++--
 3 files changed, 7 insertions(+), 46 deletions(-)

diffs (92 lines):

diff -r 0f7025b8b238 -r 31e6b1ce9435 sys/arch/playstation2/include/intr.h
--- a/sys/arch/playstation2/include/intr.h      Mon Mar 31 11:25:47 2014 +0000
+++ b/sys/arch/playstation2/include/intr.h      Mon Mar 31 11:41:01 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.11 2014/03/31 11:25:49 martin Exp $ */
+/*     $NetBSD: intr.h,v 1.12 2014/03/31 11:41:01 martin Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,45 +33,7 @@
 #define _PLAYSTATION2_INTR_H_
 #ifdef _KERNEL
 
-#include <mips/locore.h>
-
-/* Interrupt sharing types. */
-#define        IST_NONE                0       /* none */
-#define        IST_PULSE               1       /* pulsed */
-#define        IST_EDGE                2       /* edge-triggered */
-#define        IST_LEVEL               3       /* level-triggered */
-
-/* Interrupt priority levels */
-#define        IPL_NONE                0       /* nothing */
-#define IPL_SOFTCLOCK          1       /* timeouts */
-#define        IPL_SOFTBIO             1       /* bio */
-#define        IPL_SOFTNET             2       /* protocol stacks */
-#define IPL_SOFTSERIAL         2       /* serial */
-#define        IPL_VM                  3       /* i/o */
-#define        IPL_SCHED               4       /* clock */
-#define        IPL_HIGH                4       /* everything */
-
-#define        _IPL_NSOFT      4
-#define        _IPL_N          5
-
-/*
- * Hardware interrupt masks
- */
-extern u_int32_t __icu_mask[_IPL_N];
-
-#define splsoftclock()         splraise(__icu_mask[IPL_SOFTCLOCK])
-#define        splsoftbio()            splraise(__icu_mask[IPL_SOFTBIO])
-#define        splsoftnet()            splraise(__icu_mask[IPL_SOFTNET])
-#define        splsoftserial()         splraise(__icu_mask[IPL_SOFTSERIAL])
-#define        splvm()                 splraise(__icu_mask[IPL_VM])
-#define        splsched()              splraise(__icu_mask[IPL_SCHED])
-#define        splx(s)                 splset(s)
-
-void   spllowersofthigh(void);
-
-int splraise(int);
-void splset(int);
-void spl0(void);
+#include <mips/intr.h>
 
 /* R5900 EI/DI instruction */
 int _intr_suspend(void);
diff -r 0f7025b8b238 -r 31e6b1ce9435 sys/arch/playstation2/include/param.h
--- a/sys/arch/playstation2/include/param.h     Mon Mar 31 11:25:47 2014 +0000
+++ b/sys/arch/playstation2/include/param.h     Mon Mar 31 11:41:01 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.8 2014/03/31 11:25:49 martin Exp $ */
+/*     $NetBSD: param.h,v 1.9 2014/03/31 11:41:01 martin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -73,8 +73,6 @@
 
 #include <mips/mips_param.h>
 
-#define        _MACHINE_ARCH   mipsel
-#define        MACHINE_ARCH    "mipsel"
 #define        _MACHINE        playstation2
 #define        MACHINE         "playstation2"
 
diff -r 0f7025b8b238 -r 31e6b1ce9435 sys/arch/playstation2/include/vmparam.h
--- a/sys/arch/playstation2/include/vmparam.h   Mon Mar 31 11:25:47 2014 +0000
+++ b/sys/arch/playstation2/include/vmparam.h   Mon Mar 31 11:41:01 2014 +0000
@@ -1,6 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.4 2014/03/31 11:25:49 martin Exp $       */
-
-#include <mips/vmparam.h>
+/*     $NetBSD: vmparam.h,v 1.5 2014/03/31 11:41:01 martin Exp $       */
 
 /*
  * PlayStation 2 has one physical memory segment.
@@ -11,3 +9,6 @@
 
 #define        VM_NFREELIST            1
 #define        VM_FREELIST_DEFAULT     0
+
+#include <mips/vmparam.h>
+