diff options
| author |   mpi <mpi@openbsd.org> | 2013-04-10 07:48:36 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2013-04-10 07:48:36 +0000 |
| commit | 6083df3b0756f316860c25aa5b6680809056d73c (patch) | |
| tree | 7d3d2281b6ffa2bda396931ec61e9c67a8b91707 | |
| parent | Instead of refetching the descriptor from the device, just use the copy (diff) | |
| download | wireguard-openbsd-6083df3b0756f316860c25aa5b6680809056d73c.tar.xz wireguard-openbsd-6083df3b0756f316860c25aa5b6680809056d73c.zip | |
Merge usbd_get_device_desc() into the only function using them.
ok mglocker@
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi_util.c | 10 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi_util.h | 4 |
3 files changed, 5 insertions, 14 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index ee4018527bd..b7cf9af5dde 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_subr.c,v 1.87 2013/04/10 07:39:43 mpi Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.88 2013/04/10 07:48:36 mpi Exp $ */ /* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -1229,7 +1229,8 @@ usbd_reload_device_desc(usbd_device_handle dev) usbd_status err; /* Get the full device descriptor. */ - err = usbd_get_device_desc(dev, &dev->ddesc); + err = usbd_get_desc(dev, UDESC_DEVICE, 0, + USB_DEVICE_DESCRIPTOR_SIZE, &dev->ddesc); if (err) return (err); diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c index 08b6feab46f..34c47690d4b 100644 --- a/sys/dev/usb/usbdi_util.c +++ b/sys/dev/usb/usbdi_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi_util.c,v 1.29 2013/04/10 07:37:32 mpi Exp $ */ +/* $OpenBSD: usbdi_util.c,v 1.30 2013/04/10 07:48:36 mpi Exp $ */ /* $NetBSD: usbdi_util.c,v 1.40 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.14 1999/11/17 22:33:50 n_hibma Exp $ */ @@ -90,14 +90,6 @@ usbd_get_config_desc(usbd_device_handle dev, int confidx, } usbd_status -usbd_get_device_desc(usbd_device_handle dev, usb_device_descriptor_t *d) -{ - DPRINTFN(3,("usbd_get_device_desc:\n")); - return (usbd_get_desc(dev, UDESC_DEVICE, 0, USB_DEVICE_DESCRIPTOR_SIZE, - d)); -} - -usbd_status usbd_get_device_status(usbd_device_handle dev, usb_status_t *st) { usb_device_request_t req; diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h index 616a5955305..922ca2b6a9a 100644 --- a/sys/dev/usb/usbdi_util.h +++ b/sys/dev/usb/usbdi_util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi_util.h,v 1.19 2013/04/10 07:37:32 mpi Exp $ */ +/* $OpenBSD: usbdi_util.h,v 1.20 2013/04/10 07:48:36 mpi Exp $ */ /* $NetBSD: usbdi_util.h,v 1.28 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.9 1999/11/17 22:33:50 n_hibma Exp $ */ @@ -36,8 +36,6 @@ usbd_status usbd_get_desc(usbd_device_handle dev, int type, int index, int len, void *desc); usbd_status usbd_get_config_desc(usbd_device_handle, int, usb_config_descriptor_t *); -usbd_status usbd_get_device_desc(usbd_device_handle dev, - usb_device_descriptor_t *d); usbd_status usbd_set_address(usbd_device_handle dev, int addr); usbd_status usbd_get_port_status(usbd_device_handle, int, usb_port_status_t *); |