summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/uipaq.c
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/uipaq.c
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/uipaq.c')
-rw-r--r--sys/dev/usb/uipaq.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index be18e7a0d4b..c68c89a257c 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipaq.c,v 1.20 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: uipaq.c,v 1.21 2013/04/15 09:23:02 mglocker Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -75,8 +75,8 @@ int uipaqdebug = 0;
struct uipaq_softc {
struct device sc_dev; /* base device */
- usbd_device_handle sc_udev; /* device */
- usbd_interface_handle sc_iface; /* interface */
+ struct usbd_device *sc_udev; /* device */
+ struct usbd_interface *sc_iface; /* interface */
struct device *sc_subdev; /* ucom uses that */
u_int16_t sc_lcr; /* state for DTR/RTS */
@@ -162,8 +162,8 @@ uipaq_attach(struct device *parent, struct device *self, void *aux)
{
struct uipaq_softc *sc = (struct uipaq_softc *)self;
struct usb_attach_arg *uaa = aux;
- usbd_device_handle dev = uaa->device;
- usbd_interface_handle iface;
+ struct usbd_device *dev = uaa->device;
+ struct usbd_interface *iface;
usb_interface_descriptor_t *id;
usb_endpoint_descriptor_t *ed;
char *devname = sc->sc_dev.dv_xname;