Module Name: src
Committed By: matt
Date: Sun Jun 19 08:00:56 UTC 2011
Modified Files:
src/sys/arch/amigappc/include: intr.h psl.h
Log Message:
move compat splN calls to intr.h where they belong.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amigappc/include/intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amigappc/include/psl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amigappc/include/intr.h
diff -u src/sys/arch/amigappc/include/intr.h:1.25 src/sys/arch/amigappc/include/intr.h:1.26
--- src/sys/arch/amigappc/include/intr.h:1.25 Fri Jun 17 23:36:17 2011
+++ src/sys/arch/amigappc/include/intr.h Sun Jun 19 08:00:56 2011
@@ -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_ */
Index: src/sys/arch/amigappc/include/psl.h
diff -u src/sys/arch/amigappc/include/psl.h:1.3 src/sys/arch/amigappc/include/psl.h:1.4
--- src/sys/arch/amigappc/include/psl.h:1.3 Tue Feb 2 19:16:57 2010
+++ src/sys/arch/amigappc/include/psl.h Sun Jun 19 08:00:56 2011
@@ -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_ */
