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_uath.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_uath.c')
| -rw-r--r-- | sys/dev/usb/if_uath.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index be0659acb64..e345ab63174 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.53 2013/04/12 12:58:39 mpi Exp $ */ +/* $OpenBSD: if_uath.c,v 1.54 2013/04/15 09:23:01 mglocker Exp $ */ /*- * Copyright (c) 2006 @@ -159,9 +159,9 @@ int uath_write_reg(struct uath_softc *, uint32_t, uint32_t); int uath_write_multi(struct uath_softc *, uint32_t, const void *, int); int uath_read_reg(struct uath_softc *, uint32_t, uint32_t *); int uath_read_eeprom(struct uath_softc *, uint32_t, void *); -void uath_cmd_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -void uath_data_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -void uath_data_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +void uath_cmd_rxeof(struct usbd_xfer *, void *, usbd_status); +void uath_data_rxeof(struct usbd_xfer *, void *, usbd_status); +void uath_data_txeof(struct usbd_xfer *, void *, usbd_status); int uath_tx_null(struct uath_softc *); int uath_tx_data(struct uath_softc *, struct mbuf *, struct ieee80211_node *); @@ -1108,7 +1108,7 @@ uath_read_eeprom(struct uath_softc *sc, uint32_t reg, void *odata) } void -uath_cmd_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, +uath_cmd_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct uath_rx_cmd *cmd = priv; @@ -1170,7 +1170,7 @@ uath_cmd_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, } void -uath_data_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, +uath_data_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct uath_rx_data *data = priv; @@ -1329,7 +1329,7 @@ uath_tx_null(struct uath_softc *sc) } void -uath_data_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, +uath_data_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct uath_tx_data *data = priv; @@ -2019,7 +2019,7 @@ uath_stop(struct ifnet *ifp, int disable) int uath_loadfirmware(struct uath_softc *sc, const u_char *fw, int len) { - usbd_xfer_handle ctlxfer, txxfer, rxxfer; + struct usbd_xfer *ctlxfer, *txxfer, *rxxfer; struct uath_fwblock *txblock, *rxblock; uint8_t *txdata; int error = 0; |