[src/trunk]: src/sys/arch/amigappc/include Make it compile with all devices f...

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

details:   https://anonhg.NetBSD.org/src/rev/a9d682fcb642
branches:  trunk
changeset: 751381:a9d682fcb642
user:      phx <phx%NetBSD.org@localhost>
date:      Tue Feb 02 19:16:57 2010 +0000

description:
Make it compile with all devices from amiga/dev.

diffstat:

 sys/arch/amigappc/include/cpu.h  |   7 ++++++-
 sys/arch/amigappc/include/intr.h |   8 +++++---
 sys/arch/amigappc/include/psl.h  |  39 ++++++++++-----------------------------
 3 files changed, 21 insertions(+), 33 deletions(-)

diffs (100 lines):

diff -r 0f5c49955cd6 -r a9d682fcb642 sys/arch/amigappc/include/cpu.h
--- a/sys/arch/amigappc/include/cpu.h   Tue Feb 02 19:15:33 2010 +0000
+++ b/sys/arch/amigappc/include/cpu.h   Tue Feb 02 19:16:57 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.16 2009/07/21 09:49:15 phx Exp $     */
+/*     $NetBSD: cpu.h,v 1.17 2010/02/02 19:16:57 phx Exp $     */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -57,6 +57,11 @@
  * Prototypes from machdep.c
  */
 int dma_cachectl(void *, int);
+
+/*
+ * Prototypes from powerpc/powerpc/trap.c
+ */
+int badaddr_read(void *, size_t, int *);
 #endif
 
 #include <powerpc/cpu.h>
diff -r 0f5c49955cd6 -r a9d682fcb642 sys/arch/amigappc/include/intr.h
--- a/sys/arch/amigappc/include/intr.h  Tue Feb 02 19:15:33 2010 +0000
+++ b/sys/arch/amigappc/include/intr.h  Tue Feb 02 19:16:57 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.22 2009/07/21 09:49:16 phx Exp $    */
+/*     $NetBSD: intr.h,v 1.23 2010/02/02 19:16:57 phx Exp $    */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -39,12 +39,14 @@
 #ifndef _AMIGAPPC_INTR_H_
 #define _AMIGAPPC_INTR_H_
 
+#ifdef _KERNEL
+#include <amiga/amiga/isr.h>
+#endif
 #include <powerpc/intr.h>
 
 #ifndef _LOCORE
 #include <machine/cpu.h>
 #include <sys/device.h>
-
-#endif
+#endif /* _LOCORE */
 
 #endif /* !_AMIGAPPC_INTR_H_ */
diff -r 0f5c49955cd6 -r a9d682fcb642 sys/arch/amigappc/include/psl.h
--- a/sys/arch/amigappc/include/psl.h   Tue Feb 02 19:15:33 2010 +0000
+++ b/sys/arch/amigappc/include/psl.h   Tue Feb 02 19:16:57 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psl.h,v 1.2 2009/07/21 09:49:16 phx Exp $ */
+/*     $NetBSD: psl.h,v 1.3 2010/02/02 19:16:57 phx Exp $ */
 
 #ifndef        _AMIGAPPC_PSL_H_
 #define        _AMIGAPPC_PSL_H_
@@ -6,34 +6,15 @@
 #include <powerpc/psl.h>
 
 /*
- * Compatibility with m68k/include/psl.h for amiga/68k devices
+ * Compatibility with m68k/include/psl.h for amiga/68k devices.
+ * Has to match with interrupt IPLs in amigappc_install_handlers().
  */
-/*XXX #define spl0()           spllower(0)*/
-#define spl1()         spllower(1)
-#define spl2()         spllower(2)
-#define spl3()         spllower(3)
-#define spl4()         spllower(4)
-#define spl5()         spllower(5)
-#define spl6()         spllower(6)
-#define spl7()         spllower(7)
-#define splraise0()    splraise(0)
-#define splraise1()    splraise(1)
-#define splraise2()    splraise(2)
-#define splraise3()    splraise(3)
-#define splraise4()    splraise(4)
-#define splraise5()    splraise(5)
-#define splraise6()    splraise(6)
-#define splraise7()    splraise(7)
-
-/* hack to make amiga device drivers compatible with P5_IPL_EMU */
-#define PSL_S          0
-#define PSL_IPL0       0
-#define PSL_IPL1       1
-#define PSL_IPL2       2
-#define PSL_IPL3       3
-#define PSL_IPL4       4
-#define PSL_IPL5       5
-#define PSL_IPL6       6
-#define PSL_IPL7       7
+#define spl1()         splbio()
+#define spl2()         splbio()
+#define spl3()         spltty()
+#define spl4()         splaudio()
+#define spl5()         splserial()
+#define spl6()         splserial()
+#define spl7()         splhigh()
 
 #endif /* _AMIGAPPC_PSL_H_ */