Module Name: src
Committed By: kiyohara
Date: Sun Apr 25 12:26:07 UTC 2010
Modified Files:
src/sys/arch/powerpc/include: intr.h
src/sys/arch/rs6000/include: intr.h
Log Message:
Fix forgot to commit.
Support 64-bit imask for powerpc/pic.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/intr.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/include/intr.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/powerpc/include/intr.h
diff -u src/sys/arch/powerpc/include/intr.h:1.4 src/sys/arch/powerpc/include/intr.h:1.5
--- src/sys/arch/powerpc/include/intr.h:1.4 Tue Apr 29 06:53:02 2008
+++ src/sys/arch/powerpc/include/intr.h Sun Apr 25 12:26:07 2010
@@ -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
Index: src/sys/arch/rs6000/include/intr.h
diff -u src/sys/arch/rs6000/include/intr.h:1.2 src/sys/arch/rs6000/include/intr.h:1.3
--- src/sys/arch/rs6000/include/intr.h:1.2 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/rs6000/include/intr.h Sun Apr 25 12:26:07 2010
@@ -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 */
