[src/trunk]: src/sys/arch/amigappc/include move compat splN calls to intr.h w...

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

details:   https://anonhg.NetBSD.org/src/rev/c0c6dac70488
branches:  trunk
changeset: 766244:c0c6dac70488
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Jun 19 08:00:56 2011 +0000

description:
move compat splN calls to intr.h where they belong.

diffstat:

 sys/arch/amigappc/include/intr.h |  14 +++++++++++++-
 sys/arch/amigappc/include/psl.h  |  19 +------------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diffs (51 lines):

diff -r fede8d27d661 -r c0c6dac70488 sys/arch/amigappc/include/intr.h
--- a/sys/arch/amigappc/include/intr.h  Sun Jun 19 07:59:46 2011 +0000
+++ b/sys/arch/amigappc/include/intr.h  Sun Jun 19 08:00:56 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.25 2011/06/17 23:36:17 matt Exp $   */
+/*     $NetBSD: intr.h,v 1.26 2011/06/19 08:00:56 matt Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -44,4 +44,16 @@
 #endif
 #include <powerpc/intr.h>
 
+/*
+ * Compatibility with m68k/include/psl.h for amiga/68k devices.
+ * Has to match with interrupt IPLs in amigappc_install_handlers().
+ */
+#define spl1()         splbio()
+#define spl2()         splbio()
+#define spl3()         spltty()
+#define spl4()         splaudio()
+#define spl5()         splserial()
+#define spl6()         splserial()
+#define spl7()         splhigh()
+
 #endif /* !_AMIGAPPC_INTR_H_ */
diff -r fede8d27d661 -r c0c6dac70488 sys/arch/amigappc/include/psl.h
--- a/sys/arch/amigappc/include/psl.h   Sun Jun 19 07:59:46 2011 +0000
+++ b/sys/arch/amigappc/include/psl.h   Sun Jun 19 08:00:56 2011 +0000
@@ -1,20 +1,3 @@
-/*     $NetBSD: psl.h,v 1.3 2010/02/02 19:16:57 phx Exp $ */
-
-#ifndef        _AMIGAPPC_PSL_H_
-#define        _AMIGAPPC_PSL_H_
+/*     $NetBSD: psl.h,v 1.4 2011/06/19 08:00:56 matt Exp $ */
 
 #include <powerpc/psl.h>
-
-/*
- * Compatibility with m68k/include/psl.h for amiga/68k devices.
- * Has to match with interrupt IPLs in amigappc_install_handlers().
- */
-#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_ */