diff options
| author | Andrew Thompson <thompsa@FreeBSD.org> | 2009-06-15 00:33:18 +0000 |
|---|---|---|
| committer | Andrew Thompson <thompsa@FreeBSD.org> | 2009-06-15 00:33:18 +0000 |
| commit | 8437751d864a6b02bef3a914b6dac1bcfb968794 (patch) | |
| tree | 4b81b631b249a903756a500ebc8bef07b76398ef /sys/dev/usb/serial/ufoma.c | |
| parent | b29310a2defa7bc13bc9cf228c5caa1722c852cd (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/serial/ufoma.c')
| -rw-r--r-- | sys/dev/usb/serial/ufoma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c index 9b47f3d0272d4..3e1f13464a778 100644 --- a/sys/dev/usb/serial/ufoma.c +++ b/sys/dev/usb/serial/ufoma.c @@ -366,7 +366,7 @@ ufoma_attach(device_t dev) sc->sc_unit = device_get_unit(dev); mtx_init(&sc->sc_mtx, "ufoma", NULL, MTX_DEF); - usb2_cv_init(&sc->sc_cv, "CWAIT"); + cv_init(&sc->sc_cv, "CWAIT"); device_set_usb2_desc(dev); @@ -475,7 +475,7 @@ ufoma_detach(device_t dev) free(sc->sc_modetable, M_USBDEV); } mtx_destroy(&sc->sc_mtx); - usb2_cv_destroy(&sc->sc_cv); + cv_destroy(&sc->sc_cv); return (0); } @@ -514,7 +514,7 @@ ufoma_cfg_link_state(struct ufoma_softc *sc) usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, sc->sc_modetable, 0, 1000); - error = usb2_cv_timedwait(&sc->sc_cv, &sc->sc_mtx, hz); + error = cv_timedwait(&sc->sc_cv, &sc->sc_mtx, hz); if (error) { DPRINTF("NO response\n"); @@ -536,7 +536,7 @@ ufoma_cfg_activate_state(struct ufoma_softc *sc, uint16_t state) usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000); - error = usb2_cv_timedwait(&sc->sc_cv, &sc->sc_mtx, + error = cv_timedwait(&sc->sc_cv, &sc->sc_mtx, (UFOMA_MAX_TIMEOUT * hz)); if (error) { DPRINTF("No response\n"); @@ -672,7 +672,7 @@ ufoma_intr_callback(struct usb_xfer *xfer) if (!(temp & 0xff)) { DPRINTF("Mode change failed!\n"); } - usb2_cv_signal(&sc->sc_cv); + cv_signal(&sc->sc_cv); } if (pkt.bmRequestType != UCDC_NOTIFICATION) { goto tr_setup; |