Module Name: src
Committed By: matt
Date: Sat Mar 5 14:04:03 UTC 2011
Modified Files:
src/sys/arch/algor/algor: algor_p6032_intr.c algor_p6032var.h
Log Message:
Fix prototype of algor_p6032_iointr.
Fix buffer overrun ( PR algor/42176 ).
Constify a few things.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/algor/algor/algor_p6032_intr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/algor/algor/algor_p6032var.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/algor/algor/algor_p6032_intr.c
diff -u src/sys/arch/algor/algor/algor_p6032_intr.c:1.17 src/sys/arch/algor/algor/algor_p6032_intr.c:1.18
--- src/sys/arch/algor/algor/algor_p6032_intr.c:1.17 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/algor/algor_p6032_intr.c Sat Mar 5 14:04:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_intr.c,v 1.17 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: algor_p6032_intr.c,v 1.18 2011/03/05 14:04:02 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.17 2011/02/20 07:51:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.18 2011/03/05 14:04:02 matt Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -85,7 +85,7 @@
#define NIRQMAPS 10
-const char *p6032_intrnames[NIRQMAPS] = {
+const char * const p6032_intrnames[NIRQMAPS] = {
"gpin 0",
"gpin 1",
"gpin 2",
@@ -167,7 +167,7 @@
};
struct p6032_cpuintr p6032_cpuintrs[NINTRS];
-const char *p6032_cpuintrnames[NINTRS] = {
+const char * const p6032_cpuintrnames[NINTRS] = {
"int 0 (pci)",
"int 1 (isa)",
};
@@ -198,7 +198,7 @@
EVCNT_TYPE_INTR, NULL, "mips", p6032_cpuintrnames[i]);
}
- for (i = 0; i <= NIRQMAPS; i++) {
+ for (i = 0; i < __arraycount(p6032_irqmap); i++) {
irqmap = &p6032_irqmap[i];
evcnt_attach_dynamic(&p6032_intrtab[i].intr_count,
Index: src/sys/arch/algor/algor/algor_p6032var.h
diff -u src/sys/arch/algor/algor/algor_p6032var.h:1.2 src/sys/arch/algor/algor/algor_p6032var.h:1.3
--- src/sys/arch/algor/algor/algor_p6032var.h:1.2 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/algor/algor_p6032var.h Sat Mar 5 14:04:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032var.h,v 1.2 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: algor_p6032var.h,v 1.3 2011/03/05 14:04:02 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
void algor_p6032_intr_init(struct p6032_config *);
-void algor_p6032_iointr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void algor_p6032_iointr(int, vaddr_t, uint32_t);
void algor_p6032_cal_timer(bus_space_tag_t, bus_space_handle_t);
#endif /* _KERNEL */
