summaryrefslogtreecommitdiff
path: root/sys/arch/vax
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/vax')
-rw-r--r--sys/arch/vax/if/if_le.c5
-rw-r--r--sys/arch/vax/if/if_qe.c5
-rw-r--r--sys/arch/vax/if/if_ze.c5
-rw-r--r--sys/arch/vax/mbus/mbus.c4
-rw-r--r--sys/arch/vax/qbus/dhu.c8
-rw-r--r--sys/arch/vax/qbus/dz_uba.c8
-rw-r--r--sys/arch/vax/qbus/uda.c5
-rw-r--r--sys/arch/vax/vax/clock.c4
-rw-r--r--sys/arch/vax/vsa/asc_vsbus.c5
-rw-r--r--sys/arch/vax/vsa/dz_ibus.c8
-rw-r--r--sys/arch/vax/vsa/hdc9224.c5
-rw-r--r--sys/arch/vax/vsa/if_le_vsbus.c5
-rw-r--r--sys/arch/vax/vsa/if_ze_vsbus.c5
-rw-r--r--sys/arch/vax/vsa/ncr.c5
-rw-r--r--sys/arch/vax/vxt/vxtbus.c4
15 files changed, 33 insertions, 48 deletions
diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c
index bedd2e4010d..9a1f4a18ea8 100644
--- a/sys/arch/vax/if/if_le.c
+++ b/sys/arch/vax/if/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.16 2008/10/22 23:04:45 mpf Exp $ */
+/* $OpenBSD: if_le.c,v 1.17 2010/09/20 06:33:47 matthew Exp $ */
/* $NetBSD: if_le.c,v 1.14 1999/08/14 18:40:23 ragge Exp $ */
/*-
@@ -174,8 +174,7 @@ le_ibus_attach(parent, self, aux)
return;
scb_vecalloc(sc->sc_vec, (void *)am7990_intr, sc,
SCB_ISTACK, &sc->sc_intrcnt);
- evcount_attach(&sc->sc_intrcnt, self->dv_xname,
- (void *)&sc->sc_vec, &evcount_intr);
+ evcount_attach(&sc->sc_intrcnt, self->dv_xname, &sc->sc_vec);
printf(": vec %d ipl %x\n%s", sc->sc_vec, br, self->dv_xname);
/*
diff --git a/sys/arch/vax/if/if_qe.c b/sys/arch/vax/if/if_qe.c
index dfd60210414..7d815f78543 100644
--- a/sys/arch/vax/if/if_qe.c
+++ b/sys/arch/vax/if/if_qe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_qe.c,v 1.24 2008/11/28 02:44:17 brad Exp $ */
+/* $OpenBSD: if_qe.c,v 1.25 2010/09/20 06:33:47 matthew Exp $ */
/* $NetBSD: if_qe.c,v 1.51 2002/06/08 12:28:37 ragge Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -314,8 +314,7 @@ qeattach(struct device *parent, struct device *self, void *aux)
uba_intr_establish(ua->ua_icookie, ua->ua_cvec, qeintr,
sc, &sc->sc_intrcnt);
sc->sc_cvec = ua->ua_cvec;
- evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_cvec, &evcount_intr);
+ evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname, &sc->sc_cvec);
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, sizeof ifp->if_xname);
ifp->if_softc = sc;
diff --git a/sys/arch/vax/if/if_ze.c b/sys/arch/vax/if/if_ze.c
index 51f8dd5db85..ca78bd5e1e7 100644
--- a/sys/arch/vax/if/if_ze.c
+++ b/sys/arch/vax/if/if_ze.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ze.c,v 1.8 2008/08/22 17:09:06 deraadt Exp $ */
+/* $OpenBSD: if_ze.c,v 1.9 2010/09/20 06:33:47 matthew Exp $ */
/* $NetBSD: if_ze.c,v 1.3 2000/01/24 02:54:03 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -127,8 +127,7 @@ zeattach(parent, self, aux)
scb_vecalloc(SGECVEC, (void (*)(void *)) sgec_intr, sc,
SCB_ISTACK, &sc->sc_intrcnt);
- evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_intvec, &evcount_intr);
+ evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname, &sc->sc_intvec);
sgec_attach(sc);
}
diff --git a/sys/arch/vax/mbus/mbus.c b/sys/arch/vax/mbus/mbus.c
index 92fdd1799f7..5a4aad494fb 100644
--- a/sys/arch/vax/mbus/mbus.c
+++ b/sys/arch/vax/mbus/mbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbus.c,v 1.2 2008/09/22 19:45:35 miod Exp $ */
+/* $OpenBSD: mbus.c,v 1.3 2010/09/20 06:33:48 matthew Exp $ */
/*
* Copyright (c) 2008 Miodrag Vallat.
@@ -403,7 +403,7 @@ mbus_intr_establish(unsigned int vec, int ipl, int (*fn)(void *), void *arg,
fi->fi_fn = fn;
fi->fi_arg = arg;
fi->fi_ipl = ipl;
- evcount_attach(&fi->fi_cnt, name, &fi->fi_ipl, &evcount_intr);
+ evcount_attach(&fi->fi_cnt, name, &fi->fi_ipl);
fbicirq = MBUS_VECTOR_TO_IRQ(vec);
fbic->firq[fbicirq] = fi;
diff --git a/sys/arch/vax/qbus/dhu.c b/sys/arch/vax/qbus/dhu.c
index 04b2ee25c24..5eb6aac05dd 100644
--- a/sys/arch/vax/qbus/dhu.c
+++ b/sys/arch/vax/qbus/dhu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhu.c,v 1.18 2010/07/02 17:27:01 nicm Exp $ */
+/* $OpenBSD: dhu.c,v 1.19 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: dhu.c,v 1.19 2000/06/04 06:17:01 matt Exp $ */
/*
* Copyright (c) 2003, Hugh Graham.
@@ -261,11 +261,9 @@ dhu_attach(parent, self, aux)
dhuxint, sc, &sc->sc_tintrcnt);
sc->sc_rcvec = ua->ua_cvec;
- evcount_attach(&sc->sc_rintrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_rcvec, &evcount_intr);
+ evcount_attach(&sc->sc_rintrcnt, sc->sc_dev.dv_xname, &sc->sc_rcvec);
sc->sc_tcvec = ua->ua_cvec + 4;
- evcount_attach(&sc->sc_tintrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_tcvec, &evcount_intr);
+ evcount_attach(&sc->sc_tintrcnt, sc->sc_dev.dv_xname, &sc->sc_tcvec);
}
/* Receiver Interrupt */
diff --git a/sys/arch/vax/qbus/dz_uba.c b/sys/arch/vax/qbus/dz_uba.c
index 5c64cc823f2..151c29865f9 100644
--- a/sys/arch/vax/qbus/dz_uba.c
+++ b/sys/arch/vax/qbus/dz_uba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dz_uba.c,v 1.6 2006/07/29 17:06:27 miod Exp $ */
+/* $OpenBSD: dz_uba.c,v 1.7 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: dz_uba.c,v 1.11 2000/06/04 06:17:02 matt Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -138,10 +138,8 @@ dz_uba_attach(parent, self, aux)
dzrint, sc, &sc->sc_rintrcnt);
uba_reset_establish(dzreset, self);
- evcount_attach(&sc->sc_rintrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_rcvec, &evcount_intr);
- evcount_attach(&sc->sc_tintrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_tcvec, &evcount_intr);
+ evcount_attach(&sc->sc_rintrcnt, sc->sc_dev.dv_xname, &sc->sc_rcvec);
+ evcount_attach(&sc->sc_tintrcnt, sc->sc_dev.dv_xname, &sc->sc_tcvec);
dzattach(sc);
}
diff --git a/sys/arch/vax/qbus/uda.c b/sys/arch/vax/qbus/uda.c
index 41df2a07364..1db6997767d 100644
--- a/sys/arch/vax/qbus/uda.c
+++ b/sys/arch/vax/qbus/uda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uda.c,v 1.7 2009/12/16 06:56:40 deraadt Exp $ */
+/* $OpenBSD: uda.c,v 1.8 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: uda.c,v 1.36 2000/06/04 06:17:05 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -200,8 +200,7 @@ udaattach(parent, self, aux)
udaintr, sc, &sc->sc_intrcnt);
uba_reset_establish(udareset, &sc->sc_dev);
sc->sc_cvec = ua->ua_cvec;
- evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_cvec, &evcount_intr);
+ evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname, &sc->sc_cvec);
sc->sc_iot = ua->ua_iot;
sc->sc_iph = ua->ua_ioh;
diff --git a/sys/arch/vax/vax/clock.c b/sys/arch/vax/vax/clock.c
index 085e580f1d7..4233ff11812 100644
--- a/sys/arch/vax/vax/clock.c
+++ b/sys/arch/vax/vax/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.21 2008/08/18 23:19:29 miod Exp $ */
+/* $OpenBSD: clock.c,v 1.22 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: clock.c,v 1.35 2000/06/04 06:16:58 matt Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -177,7 +177,7 @@ cpu_initclocks()
if (vax_boardtype != VAX_BTYP_VXT)
mtpr(-10000, PR_NICR); /* Load in count register */
mtpr(0x800000d1, PR_ICCS); /* Start clock and enable interrupt */
- evcount_attach(&clock_intrcnt, "clock", NULL, &evcount_intr);
+ evcount_attach(&clock_intrcnt, "clock", NULL);
}
/*
diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c
index 204d9ad0c01..d9251583c2f 100644
--- a/sys/arch/vax/vsa/asc_vsbus.c
+++ b/sys/arch/vax/vsa/asc_vsbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asc_vsbus.c,v 1.12 2010/06/28 18:31:01 krw Exp $ */
+/* $OpenBSD: asc_vsbus.c,v 1.13 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: asc_vsbus.c,v 1.22 2001/02/04 20:36:32 ragge Exp $ */
/*-
@@ -263,8 +263,7 @@ asc_vsbus_attach(struct device *parent, struct device *self, void *aux)
scb_vecalloc(va->va_cvec, (void (*)(void *)) ncr53c9x_intr,
&asc->sc_ncr53c9x, SCB_ISTACK, &asc->sc_intrcnt);
asc->sc_cvec = va->va_cvec;
- evcount_attach(&asc->sc_intrcnt, self->dv_xname,
- (void *)&asc->sc_cvec, &evcount_intr);
+ evcount_attach(&asc->sc_intrcnt, self->dv_xname, &asc->sc_cvec);
/*
* XXX More of this should be in ncr53c9x_attach(), but
diff --git a/sys/arch/vax/vsa/dz_ibus.c b/sys/arch/vax/vsa/dz_ibus.c
index fdf3c3e8214..df0f64de58c 100644
--- a/sys/arch/vax/vsa/dz_ibus.c
+++ b/sys/arch/vax/vsa/dz_ibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dz_ibus.c,v 1.27 2008/08/24 14:52:08 miod Exp $ */
+/* $OpenBSD: dz_ibus.c,v 1.28 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: dz_ibus.c,v 1.15 1999/08/27 17:50:42 ragge Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
@@ -147,10 +147,8 @@ dz_vsbus_attach(parent, self, aux)
scb_vecalloc(sc->sc_rcvec, dzxint, sc, SCB_ISTACK, &sc->sc_tintrcnt);
sc->sc_tcvec = va->va_cvec - 4;
scb_vecalloc(sc->sc_tcvec, dzrint, sc, SCB_ISTACK, &sc->sc_rintrcnt);
- evcount_attach(&sc->sc_rintrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_rcvec, &evcount_intr);
- evcount_attach(&sc->sc_tintrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_tcvec, &evcount_intr);
+ evcount_attach(&sc->sc_rintrcnt, sc->sc_dev.dv_xname, &sc->sc_rcvec);
+ evcount_attach(&sc->sc_tintrcnt, sc->sc_dev.dv_xname, &sc->sc_tcvec);
printf("4 lines");
diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c
index a47e356b635..18020d066c5 100644
--- a/sys/arch/vax/vsa/hdc9224.c
+++ b/sys/arch/vax/vsa/hdc9224.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hdc9224.c,v 1.30 2010/09/08 14:47:10 jsing Exp $ */
+/* $OpenBSD: hdc9224.c,v 1.31 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: hdc9224.c,v 1.16 2001/07/26 15:05:09 wiz Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -275,8 +275,7 @@ hdcattach(struct device *parent, struct device *self, void *aux)
* Get interrupt vector, enable instrumentation.
*/
scb_vecalloc(va->va_cvec, hdcintr, sc, SCB_ISTACK, &sc->sc_intrcnt);
- evcount_attach(&sc->sc_intrcnt, self->dv_xname, (void *)va->va_cvec,
- &evcount_intr);
+ evcount_attach(&sc->sc_intrcnt, self->dv_xname, va->va_cvec);
sc->sc_regs = vax_map_physmem(va->va_paddr, 1);
sc->sc_dmabase = (caddr_t)va->va_dmaaddr;
diff --git a/sys/arch/vax/vsa/if_le_vsbus.c b/sys/arch/vax/vsa/if_le_vsbus.c
index c6e046aa3d3..35cedb075cb 100644
--- a/sys/arch/vax/vsa/if_le_vsbus.c
+++ b/sys/arch/vax/vsa/if_le_vsbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le_vsbus.c,v 1.11 2008/06/26 05:42:14 ray Exp $ */
+/* $OpenBSD: if_le_vsbus.c,v 1.12 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: if_le_vsbus.c,v 1.10 2000/06/29 07:14:18 mrg Exp $ */
/*-
@@ -216,8 +216,7 @@ le_vsbus_attach(parent, self, aux)
scb_vecalloc(va->va_cvec, (void (*)(void *)) am7990_intr, sc,
SCB_ISTACK, &sc->sc_intrcnt);
cvec = va->va_cvec;
- evcount_attach(&sc->sc_intrcnt, self->dv_xname,
- (void *)&cvec, &evcount_intr);
+ evcount_attach(&sc->sc_intrcnt, self->dv_xname, &cvec);
/*
* Allocate a (DMA-safe) block for all descriptors and buffers.
diff --git a/sys/arch/vax/vsa/if_ze_vsbus.c b/sys/arch/vax/vsa/if_ze_vsbus.c
index e2bb48319c3..9f0d537af55 100644
--- a/sys/arch/vax/vsa/if_ze_vsbus.c
+++ b/sys/arch/vax/vsa/if_ze_vsbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ze_vsbus.c,v 1.5 2008/08/22 17:09:08 deraadt Exp $ */
+/* $OpenBSD: if_ze_vsbus.c,v 1.6 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: if_ze_vsbus.c,v 1.5 2000/07/26 21:50:49 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -117,8 +117,7 @@ zeattach(parent, self, aux)
sc->sc_intvec = SGECVEC;
scb_vecalloc(va->va_cvec, (void (*)(void *)) sgec_intr,
sc, SCB_ISTACK, &sc->sc_intrcnt);
- evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname,
- (void *)&sc->sc_intvec, &evcount_intr);
+ evcount_attach(&sc->sc_intrcnt, sc->sc_dev.dv_xname, &sc->sc_intvec);
/*
* Map in, read and release ethernet rom address.
diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c
index 1d237775e50..3be30b4692e 100644
--- a/sys/arch/vax/vsa/ncr.c
+++ b/sys/arch/vax/vsa/ncr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr.c,v 1.27 2010/06/28 18:31:01 krw Exp $ */
+/* $OpenBSD: ncr.c,v 1.28 2010/09/20 06:33:48 matthew Exp $ */
/* $NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $ */
/*-
@@ -171,8 +171,7 @@ si_attach(parent, self, aux)
scb_vecalloc(va->va_cvec, (void (*)(void *)) ncr5380_intr, sc,
SCB_ISTACK, &sc->ncr_intrcnt);
sc->ncr_cvec = va->va_cvec;
- evcount_attach(&sc->ncr_intrcnt, self->dv_xname,
- (void *)&sc->ncr_cvec, &evcount_intr);
+ evcount_attach(&sc->ncr_intrcnt, self->dv_xname, &sc->ncr_cvec);
/*
* DMA area mapin.
diff --git a/sys/arch/vax/vxt/vxtbus.c b/sys/arch/vax/vxt/vxtbus.c
index cf60cac08d1..5f676693cd3 100644
--- a/sys/arch/vax/vxt/vxtbus.c
+++ b/sys/arch/vax/vxt/vxtbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vxtbus.c,v 1.2 2006/08/30 19:23:57 miod Exp $ */
+/* $OpenBSD: vxtbus.c,v 1.3 2010/09/20 06:33:48 matthew Exp $ */
/*
* Copyright (c) 2006 Miodrag Vallat.
*
@@ -118,7 +118,7 @@ vxtbus_intr_establish(const char *name, int ipl, int (*fn)(void *), void *arg)
ih->ih_fn = fn;
ih->ih_arg = arg;
ih->ih_vec = VXT_INTRVEC;
- evcount_attach(&ih->ih_cnt, name, (void *)&ih->ih_vec, &evcount_intr);
+ evcount_attach(&ih->ih_cnt, name, &ih->ih_vec);
LIST_INSERT_HEAD(&sc->sc_intrlist, ih, ih_link);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 07:49:19 +0000