Date: Mon, 15 Jun 2009 22:38:06 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r194271 - in head/sys/dev/usb: . net serial Message-ID: <200906152238.n5FMc68i004094@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Mon Jun 15 22:38:05 2009 New Revision: 194271 URL: http://svn.freebsd.org/changeset/base/194271 Log: Fix usb2_find_descriptor function name. Modified: head/sys/dev/usb/net/if_cdce.c head/sys/dev/usb/serial/umodem.c head/sys/dev/usb/usb_device.c head/sys/dev/usb/usb_device.h Modified: head/sys/dev/usb/net/if_cdce.c ============================================================================== --- head/sys/dev/usb/net/if_cdce.c Mon Jun 15 22:07:21 2009 (r194270) +++ head/sys/dev/usb/net/if_cdce.c Mon Jun 15 22:38:05 2009 (r194271) @@ -243,7 +243,7 @@ cdce_attach(device_t dev) sc->sc_data_iface_no = 0; /* not used */ goto alloc_transfers; } - ud = usb2_find_descriptor + ud = usbd_find_descriptor (uaa->device, NULL, uaa->info.bIfaceIndex, UDESC_CS_INTERFACE, 0 - 1, UDESCSUB_CDC_UNION, 0 - 1); @@ -319,7 +319,7 @@ alloc_transfers: } } - ued = usb2_find_descriptor + ued = usbd_find_descriptor (uaa->device, NULL, uaa->info.bIfaceIndex, UDESC_CS_INTERFACE, 0 - 1, UDESCSUB_CDC_ENF, 0 - 1); Modified: head/sys/dev/usb/serial/umodem.c ============================================================================== --- head/sys/dev/usb/serial/umodem.c Mon Jun 15 22:07:21 2009 (r194270) +++ head/sys/dev/usb/serial/umodem.c Mon Jun 15 22:38:05 2009 (r194271) @@ -289,7 +289,7 @@ umodem_attach(device_t dev) if ((cmd == NULL) || (cmd->bLength < sizeof(*cmd))) { - cud = usb2_find_descriptor(uaa->device, NULL, + cud = usbd_find_descriptor(uaa->device, NULL, uaa->info.bIfaceIndex, UDESC_CS_INTERFACE, 0 - 1, UDESCSUB_CDC_UNION, 0 - 1); @@ -746,7 +746,7 @@ tr_setup: static void * umodem_get_desc(struct usb_attach_arg *uaa, uint8_t type, uint8_t subtype) { - return (usb2_find_descriptor(uaa->device, NULL, uaa->info.bIfaceIndex, + return (usbd_find_descriptor(uaa->device, NULL, uaa->info.bIfaceIndex, type, 0 - 1, subtype, 0 - 1)); } Modified: head/sys/dev/usb/usb_device.c ============================================================================== --- head/sys/dev/usb/usb_device.c Mon Jun 15 22:07:21 2009 (r194270) +++ head/sys/dev/usb/usb_device.c Mon Jun 15 22:38:05 2009 (r194271) @@ -2017,7 +2017,7 @@ usbd_get_iface(struct usb_device *udev, } /*------------------------------------------------------------------------* - * usb2_find_descriptor + * usbd_find_descriptor * * This function will lookup the first descriptor that matches the * criteria given by the arguments "type" and "subtype". Descriptors @@ -2032,7 +2032,7 @@ usbd_get_iface(struct usb_device *udev, * Else: A descriptor matching the criteria *------------------------------------------------------------------------*/ void * -usb2_find_descriptor(struct usb_device *udev, void *id, uint8_t iface_index, +usbd_find_descriptor(struct usb_device *udev, void *id, uint8_t iface_index, uint8_t type, uint8_t type_mask, uint8_t subtype, uint8_t subtype_mask) { Modified: head/sys/dev/usb/usb_device.h ============================================================================== --- head/sys/dev/usb/usb_device.h Mon Jun 15 22:07:21 2009 (r194270) +++ head/sys/dev/usb/usb_device.h Mon Jun 15 22:38:05 2009 (r194271) @@ -247,7 +247,7 @@ usb_error_t usb_suspend_resume(struct us uint8_t do_suspend); void usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len); void usb_free_device(struct usb_device *, uint8_t); -void *usb2_find_descriptor(struct usb_device *udev, void *id, +void *usbd_find_descriptor(struct usb_device *udev, void *id, uint8_t iface_index, uint8_t type, uint8_t type_mask, uint8_t subtype, uint8_t subtype_mask); void usb_linux_free_device(struct usb_device *dev);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906152238.n5FMc68i004094>