Module Name: src
Committed By: cliff
Date: Thu Jun 10 17:40:20 UTC 2010
Modified Files:
src/sys/arch/sbmips/include [matt-nb5-mips64]: systemsw.h
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: sb1250_icu.c
Log Message:
seperate initializing spl is from initizlizing the PIC:
setting ipl_sr_map is moved from sb1250_icu_init to sb1250_ipl_map_init.
To generate a diff of this commit:
cvs rdiff -u -r1.7.28.5 -r1.7.28.6 src/sys/arch/sbmips/include/systemsw.h
cvs rdiff -u -r1.9.36.14 -r1.9.36.15 src/sys/arch/sbmips/sbmips/sb1250_icu.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/sbmips/include/systemsw.h
diff -u src/sys/arch/sbmips/include/systemsw.h:1.7.28.5 src/sys/arch/sbmips/include/systemsw.h:1.7.28.6
--- src/sys/arch/sbmips/include/systemsw.h:1.7.28.5 Thu Mar 11 08:20:59 2010
+++ src/sys/arch/sbmips/include/systemsw.h Thu Jun 10 17:40:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: systemsw.h,v 1.7.28.5 2010/03/11 08:20:59 matt Exp $ */
+/* $NetBSD: systemsw.h,v 1.7.28.6 2010/06/10 17:40:20 cliff Exp $ */
/*
* Copyright 2000, 2001
@@ -58,6 +58,7 @@
void sb1250_icu_init(void);
struct cpu_softc;
void sb1250_cpu_init(struct cpu_softc *);
+void sb1250_ipl_map_init(void);
#define cpu_intr_establish(n,s,f,a) ((*systemsw.s_intr_establish)(n,s,f,a))
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.14 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.15
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.14 Sun May 16 00:34:45 2010
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Thu Jun 10 17:40:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.9.36.14 2010/05/16 00:34:45 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.9.36.15 2010/06/10 17:40:20 cliff Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.14 2010/05/16 00:34:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.15 2010/06/10 17:40:20 cliff Exp $");
#define __INTR_PRIVATE
@@ -238,11 +238,17 @@
}
void
+sb1250_ipl_map_init(void)
+{
+ ipl_sr_map = sb1250_ipl_sr_map;
+}
+
+void
sb1250_icu_init(void)
{
const uint64_t imr_all = 0xffffffffffffffffULL;
- ipl_sr_map = sb1250_ipl_sr_map;
+ KASSERT(memcmp((const void *)&ipl_sr_map, (const void *)&sb1250_ipl_sr_map, sizeof(ipl_sr_map)) == 0);
/* zero out the list of used interrupts/lines */
memset(ints_for_ipl, 0, sizeof ints_for_ipl);
