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/uts.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/uts.c')
| -rw-r--r-- | sys/dev/usb/uts.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index db956ec22e0..7d7aedf13bc 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.30 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: uts.c,v 1.31 2013/04/15 09:23:02 mglocker Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -62,14 +62,14 @@ struct tsscale { struct uts_softc { struct device sc_dev; - usbd_device_handle sc_udev; - usbd_interface_handle sc_iface; + struct usbd_device *sc_udev; + struct usbd_interface *sc_iface; int sc_iface_number; int sc_product; int sc_vendor; int sc_intr_number; - usbd_pipe_handle sc_intr_pipe; + struct usbd_pipe *sc_intr_pipe; u_char *sc_ibuf; int sc_isize; u_int8_t sc_pkts; @@ -100,8 +100,8 @@ const struct usb_devno uts_devs[] = { { USB_VENDOR_GUNZE, USB_PRODUCT_GUNZE_TOUCHPANEL } }; -void uts_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); -void uts_get_pos(usbd_private_handle addr, struct uts_pos *tp); +void uts_intr(struct usbd_xfer *, void *, usbd_status); +void uts_get_pos(void *addr, struct uts_pos *tp); int uts_enable(void *); void uts_disable(void *); @@ -374,7 +374,7 @@ uts_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *l) } void -uts_get_pos(usbd_private_handle addr, struct uts_pos *tp) +uts_get_pos(void *addr, struct uts_pos *tp) { struct uts_softc *sc = addr; u_char *p = sc->sc_ibuf; @@ -449,7 +449,7 @@ uts_get_pos(usbd_private_handle addr, struct uts_pos *tp) } void -uts_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status) +uts_intr(struct usbd_xfer *xfer, void *addr, usbd_status status) { struct uts_softc *sc = addr; u_int32_t len; |