summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k/dev/if_le.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-07-30 22:29:50 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-07-30 22:29:50 +0000
commitf1e4171338c4f3d8dca2bc58e710f5bd11361295 (patch)
tree6ce9165aeabb3c0d9712f7813ca69b0a69157e48 /sys/arch/mvme68k/dev/if_le.c
parent285ab627ce1b536c0946c2a8dd9da91bb7610161 (diff)
Move struct evcount inside struct intrhand, and modernize intrhand
usage; similar to (and from) mvme88k. Also remove unused haltvec structures and related code.
Diffstat (limited to 'sys/arch/mvme68k/dev/if_le.c')
-rw-r--r--sys/arch/mvme68k/dev/if_le.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/mvme68k/dev/if_le.c b/sys/arch/mvme68k/dev/if_le.c
index 0fc0da89488..f9e9f6ea41c 100644
--- a/sys/arch/mvme68k/dev/if_le.c
+++ b/sys/arch/mvme68k/dev/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.28 2004/07/30 09:50:15 miod Exp $ */
+/* $OpenBSD: if_le.c,v 1.29 2004/07/30 22:29:45 miod Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -40,7 +40,6 @@
#include <sys/socket.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/evcount.h>
#include <net/if.h>
@@ -402,19 +401,16 @@ leattach(parent, self, aux)
lesc->sc_ih.ih_fn = vle_intr;
lesc->sc_ih.ih_arg = sc;
lesc->sc_ih.ih_ipl = pri;
- vmeintr_establish(ca->ca_vec + 0, &lesc->sc_ih);
+ vmeintr_establish(ca->ca_vec + 0, &lesc->sc_ih, self->dv_xname);
break;
#if NPCC > 0
case BUS_PCC:
lesc->sc_ih.ih_fn = am7990_intr;
lesc->sc_ih.ih_arg = sc;
lesc->sc_ih.ih_ipl = pri;
- pccintr_establish(PCCV_LE, &lesc->sc_ih);
+ pccintr_establish(PCCV_LE, &lesc->sc_ih, self->dv_xname);
sys_pcc->pcc_leirq = pri | PCC_IRQ_IEN;
break;
#endif
}
-
- evcount_attach(&lesc->sc_intrcnt, self->dv_xname,
- (void *)&lesc->sc_ih.ih_ipl, &evcount_intr);
}