diff options
| author |   pirofti <pirofti@openbsd.org> | 2013-11-10 10:22:39 +0000 |
|---|---|---|
| committer | pirofti <pirofti@openbsd.org> | 2013-11-10 10:22:39 +0000 |
| commit | 2ab3f0c04bca83099b45c69228368fdf8b06dbef (patch) | |
| tree | 9726603de6285837df12aceea47d4b376c16c8d1 | |
| parent | Tweak comments to d_secperunit, p_size and p_offset to clearly say (diff) | |
| download | wireguard-openbsd-2ab3f0c04bca83099b45c69228368fdf8b06dbef.tar.xz wireguard-openbsd-2ab3f0c04bca83099b45c69228368fdf8b06dbef.zip | |
Replace sc_dying in favour of usbd_is_dying() and usbd_deactivate().
Okay mpi@
| -rw-r--r-- | sys/dev/usb/umidi.c | 16 | ||||
| -rw-r--r-- | sys/dev/usb/umidivar.h | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index 8bc85cc916a..695f342c05a 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi.c,v 1.37 2013/05/15 08:29:26 ratchov Exp $ */ +/* $OpenBSD: umidi.c,v 1.38 2013/11/10 10:22:39 pirofti Exp $ */ /* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -224,7 +224,7 @@ umidi_attach(struct device *parent, struct device *self, void *aux) return; error: printf("%s: disabled.\n", sc->sc_dev.dv_xname); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); } int @@ -235,7 +235,7 @@ umidi_activate(struct device *self, int act) switch (act) { case DVACT_DEACTIVATE: DPRINTFN(1,("umidi_activate (deactivate)\n")); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); deactivate_all_mididevs(sc); break; } @@ -277,7 +277,7 @@ umidi_open(void *addr, return ENXIO; if (mididev->opened) return EBUSY; - if (sc->sc_dying) + if (usbd_is_dying(sc->sc_udev)) return EIO; mididev->opened = 1; @@ -1161,7 +1161,7 @@ out_jack_output(struct umidi_jack *j, int d) struct umidi_softc *sc = ep->sc; int s; - if (sc->sc_dying) + if (usbd_is_dying(sc->sc_udev)) return 1; if (!j->opened) return 1; @@ -1195,7 +1195,7 @@ out_jack_flush(struct umidi_jack *j) struct umidi_endpoint *ep = j->endpoint; int s; - if (ep->sc->sc_dying || !j->opened) + if (usbd_is_dying(ep->sc->sc_udev) || !j->opened) return; s = splusb(); @@ -1215,7 +1215,7 @@ in_intr(struct usbd_xfer *xfer, void *priv, usbd_status status) struct umidi_endpoint *ep = (struct umidi_endpoint *)priv; struct umidi_jack *jack; - if (ep->sc->sc_dying) + if (usbd_is_dying(ep->sc->sc_udev)) return; usbd_get_xfer_status(xfer, NULL, NULL, &remain, NULL); @@ -1248,7 +1248,7 @@ out_intr(struct usbd_xfer *xfer, void *priv, usbd_status status) struct umidi_jack *j; unsigned pending; - if (sc->sc_dying) + if (usbd_is_dying(sc->sc_udev)) return; ep->used = 0; diff --git a/sys/dev/usb/umidivar.h b/sys/dev/usb/umidivar.h index 3100a3444e5..116d7564013 100644 --- a/sys/dev/usb/umidivar.h +++ b/sys/dev/usb/umidivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: umidivar.h,v 1.15 2013/04/15 09:23:02 mglocker Exp $ */ +/* $OpenBSD: umidivar.h,v 1.16 2013/11/10 10:22:39 pirofti Exp $ */ /* $NetBSD: umidivar.h,v 1.5 2002/09/12 21:00:42 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -105,8 +105,6 @@ struct umidi_softc { struct usbd_interface *sc_iface; struct umidi_quirk *sc_quirk; - int sc_dying; - int sc_out_num_jacks; struct umidi_jack *sc_out_jacks; int sc_in_num_jacks; |