diff options
| author |   mglocker <mglocker@openbsd.org> | 2013-04-15 09:23:00 +0000 |
|---|---|---|
| committer | mglocker <mglocker@openbsd.org> | 2013-04-15 09:23:00 +0000 |
| commit | ab0b1be78a33b04be9f7ec4a3d24ce14843759cb (patch) | |
| tree | 343ff963916dade5930d4d0d64b50d04d9a15f9d /sys/dev/usb/if_rsu.c | |
| parent | Revert r1.37 now that we stop after the first matching protocol, tested (diff) | |
| download | wireguard-openbsd-ab0b1be78a33b04be9f7ec4a3d24ce14843759cb.tar.xz wireguard-openbsd-ab0b1be78a33b04be9f7ec4a3d24ce14843759cb.zip | |
Get rid of various 'typedef struct' definitions and use plain structure
definitions instead. We don't change usb.h for now to stay compatible
with userland.
Tested by mpi@ on macppc and myself on i386.
ok mpi@
Diffstat (limited to 'sys/dev/usb/if_rsu.c')
| -rw-r--r-- | sys/dev/usb/if_rsu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c index 367c948382b..c33ba01bc9e 100644 --- a/sys/dev/usb/if_rsu.c +++ b/sys/dev/usb/if_rsu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rsu.c,v 1.16 2013/04/12 12:58:39 mpi Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.17 2013/04/15 09:23:01 mglocker Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -176,8 +176,8 @@ void rsu_rx_multi_event(struct rsu_softc *, uint8_t *, int); int8_t rsu_get_rssi(struct rsu_softc *, int, void *); void rsu_rx_frame(struct rsu_softc *, uint8_t *, int); void rsu_rx_multi_frame(struct rsu_softc *, uint8_t *, int); -void rsu_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -void rsu_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +void rsu_rxeof(struct usbd_xfer *, void *, usbd_status); +void rsu_txeof(struct usbd_xfer *, void *, usbd_status); int rsu_tx(struct rsu_softc *, struct mbuf *, struct ieee80211_node *); int rsu_send_mgmt(struct ieee80211com *, struct ieee80211_node *, @@ -743,7 +743,7 @@ rsu_fw_cmd(struct rsu_softc *sc, uint8_t code, void *buf, int len) struct rsu_tx_data *data; struct r92s_tx_desc *txd; struct r92s_fw_cmd_hdr *cmd; - usbd_pipe_handle pipe; + struct usbd_pipe *pipe; int cmdsz, xferlen; data = sc->fwcmd_data; @@ -1445,7 +1445,7 @@ rsu_rx_multi_frame(struct rsu_softc *sc, uint8_t *buf, int len) } void -rsu_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +rsu_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct rsu_rx_data *data = priv; struct rsu_softc *sc = data->sc; @@ -1481,7 +1481,7 @@ rsu_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) } void -rsu_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +rsu_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct rsu_tx_data *data = priv; struct rsu_softc *sc = data->sc; @@ -1519,7 +1519,7 @@ rsu_tx(struct rsu_softc *sc, struct mbuf *m, struct ieee80211_node *ni) struct ieee80211_key *k = NULL; struct rsu_tx_data *data; struct r92s_tx_desc *txd; - usbd_pipe_handle pipe; + struct usbd_pipe *pipe; uint16_t qos; uint8_t type, qid, tid = 0; int hasqos, xferlen, error; @@ -1996,7 +1996,7 @@ rsu_fw_loadsection(struct rsu_softc *sc, uint8_t *buf, int len) { struct rsu_tx_data *data; struct r92s_tx_desc *txd; - usbd_pipe_handle pipe; + struct usbd_pipe *pipe; int mlen, error; data = sc->fwcmd_data; |