diff options
| author |   mpi <mpi@openbsd.org> | 2013-04-12 12:58:39 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2013-04-12 12:58:39 +0000 |
| commit | aa88c704f4357b5a3a8dd5e6017dea6a69f3a1f2 (patch) | |
| tree | e8e7247d56c8c917ce131f20865c2f1ccca1b6f8 /sys/dev/usb/if_uath.c | |
| parent | Remove some Korean characters from the zero-width list that apparently (diff) | |
| download | wireguard-openbsd-aa88c704f4357b5a3a8dd5e6017dea6a69f3a1f2.tar.xz wireguard-openbsd-aa88c704f4357b5a3a8dd5e6017dea6a69f3a1f2.zip | |
Instead of using a wrapper around usbd_transfer() when submitting a
transfer synchronously just pass the USBD_SYNCHRONOUS flag like any
other flags when creating a transfer.
ok sthen@, mglocker@
Diffstat (limited to 'sys/dev/usb/if_uath.c')
| -rw-r--r-- | sys/dev/usb/if_uath.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index be84d463c89..be0659acb64 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.52 2012/10/03 08:05:26 sthen Exp $ */ +/* $OpenBSD: if_uath.c,v 1.53 2013/04/12 12:58:39 mpi Exp $ */ /*- * Copyright (c) 2006 @@ -1319,8 +1319,8 @@ uath_tx_null(struct uath_softc *sc) usbd_setup_xfer(data->xfer, sc->data_tx_pipe, data, data->buf, sizeof (uint32_t) + sizeof (struct uath_tx_desc), USBD_NO_COPY | - USBD_FORCE_SHORT_XFER, UATH_DATA_TIMEOUT, NULL); - if (usbd_sync_transfer(data->xfer) != 0) + USBD_FORCE_SHORT_XFER | USBD_SYNCHRONOUS, UATH_DATA_TIMEOUT, NULL); + if (usbd_transfer(data->xfer) != 0) return EIO; sc->data_idx = (sc->data_idx + 1) % UATH_TX_DATA_LIST_COUNT; @@ -2081,9 +2081,10 @@ uath_loadfirmware(struct uath_softc *sc, const u_char *fw, int len) /* send firmware block meta-data */ usbd_setup_xfer(ctlxfer, sc->cmd_tx_pipe, sc, txblock, - sizeof (struct uath_fwblock), USBD_NO_COPY, + sizeof (struct uath_fwblock), + USBD_NO_COPY | USBD_SYNCHRONOUS, UATH_CMD_TIMEOUT, NULL); - if ((error = usbd_sync_transfer(ctlxfer)) != 0) { + if ((error = usbd_transfer(ctlxfer)) != 0) { printf("%s: could not send firmware block info\n", sc->sc_dev.dv_xname); break; @@ -2092,8 +2093,8 @@ uath_loadfirmware(struct uath_softc *sc, const u_char *fw, int len) /* send firmware block data */ bcopy(fw, txdata, mlen); usbd_setup_xfer(txxfer, sc->data_tx_pipe, sc, txdata, mlen, - USBD_NO_COPY, UATH_DATA_TIMEOUT, NULL); - if ((error = usbd_sync_transfer(txxfer)) != 0) { + USBD_NO_COPY | USBD_SYNCHRONOUS, UATH_DATA_TIMEOUT, NULL); + if ((error = usbd_transfer(txxfer)) != 0) { printf("%s: could not send firmware block data\n", sc->sc_dev.dv_xname); break; @@ -2102,8 +2103,8 @@ uath_loadfirmware(struct uath_softc *sc, const u_char *fw, int len) /* wait for ack from firmware */ usbd_setup_xfer(rxxfer, sc->cmd_rx_pipe, sc, rxblock, sizeof (struct uath_fwblock), USBD_SHORT_XFER_OK | - USBD_NO_COPY, UATH_CMD_TIMEOUT, NULL); - if ((error = usbd_sync_transfer(rxxfer)) != 0) { + USBD_NO_COPY | USBD_SYNCHRONOUS, UATH_CMD_TIMEOUT, NULL); + if ((error = usbd_transfer(rxxfer)) != 0) { printf("%s: could not read firmware answer\n", sc->sc_dev.dv_xname); break; |