d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from NetBSD:

Browse Source 
----------------------------
    revision 1.26
    date: 1999/11/28 22:49:53;  author: augustss;  state: Exp;  lines: +12 -8
    More USB_DEBUG and DIAGNOSTIC output.
    ----------------------------
This commit is contained in:
joe 2002-04-01 13:50:42 +00:00
parent fb7e6a263a
commit 91d7ec9706
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/usb/usbdi_util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usbdi_util.c,v 1.24 1999/11/17 23:00:50 augustss Exp $ */
/* $NetBSD: usbdi_util.c,v 1.26 1999/11/28 22:49:53 augustss Exp $ */
/* $FreeBSD$ */
/*
@ -73,6 +73,9 @@ usbd_get_desc(dev, type, index, len, desc)
{
usb_device_request_t req;
DPRINTFN(3,("usbd_get_desc: type=%d, index=%d, len=%d\n",
type, index, len));
req.bmRequestType = UT_READ_DEVICE;
req.bRequest = UR_GET_DESCRIPTOR;
USETW2(req.wValue, type, index);
@ -82,21 +85,20 @@ usbd_get_desc(dev, type, index, len, desc)
}
usbd_status
usbd_get_config_desc(dev, conf, d)
usbd_device_handle dev;
int conf;
usb_config_descriptor_t *d;
usbd_get_config_desc(usbd_device_handle dev, int confidx,
usb_config_descriptor_t *d)
{
usbd_status err;
DPRINTFN(3,("usbd_get_config_desc: conf=%d\n", conf));
err = usbd_get_desc(dev, UDESC_CONFIG, conf,
USB_CONFIG_DESCRIPTOR_SIZE, d);
DPRINTFN(3,("usbd_get_config_desc: confidx=%d\n", confidx));
err = usbd_get_desc(dev, UDESC_CONFIG, confidx,
USB_CONFIG_DESCRIPTOR_SIZE, d);
if (err)
return (err);
if (d->bDescriptorType != UDESC_CONFIG) {
DPRINTFN(-1,("usbd_get_config_desc: conf %d, bad desc %d\n",
conf, d->bDescriptorType));
DPRINTFN(-1,("usbd_get_config_desc: confidx=%d, bad desc "
"len=%d type=%d\n",
confidx, d->bLength, d->bDescriptorType));
return (USBD_INVAL);
}
return (USBD_NORMAL_COMPLETION);