[src/trunk]: src/sys/arch/evbmips Keep the knowledge of the H/W interrupt 5 e...

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

details:   https://anonhg.NetBSD.org/src/rev/7f3edf27e617
branches:  trunk
changeset: 539182:7f3edf27e617
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sun Nov 10 15:21:51 2002 +0000

description:
Keep the knowledge of the H/W interrupt 5 event counter local to
interrupt.c.  This change also unmasked the fact that the Alchemy
boards did not initialise this counter.

diffstat:

 sys/arch/evbmips/evbmips/interrupt.c |  5 +++--
 sys/arch/evbmips/include/intr.h      |  4 +---
 sys/arch/evbmips/malta/malta_intr.c  |  4 +---
 3 files changed, 5 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r e15d6dae9b68 -r 7f3edf27e617 sys/arch/evbmips/evbmips/interrupt.c
--- a/sys/arch/evbmips/evbmips/interrupt.c      Sun Nov 10 14:28:10 2002 +0000
+++ b/sys/arch/evbmips/evbmips/interrupt.c      Sun Nov 10 15:21:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: interrupt.c,v 1.3 2002/07/29 16:21:03 simonb Exp $     */
+/*     $NetBSD: interrupt.c,v 1.4 2002/11/10 15:21:51 simonb Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -60,6 +60,7 @@
 intr_init(void)
 {
 
+       evcnt_attach_static(&mips_int5_evcnt);
        evbmips_intr_init();    /* board specific stuff */
 
        softintr_init();
@@ -89,7 +90,7 @@
                 * counting again from the current value.
                 */
                if ((next_cp0_clk_intr - new_cnt) & 0x80000000) {
-#if 0
+#if 0  /* XXX - should add an event counter for this */
                        missed_clk_intrs++;
 #endif
 
diff -r e15d6dae9b68 -r 7f3edf27e617 sys/arch/evbmips/include/intr.h
--- a/sys/arch/evbmips/include/intr.h   Sun Nov 10 14:28:10 2002 +0000
+++ b/sys/arch/evbmips/include/intr.h   Sun Nov 10 15:21:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.2 2002/07/29 16:14:05 simonb Exp $  */
+/*     $NetBSD: intr.h,v 1.3 2002/11/10 15:21:52 simonb Exp $  */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -169,8 +169,6 @@
 
 #define        setsoftnet()    softintr_schedule(softnet_intrhand)
 
-extern struct evcnt mips_int5_evcnt;   /* XXX clock XXX */
-
 void   evbmips_intr_init(void);
 void   intr_init(void);
 void   evbmips_iointr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
diff -r e15d6dae9b68 -r 7f3edf27e617 sys/arch/evbmips/malta/malta_intr.c
--- a/sys/arch/evbmips/malta/malta_intr.c       Sun Nov 10 14:28:10 2002 +0000
+++ b/sys/arch/evbmips/malta/malta_intr.c       Sun Nov 10 15:21:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: malta_intr.c,v 1.5 2002/08/29 08:02:35 simonb Exp $    */
+/*     $NetBSD: malta_intr.c,v 1.6 2002/11/10 15:21:52 simonb Exp $    */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -147,8 +147,6 @@
                    EVCNT_TYPE_INTR, NULL, "mips", malta_cpuintrnames[i]);
        }
 
-       evcnt_attach_static(&mips_int5_evcnt);
-
        mcp->mc_pc.pc_intr_v = NULL;
        mcp->mc_pc.pc_intr_map = malta_pci_intr_map;
        mcp->mc_pc.pc_intr_string = malta_pci_intr_string;