Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add logic to get the VID and PID

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3282 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-02-11 02:36:01 +00:00
parent 19e95c9430
commit 16508e595b
3 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -1450,3 +1450,5 @@
the -o option is not standard and is not supported under, for example, OS-X or the -o option is not standard and is not supported under, for example, OS-X or
Solaris. This was solved by changing all 'uname -o' references to the more Solaris. This was solved by changing all 'uname -o' references to the more
complex: 'uname -o 2>/dev/null || echo "Other"' complex: 'uname -o 2>/dev/null || echo "Other"'
* drivers/usbhost/usbhost_enumerate.c -- Add logic to get the VID and PID. This
is necessary in order to support vendor-specific USB devices.
Documentation/NuttX.html
+2
View File
@@ -2027,6 +2027,8 @@ nuttx-5.18 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
the -o option is not standard and is not supported under, for example, OS-X or the -o option is not standard and is not supported under, for example, OS-X or
Solaris. This was solved by changing all 'uname -o' references to the more Solaris. This was solved by changing all 'uname -o' references to the more
complex: 'uname -o 2>/dev/null || echo "Other"' complex: 'uname -o 2>/dev/null || echo "Other"'
* drivers/usbhost/usbhost_enumerate.c -- Add logic to get the VID and PID. This
is necessary in order to support vendor-specific USB devices.
pascal-2.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> pascal-2.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
drivers/usbhost/usbhost_enumerate.c
+36 -43
View File
@@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
* drivers/usbhost/usbhost_enumerate.c * drivers/usbhost/usbhost_enumerate.c
* *
* Copyright (C) 2010 Gregory Nutt. All rights reserved. * Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <spudmonkey@racsa.co.cr> * Authors: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
static inline uint16_t usbhost_getle16(const uint8_t *val); static inline uint16_t usbhost_getle16(const uint8_t *val);
static void usbhost_putle16(uint8_t *dest, uint16_t val); static void usbhost_putle16(uint8_t *dest, uint16_t val);
static inline int usbhost_devdesc(const struct usb_devdesc_s *devdesc, int desclen, static inline int usbhost_devdesc(const struct usb_devdesc_s *devdesc,
struct usbhost_id_s *id); struct usbhost_id_s *id);
static inline int usbhost_configdesc(const uint8_t *configdesc, int desclen, static inline int usbhost_configdesc(const uint8_t *configdesc, int desclen,
struct usbhost_id_s *id); struct usbhost_id_s *id);
@@ -123,36 +123,24 @@ static void usbhost_putle16(uint8_t *dest, uint16_t val)
*******************************************************************************/ *******************************************************************************/
static inline int usbhost_devdesc(const struct usb_devdesc_s *devdesc, static inline int usbhost_devdesc(const struct usb_devdesc_s *devdesc,
int desclen, struct usbhost_id_s *id) struct usbhost_id_s *id)
{ {
/* Clear the ID info */ /* Clear the ID info */
memset(id, 0, sizeof(struct usbhost_id_s)); memset(id, 0, sizeof(struct usbhost_id_s));
/* Check we have enough of the structure to see the ID info. */ /* Pick off the ID info */
if (desclen >= 7) id->base = devdesc->class;
{ id->subclass = devdesc->subclass;
/* Pick off the ID info */ id->proto = devdesc->protocol;
uvdbg("class:%d subclass:%d protocol:%d\n", id->base, id->subclass, id->proto);
id->base = devdesc->class; /* Yes, then pick off the VID and PID as well */
id->subclass = devdesc->subclass;
id->proto = devdesc->protocol;
uvdbg("class:%d subclass:%d protocol:%d\n",
id->base, id->subclass, id->proto);
/* Check if we have enough of the structure to see the VID/PID */
if (desclen >= 12)
{
/* Yes, then pick off the VID and PID as well */
id->vid = usbhost_getle16(devdesc->vendor);
id->pid = usbhost_getle16(devdesc->product);
uvdbg("vid:%d pid:%d\n", id->vid, id->pid);
}
}
id->vid = usbhost_getle16(devdesc->vendor);
id->pid = usbhost_getle16(devdesc->product);
uvdbg("vid:%d pid:%d\n", id->vid, id->pid);
return OK; return OK;
} }
@@ -367,32 +355,37 @@ int usbhost_enumerate(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr,
goto errout; goto errout;
} }
/* Extract info from the device descriptor */ /* Extract the correct max packetsize from the device descriptor */
{ maxpacketsize = ((struct usb_devdesc_s *)buffer)->mxpacketsize;
struct usb_devdesc_s *devdesc = (struct usb_devdesc_s *)buffer; uvdbg("maxpacksetsize: %d\n", maxpacketsize);
/* Extract the max packetsize for endpoint 0 */ /* And reconfigure EP0 */
maxpacketsize = devdesc->mxpacketsize; DRVR_EP0CONFIGURE(drvr, 0, maxpacketsize);
uvdbg("maxpacksetsize: %d\n", maxpacketsize);
DRVR_EP0CONFIGURE(drvr, 0, maxpacketsize); /* Now read the full device descriptor */
/* Get class identification information from the device descriptor. Most ctrlreq->type = USB_REQ_DIR_IN|USB_REQ_RECIPIENT_DEVICE;
* devices set this to USB_CLASS_PER_INTERFACE (zero) and provide the ctrlreq->req = USB_REQ_GETDESCRIPTOR;
* identification informatino in the interface descriptor(s). That allows usbhost_putle16(ctrlreq->value, (USB_DESC_TYPE_DEVICE << 8));
* a device to support multiple, different classes. usbhost_putle16(ctrlreq->index, 0);
*/ usbhost_putle16(ctrlreq->len, USB_SIZEOF_DEVDESC);
(void)usbhost_devdesc(devdesc, 8, &id); ret = DRVR_CTRLIN(drvr, ctrlreq, buffer);
if (ret != OK)
{
udbg("ERROR: GETDESCRIPTOR/DEVICE, DRVR_CTRLIN returned %d\n", ret);
goto errout;
}
/* NOTE: Additional logic is needed here. We will need additional logic /* Get class identification information from the device descriptor. Most
* to (1) get the full device descriptor, (1) extract the vendor/product IDs * devices set this to USB_CLASS_PER_INTERFACE (zero) and provide the
* and (2) extract the number of configurations from the (full) device * identification informatino in the interface descriptor(s). That allows
* descriptor. * a device to support multiple, different classes.
*/ */
}
(void)usbhost_devdesc((struct usb_devdesc_s *)buffer, &id);
/* Set the USB device address to the value in the 'funcaddr' input */ /* Set the USB device address to the value in the 'funcaddr' input */