diff options
| author | Hugh Graham <hugh@cvs.openbsd.org> | 2001-08-25 13:33:38 +0000 |
|---|---|---|
| committer | Hugh Graham <hugh@cvs.openbsd.org> | 2001-08-25 13:33:38 +0000 |
| commit | 2f9f539a801e8c00430eacc3a70495465ca02e4e (patch) | |
| tree | a8c95a4e7bd59da4baa2c4974425216c11ff94b4 /sys/arch/vax/qbus/dz_uba.c | |
| parent | 1195029145310bb1c26d5da6e89f13372126bc9b (diff) | |
Bring in some useful stuff from NetBSD. Mostly work by Matt Thomas,
and concerned with intvec counting. Also some ANSIfication.
Diffstat (limited to 'sys/arch/vax/qbus/dz_uba.c')
| -rw-r--r-- | sys/arch/vax/qbus/dz_uba.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/vax/qbus/dz_uba.c b/sys/arch/vax/qbus/dz_uba.c index d9595840a52..910e6fe9285 100644 --- a/sys/arch/vax/qbus/dz_uba.c +++ b/sys/arch/vax/qbus/dz_uba.c @@ -1,5 +1,5 @@ -/* $OpenBSD: dz_uba.c,v 1.1 2000/04/27 03:14:47 bjc Exp $ */ -/* $NetBSD: dz_uba.c,v 1.8 2000/01/24 02:40:29 matt Exp $ */ +/* $OpenBSD: dz_uba.c,v 1.2 2001/08/25 13:33:37 hugh 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. * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. @@ -74,7 +74,7 @@ dz_uba_match(parent, cf, aux) struct uba_attach_args *ua = aux; bus_space_tag_t iot = ua->ua_iot; bus_space_handle_t ioh = ua->ua_ioh; - register int n; + int n; iot = iot; /* Silly GCC */ /* Reset controller to initialize, enable TX interrupts */ @@ -113,7 +113,7 @@ dz_uba_attach(parent, self, aux) void *aux; { struct dz_softc *sc = (void *)self; - register struct uba_attach_args *ua = aux; + struct uba_attach_args *ua = aux; sc->sc_iot = ua->ua_iot; sc->sc_ioh = ua->ua_ioh; @@ -130,8 +130,11 @@ dz_uba_attach(parent, self, aux) sc->sc_type = DZ_DZ; /* Now register the TX & RX interrupt handlers */ - uba_intr_establish(ua->ua_icookie, ua->ua_cvec, dzxint, sc); - uba_intr_establish(ua->ua_icookie, ua->ua_cvec - 4, dzrint, sc); + uba_intr_establish(ua->ua_icookie, ua->ua_cvec, + dzxint, sc, &sc->sc_tintrcnt); + uba_intr_establish(ua->ua_icookie, ua->ua_cvec - 4, + dzrint, sc, &sc->sc_rintrcnt); + uba_reset_establish(dzreset, self); dzattach(sc); } |