summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/if_urlreg.h
diff options
context:
space:
mode:
authormglocker <mglocker@openbsd.org>2013-04-15 09:23:00 +0000
committermglocker <mglocker@openbsd.org>2013-04-15 09:23:00 +0000
commitab0b1be78a33b04be9f7ec4a3d24ce14843759cb (patch)
tree343ff963916dade5930d4d0d64b50d04d9a15f9d /sys/dev/usb/if_urlreg.h
parentRevert r1.37 now that we stop after the first matching protocol, tested (diff)
downloadwireguard-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_urlreg.h')
-rw-r--r--sys/dev/usb/if_urlreg.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/if_urlreg.h b/sys/dev/usb/if_urlreg.h
index 87cd7fa6e89..eefd88d783c 100644
--- a/sys/dev/usb/if_urlreg.h
+++ b/sys/dev/usb/if_urlreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_urlreg.h,v 1.13 2010/12/06 04:41:39 jakemsr Exp $ */
+/* $OpenBSD: if_urlreg.h,v 1.14 2013/04/15 09:23:01 mglocker Exp $ */
/* $NetBSD: if_urlreg.h,v 1.1 2002/03/28 21:09:11 ichiro Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -130,7 +130,7 @@ typedef uWord url_rxhdr_t; /* Recive Header */
struct url_chain {
struct url_softc *url_sc;
- usbd_xfer_handle url_xfer;
+ struct usbd_xfer *url_xfer;
char *url_buf;
struct mbuf *url_mbuf;
int url_idx;
@@ -151,17 +151,17 @@ struct url_cdata {
struct url_softc {
struct device sc_dev; /* base device */
- usbd_device_handle sc_udev;
+ struct usbd_device *sc_udev;
/* USB */
- usbd_interface_handle sc_ctl_iface;
+ struct usbd_interface *sc_ctl_iface;
/* int sc_ctl_iface_no; */
int sc_bulkin_no; /* bulk in endpoint */
int sc_bulkout_no; /* bulk out endpoint */
int sc_intrin_no; /* intr in endpoint */
- usbd_pipe_handle sc_pipe_rx;
- usbd_pipe_handle sc_pipe_tx;
- usbd_pipe_handle sc_pipe_intr;
+ struct usbd_pipe *sc_pipe_rx;
+ struct usbd_pipe *sc_pipe_tx;
+ struct usbd_pipe *sc_pipe_intr;
struct timeout sc_stat_ch;
u_int sc_rx_errs;
/* u_int sc_intr_errs; */