Move evcount structures inside struct intrhand, this makes more sense and

gives us more counters in the process.

Also clean up intrhand structures and usage, especially move them to SLISTs.

1 files changed, 2 insertions, 10 deletions

diff --git a/sys/arch/mvme88k/dev/osiop_pcctwo.c b/sys/arch/mvme88k/dev/osiop_pcctwo.c
index 8d2eabc4be4..518a5dd24ff 100644
--- a/sys/arch/mvme88k/dev/osiop_pcctwo.c
+++ b/sys/arch/mvme88k/dev/osiop_pcctwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop_pcctwo.c,v 1.2 2004/07/02 14:00:43 miod Exp $	*/
+/*	$OpenBSD: osiop_pcctwo.c,v 1.3 2004/07/30 19:02:06 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -29,7 +29,6 @@
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/dkstat.h>
-#include <sys/evcount.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
@@ -54,7 +53,6 @@ int	osiop_pcctwo_match(struct device *, void *, void *);
 struct osiop_pcctwo_softc {
 	struct osiop_softc sc_osiop;
 	struct intrhand sc_ih;
-	struct evcount sc_intrcnt;
 };
 
 struct cfattach osiop_pcctwo_ca = {
@@ -160,18 +158,14 @@ osiop_pcctwo_attach(struct device *parent, struct device *self, void *aux)
 	psc->sc_ih.ih_ipl = ca->ca_ipl;
 
 	/* enable device interrupts */
-	pcctwointr_establish(PCC2V_SCSI, &psc->sc_ih);
+	pcctwointr_establish(PCC2V_SCSI, &psc->sc_ih, self->dv_xname);
 	bus_space_write_1(pcctwo->sc_iot, pcctwo->sc_ioh,
 	    PCCTWO_SCSIICR, PCC2_IRQ_IEN | (ca->ca_ipl & PCC2_IRQ_IPL));
-
-	evcount_attach(&psc->sc_intrcnt, self->dv_xname,
-	    (void *)&psc->sc_ih.ih_ipl, &evcount_intr);
 }
 
 int
 osiop_pcctwo_intr(void *arg)
 {
-	struct osiop_pcctwo_softc *psc = arg;
 	struct osiop_softc *sc = arg;
 	u_int8_t istat;
 
@@ -182,8 +176,6 @@ osiop_pcctwo_intr(void *arg)
 	if ((istat & (OSIOP_ISTAT_SIP | OSIOP_ISTAT_DIP)) == 0)
 		return 0;
 
-	psc->sc_intrcnt.ec_count++;
-
 	/*
 	 * 53c710 manual recommends reading dstat and sstat0 at least
 	 * 12 clk cycles apart if reading as bytes (which is what