diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-07-02 14:00:44 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-07-02 14:00:44 +0000 |
| commit | 1c3cd801b4e596df43e6d0da9ae496a920dddaab (patch) | |
| tree | 707d968273304cc8b9094ba0e5ead6256affb763 /sys/arch/mvme88k/dev/dart.c | |
| parent | 16f5556628dee2b11b2c7638e54a4328abc98d40 (diff) | |
Switch mvme88k to evcount, but keep maintaining intrcnt[] too for now.
Diffstat (limited to 'sys/arch/mvme88k/dev/dart.c')
| -rw-r--r-- | sys/arch/mvme88k/dev/dart.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c index a613a5a10b6..8175665d6e4 100644 --- a/sys/arch/mvme88k/dev/dart.c +++ b/sys/arch/mvme88k/dev/dart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dart.c,v 1.33 2004/04/24 19:51:47 miod Exp $ */ +/* $OpenBSD: dart.c,v 1.34 2004/07/02 14:00:43 miod Exp $ */ /* * Mach Operating System @@ -36,6 +36,7 @@ #include <sys/device.h> #include <sys/simplelock.h> #include <sys/syslog.h> +#include <sys/evcount.h> #include <machine/asm_macro.h> /* enable/disable interrupts */ #include <machine/autoconf.h> @@ -73,7 +74,7 @@ struct dart_info { struct dartsoftc { struct device sc_dev; - struct evcnt sc_intrcnt; + struct evcount sc_intrcnt; union dartreg *dart_reg; union dart_pt_io *port_reg[NDARTPORTS]; struct dart_info sc_dart[NDARTPORTS]; @@ -307,7 +308,8 @@ dartattach(parent, self, aux) sc->sc_ih.ih_ipl = ca->ca_ipl; sysconintr_establish(SYSCV_SCC, &sc->sc_ih); - evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt); + evcount_attach(&sc->sc_intrcnt, self->dv_xname, + (void *)&sc->sc_ih.ih_ipl, &evcount_intr); printf("\n"); } @@ -1098,6 +1100,8 @@ dartintr(arg) isr &= dart_sv_reg.sv_imr; if (isr) { /* interrupt from this duart */ + sc->sc_intrcnt.ec_count++; + if (isr & IIPCHG) { unsigned int ip = addr->read.rd_ip; unsigned int ipcr = addr->read.rd_ipcr; |