summaryrefslogtreecommitdiff
path: root/sys/dev/usb/if_urtwn.c
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2013-04-15 09:23:03 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2013-04-15 09:23:03 +0000
commit5cef08fefab2a1e12eeb54bbb0608448920630e8 (patch)
tree54b4b49685c176f00e369f015a0e43fd73199777 /sys/dev/usb/if_urtwn.c
parentef6d59f94200628194940cb20aa4986edec4b629 (diff)
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_urtwn.c')
-rw-r--r--sys/dev/usb/if_urtwn.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index 07ac8e557f2..7cbe765dea2 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_urtwn.c,v 1.24 2013/03/29 07:43:52 brad Exp $ */
+/* $OpenBSD: if_urtwn.c,v 1.25 2013/04/15 09:23:01 mglocker Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -187,9 +187,9 @@ void urtwn_delete_key_cb(struct urtwn_softc *, void *);
void urtwn_update_avgrssi(struct urtwn_softc *, int, int8_t);
int8_t urtwn_get_rssi(struct urtwn_softc *, int, void *);
void urtwn_rx_frame(struct urtwn_softc *, uint8_t *, int);
-void urtwn_rxeof(usbd_xfer_handle, usbd_private_handle,
+void urtwn_rxeof(struct usbd_xfer *, void *,
usbd_status);
-void urtwn_txeof(usbd_xfer_handle, usbd_private_handle,
+void urtwn_txeof(struct usbd_xfer *, void *,
usbd_status);
int urtwn_tx(struct urtwn_softc *, struct mbuf *,
struct ieee80211_node *);
@@ -1632,7 +1632,7 @@ urtwn_rx_frame(struct urtwn_softc *sc, uint8_t *buf, int pktlen)
}
void
-urtwn_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv,
+urtwn_rxeof(struct usbd_xfer *xfer, void *priv,
usbd_status status)
{
struct urtwn_rx_data *data = priv;
@@ -1698,7 +1698,7 @@ urtwn_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv,
}
void
-urtwn_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
+urtwn_txeof(struct usbd_xfer *xfer, void *priv,
usbd_status status)
{
struct urtwn_tx_data *data = priv;
@@ -1737,7 +1737,7 @@ urtwn_tx(struct urtwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
struct ieee80211_key *k = NULL;
struct urtwn_tx_data *data;
struct r92c_tx_desc *txd;
- usbd_pipe_handle pipe;
+ struct usbd_pipe *pipe;
uint16_t qos, sum;
uint8_t raid, type, tid, qid;
int i, hasqos, xferlen, error;