Module Name: src
Committed By: matt
Date: Sat Feb 6 02:59:04 UTC 2010
Modified Files:
src/sys/arch/evbmips/malta [matt-nb5-mips64]: malta_intr.c
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_intr.c
Log Message:
A little constification and remove some old softintr cruft.
To generate a diff of this commit:
cvs rdiff -u -r1.19.16.1 -r1.19.16.2 src/sys/arch/evbmips/malta/malta_intr.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/rmi/rmixl_intr.c
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/evbmips/malta/malta_intr.c
diff -u src/sys/arch/evbmips/malta/malta_intr.c:1.19.16.1 src/sys/arch/evbmips/malta/malta_intr.c:1.19.16.2
--- src/sys/arch/evbmips/malta/malta_intr.c:1.19.16.1 Wed Jan 20 09:04:33 2010
+++ src/sys/arch/evbmips/malta/malta_intr.c Sat Feb 6 02:59:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: malta_intr.c,v 1.19.16.1 2010/01/20 09:04:33 matt Exp $ */
+/* $NetBSD: malta_intr.c,v 1.19.16.2 2010/02/06 02:59:04 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: malta_intr.c,v 1.19.16.1 2010/01/20 09:04:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malta_intr.c,v 1.19.16.2 2010/02/06 02:59:04 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -82,16 +82,6 @@
MIPS_INT_MASK_5,
};
-/*
- * This is a mask of bits to clear in the SR when we go to a
- * given software interrupt priority level.
- * Hardware ipls are port/board specific.
- */
-const uint32_t mips_ipl_si_to_sr[2] = {
- MIPS_SOFT_INT_MASK_0,
- MIPS_SOFT_INT_MASK_1, /* XXX is this right with the new softints? */
-};
-
struct malta_cpuintr {
LIST_HEAD(, evbmips_intrhand) cintr_list;
struct evcnt cintr_count;
@@ -99,7 +89,7 @@
#define NINTRS 5 /* MIPS INT0 - INT4 */
struct malta_cpuintr malta_cpuintrs[NINTRS];
-const char *malta_cpuintrnames[NINTRS] = {
+const char * const malta_cpuintrnames[NINTRS] = {
"int 0 (piix4)",
"int 1 (smi)",
"int 2 (uart)",
Index: src/sys/arch/mips/rmi/rmixl_intr.c
diff -u src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.8 src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.9
--- src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.8 Fri Jan 29 00:24:14 2010
+++ src/sys/arch/mips/rmi/rmixl_intr.c Sat Feb 6 02:59:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.c,v 1.1.2.8 2010/01/29 00:24:14 cliff Exp $ */
+/* $NetBSD: rmixl_intr.c,v 1.1.2.9 2010/02/06 02:59:04 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.8 2010/01/29 00:24:14 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.9 2010/02/06 02:59:04 matt Exp $");
#include "opt_ddb.h"
@@ -137,7 +137,7 @@
* - use for XLS1xx, XLS2xx, XLS4xx-Lite
*/
#define NIRQS 32
-static const char *rmixl_irqnames_xls1xx[NIRQS] = {
+static const char * const rmixl_irqnames_xls1xx[NIRQS] = {
"int 0 (watchdog)", /* 0 */
"int 1 (timer0)", /* 1 */
"int 2 (timer1)", /* 2 */
@@ -176,7 +176,7 @@
* rmixl_irqnames_xls4xx:
* - use for XLS4xx, XLS6xx
*/
-static const char *rmixl_irqnames_xls4xx[NIRQS] = {
+static const char * const rmixl_irqnames_xls4xx[NIRQS] = {
"int 0 (watchdog)", /* 0 */
"int 1 (timer0)", /* 1 */
"int 2 (timer1)", /* 2 */
@@ -215,7 +215,7 @@
* rmixl_irqnames_generic:
* - use for unknown cpu implementation
*/
-static const char *rmixl_irqnames_generic[NIRQS] = {
+static const char * const rmixl_irqnames_generic[NIRQS] = {
"int 0", /* 0 */
"int 1", /* 1 */
"int 2", /* 2 */
