aboutsummaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/usb_hid.c
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2009-05-28 17:36:36 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2009-05-28 17:36:36 +0000
commit760bc48e7ee4471fe04fa5fee89d00bf7d698ddb (patch)
tree3036722a60a7a9ddd5122172e56736f3e128664b /sys/dev/usb/usb_hid.c
parent58de945eeb77565ebea70d949ffb610268f7d9ae (diff)
downloadsrc-760bc48e7ee4471fe04fa5fee89d00bf7d698ddb.tar.gz
src-760bc48e7ee4471fe04fa5fee89d00bf7d698ddb.zip
s/usb2_/usb_/ on all C structs for the USB stack.
Notes
Notes: svn path=/head/; revision=192984
Diffstat (limited to 'sys/dev/usb/usb_hid.c')
-rw-r--r--sys/dev/usb/usb_hid.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/usb_hid.c b/sys/dev/usb/usb_hid.c
index 52efa6777908..e24df1c5d3df 100644
--- a/sys/dev/usb/usb_hid.c
+++ b/sys/dev/usb/usb_hid.c
@@ -650,11 +650,11 @@ hid_is_collection(const void *desc, usb2_size_t size, uint32_t usage)
* NULL: No more HID descriptors.
* Else: Pointer to HID descriptor.
*------------------------------------------------------------------------*/
-struct usb2_hid_descriptor *
-hid_get_descriptor_from_usb(struct usb2_config_descriptor *cd,
- struct usb2_interface_descriptor *id)
+struct usb_hid_descriptor *
+hid_get_descriptor_from_usb(struct usb_config_descriptor *cd,
+ struct usb_interface_descriptor *id)
{
- struct usb2_descriptor *desc = (void *)id;
+ struct usb_descriptor *desc = (void *)id;
if (desc == NULL) {
return (NULL);
@@ -682,12 +682,12 @@ hid_get_descriptor_from_usb(struct usb2_config_descriptor *cd,
* Else: Success. The pointer should eventually be passed to free().
*------------------------------------------------------------------------*/
usb2_error_t
-usb2_req_get_hid_desc(struct usb2_device *udev, struct mtx *mtx,
+usb2_req_get_hid_desc(struct usb_device *udev, struct mtx *mtx,
void **descp, uint16_t *sizep,
usb2_malloc_type mem, uint8_t iface_index)
{
- struct usb2_interface *iface = usb2_get_iface(udev, iface_index);
- struct usb2_hid_descriptor *hid;
+ struct usb_interface *iface = usb2_get_iface(udev, iface_index);
+ struct usb_hid_descriptor *hid;
usb2_error_t err;
if ((iface == NULL) || (iface->idesc == NULL)) {