[src/trunk]: src/sys/arch Fix forgot to commit.

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

details:   https://anonhg.NetBSD.org/src/rev/2971dde3bcc3
branches:  trunk
changeset: 754267:2971dde3bcc3
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sun Apr 25 12:26:07 2010 +0000

description:
Fix forgot to commit.
  Support 64-bit imask for powerpc/pic.

diffstat:

 sys/arch/powerpc/include/intr.h |  15 ++++++++++++---
 sys/arch/rs6000/include/intr.h  |   3 +--
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 9a61dd8d0899 -r 2971dde3bcc3 sys/arch/powerpc/include/intr.h
--- a/sys/arch/powerpc/include/intr.h   Sun Apr 25 11:49:22 2010 +0000
+++ b/sys/arch/powerpc/include/intr.h   Sun Apr 25 12:26:07 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.4 2008/04/29 06:53:02 martin Exp $ */
+/*     $NetBSD: intr.h,v 1.5 2010/04/25 12:26:07 kiyohara Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.4 2008/04/29 06:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.5 2010/04/25 12:26:07 kiyohara Exp $");
 
 #ifndef POWERPC_INTR_MACHDEP_H
 #define POWERPC_INTR_MACHDEP_H
@@ -72,7 +72,16 @@
 void splx(int);
 void softintr(int);
 
-extern int imask[];
+typedef u_int imask_t;
+extern imask_t imask[];
+
+#define NVIRQ          32      /* 32 virtual IRQs */
+#define NIRQ           128     /* up to 128 HW IRQs */
+
+#define HWIRQ_MAX       (NVIRQ - 5 - 1)
+#define HWIRQ_MASK      0x07ffffff
+
+#define MS_PENDING(p)  (31 - cntlzw(p))
 
 /* Soft interrupt masks. */
 #define SIR_CLOCK      27
diff -r 9a61dd8d0899 -r 2971dde3bcc3 sys/arch/rs6000/include/intr.h
--- a/sys/arch/rs6000/include/intr.h    Sun Apr 25 11:49:22 2010 +0000
+++ b/sys/arch/rs6000/include/intr.h    Sun Apr 25 12:26:07 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.2 2008/04/28 20:23:34 martin Exp $  */
+/*     $NetBSD: intr.h,v 1.3 2010/04/25 12:26:07 kiyohara Exp $        */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,6 @@
 #include <sys/device.h>
 
 #define        ICU_LEN                 16
-extern int imask[];
 
 #endif /* _LOCORE */