[src/trunk]: src/sys/arch/evbmips/evbmips always set up a clockframe and make...

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

details:   https://anonhg.NetBSD.org/src/rev/9e11b389b7b3
branches:  trunk
changeset: 786824:9e11b389b7b3
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue May 14 09:16:59 2013 +0000

description:
always set up a clockframe and make it available to other drivers, so clocks
other than the MIPS cycle counter can be used ( for example pwmclock )

diffstat:

 sys/arch/evbmips/evbmips/interrupt.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 22261b30de38 -r 9e11b389b7b3 sys/arch/evbmips/evbmips/interrupt.c
--- a/sys/arch/evbmips/evbmips/interrupt.c      Tue May 14 05:18:11 2013 +0000
+++ b/sys/arch/evbmips/evbmips/interrupt.c      Tue May 14 09:16:59 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: interrupt.c,v 1.18 2011/09/27 01:02:33 jym Exp $       */
+/*     $NetBSD: interrupt.c,v 1.19 2013/05/14 09:16:59 macallan Exp $  */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.18 2011/09/27 01:02:33 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.19 2013/05/14 09:16:59 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -40,6 +40,8 @@
 #include <mips/locore.h>
 #include <mips/mips3_clock.h>
 
+struct clockframe cf;
+
 void
 intr_init(void)
 {
@@ -69,15 +71,15 @@
                    "%s: cpl (%d) != ipl (%d)", __func__, ci->ci_cpl, ipl);
                KASSERT(pending != 0);
 
+               cf.pc = pc;
+               cf.sr = status;
+               cf.intr = (ci->ci_idepth > 1);
+
                if (pending & MIPS_INT_MASK_5) {
-                       struct clockframe cf;
                        KASSERTMSG(ipl == IPL_SCHED,
                            "%s: ipl (%d) != IPL_SCHED (%d)",
                             __func__, ipl, IPL_SCHED);
                        /* call the common MIPS3 clock interrupt handler */ 
-                       cf.pc = pc;
-                       cf.sr = status;
-                       cf.intr = (ci->ci_idepth > 1);
                        mips3_clockintr(&cf);
                        pending ^= MIPS_INT_MASK_5;
                }