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_upl.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_upl.c')
| -rw-r--r-- | sys/dev/usb/if_upl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 03e0c3873ff..566734ac4d1 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upl.c,v 1.50 2013/02/07 13:35:18 mpi Exp $ */ +/* $OpenBSD: if_upl.c,v 1.51 2013/04/15 09:23:01 mglocker Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -108,7 +108,7 @@ struct upl_softc; struct upl_chain { struct upl_softc *upl_sc; - usbd_xfer_handle upl_xfer; + struct usbd_xfer *upl_xfer; char *upl_buf; struct mbuf *upl_mbuf; int upl_idx; @@ -129,12 +129,12 @@ struct upl_softc { struct ifnet sc_if; struct timeout sc_stat_ch; - usbd_device_handle sc_udev; - usbd_interface_handle sc_iface; + struct usbd_device *sc_udev; + struct usbd_interface *sc_iface; u_int16_t sc_vendor; u_int16_t sc_product; int sc_ed[UPL_ENDPT_MAX]; - usbd_pipe_handle sc_ep[UPL_ENDPT_MAX]; + struct usbd_pipe *sc_ep[UPL_ENDPT_MAX]; struct upl_cdata sc_cdata; uByte sc_ibuf; @@ -185,9 +185,9 @@ int upl_tx_list_init(struct upl_softc *); int upl_rx_list_init(struct upl_softc *); int upl_newbuf(struct upl_softc *, struct upl_chain *, struct mbuf *); int upl_send(struct upl_softc *, struct mbuf *, int); -void upl_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); -void upl_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -void upl_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +void upl_intr(struct usbd_xfer *, void *, usbd_status); +void upl_rxeof(struct usbd_xfer *, void *, usbd_status); +void upl_txeof(struct usbd_xfer *, void *, usbd_status); void upl_start(struct ifnet *); int upl_ioctl(struct ifnet *, u_long, caddr_t); void upl_init(void *); @@ -218,8 +218,8 @@ upl_attach(struct device *parent, struct device *self, void *aux) struct upl_softc *sc = (struct upl_softc *)self; struct usb_attach_arg *uaa = aux; int s; - usbd_device_handle dev = uaa->device; - usbd_interface_handle iface; + struct usbd_device *dev = uaa->device; + struct usbd_interface *iface; usbd_status err; struct ifnet *ifp; usb_interface_descriptor_t *id; @@ -455,7 +455,7 @@ upl_tx_list_init(struct upl_softc *sc) * the higher level protocols. */ void -upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +upl_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct upl_chain *c = priv; struct upl_softc *sc = c->upl_sc; @@ -544,7 +544,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) * the list buffers. */ void -upl_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +upl_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct upl_chain *c = priv; struct upl_softc *sc = c->upl_sc; @@ -761,7 +761,7 @@ upl_openpipes(struct upl_softc *sc) } void -upl_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +upl_intr(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct upl_softc *sc = priv; struct ifnet *ifp = &sc->sc_if; |