diff options
| author |   miod <miod@openbsd.org> | 2010-09-22 12:36:32 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2010-09-22 12:36:32 +0000 |
| commit | b1f3983140446bafae724a514300ddcdbd406f31 (patch) | |
| tree | ddd376e1c0c28513ba62de8930559c0e30d7da13 /sys/dev/tc | |
| parent | regress test for each of the key exchange algorithms that we support (diff) | |
| download | wireguard-openbsd-b1f3983140446bafae724a514300ddcdbd406f31.tar.xz wireguard-openbsd-b1f3983140446bafae724a514300ddcdbd406f31.zip | |
Revert previous and let drivers register counterless interrupts;
tc_intr_disestablish() prototype is changed to carry information whether the
counter needs to be detached or not.
This does not matter much since no driver ever calls tc_intr_disestablish().
Diffstat (limited to 'sys/dev/tc')
| -rw-r--r-- | sys/dev/tc/tc.c | 7 | ||||
| -rw-r--r-- | sys/dev/tc/tcvar.h | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c index c2aa1ab5aef..89765bafc6a 100644 --- a/sys/dev/tc/tc.c +++ b/sys/dev/tc/tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc.c,v 1.18 2008/08/09 16:42:30 miod Exp $ */ +/* $OpenBSD: tc.c,v 1.19 2010/09/22 12:36:32 miod Exp $ */ /* $NetBSD: tc.c,v 1.29 2001/11/13 06:26:10 lukem Exp $ */ /* @@ -274,13 +274,14 @@ tc_intr_establish(dev, cookie, level, handler, arg, name) } void -tc_intr_disestablish(dev, cookie) +tc_intr_disestablish(dev, cookie, name) struct device *dev; void *cookie; + const char *name; { struct tc_softc *sc = tc_cd.cd_devs[0]; - (*sc->sc_intr_disestablish)(dev, cookie); + (*sc->sc_intr_disestablish)(dev, cookie, name); } #ifdef TCVERBOSE diff --git a/sys/dev/tc/tcvar.h b/sys/dev/tc/tcvar.h index d5bd23188ac..f9d73392f23 100644 --- a/sys/dev/tc/tcvar.h +++ b/sys/dev/tc/tcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcvar.h,v 1.14 2008/08/09 16:42:30 miod Exp $ */ +/* $OpenBSD: tcvar.h,v 1.15 2010/09/22 12:36:32 miod Exp $ */ /* $NetBSD: tcvar.h,v 1.17 2000/06/04 19:15:15 cgd Exp $ */ /* @@ -52,7 +52,7 @@ struct tc_softc { void (*sc_intr_establish)(struct device *, void *, int, int (*)(void *), void *, const char *); - void (*sc_intr_disestablish)(struct device *, void *); + void (*sc_intr_disestablish)(struct device *, void *, const char *); bus_dma_tag_t (*sc_get_dma_tag)(int); }; @@ -74,7 +74,7 @@ struct tcbus_attach_args { /* TC bus resource management; XXX will move elsewhere eventually. */ void (*tba_intr_establish)(struct device *, void *, int, int (*)(void *), void *, const char *); - void (*tba_intr_disestablish)(struct device *, void *); + void (*tba_intr_disestablish)(struct device *, void *, const char *); bus_dma_tag_t (*tba_get_dma_tag)(int); }; @@ -122,7 +122,7 @@ void tc_devinfo(const char *, char *, size_t); void tcattach(struct device *, struct device *, void *); void tc_intr_establish(struct device *, void *, int, int (*)(void *), void *, const char *); -void tc_intr_disestablish(struct device *, void *); +void tc_intr_disestablish(struct device *, void *, const char *); /* * Easy to remember names for TURBOchannel device locators. |