sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fill in a little of the 'Missing logic' in the USB host composite wrapper.

Browse Source
This commit is contained in:
Gregory Nutt 2016-08-26 12:24:35 -06:00
parent ea8ce7acb6
commit 3c0b287fe9
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/usbhost/usbhost_composite.c
View File

@ -281,6 +281,7 @@ int usbhost_composite(FAR struct usbhost_hubport_s *hport,
{ {
FAR struct usbhsot_composite_s *priv; FAR struct usbhsot_composite_s *priv;
FAR struct usbhost_component_s *member; FAR struct usbhost_component_s *member;
FAR const struct usbhost_registry_s *reg;
uint16_t nclasses; uint16_t nclasses;
int i; int i;
@ -292,6 +293,8 @@ int usbhost_composite(FAR struct usbhost_hubport_s *hport,
/* Count the number of interfaces. Scan for IAD descriptors that will be /* Count the number of interfaces. Scan for IAD descriptors that will be
* used when it is necessary to associate multiple interfaces with a single * used when it is necessary to associate multiple interfaces with a single
* device. * device.
*
* Save the CLASS ID information in the member structure.
*/ */
#warning Missing logic #warning Missing logic
@ -329,28 +332,31 @@ int usbhost_composite(FAR struct usbhost_hubport_s *hport,
{ {
member = &priv->members[i]; member = &priv->members[i];
/* See usbhost_classbind() for similar logic */ /* Is there is a class implementation registered to support this
* device.
* REVISIT: This should have been saved in member structure when the
* number of member classes was counted.
*/
#warning Missing logic to get id
/* Is there is a class implementation registered to support this device. */ reg = usbhost_findclass(id);
#warning Missing logic if (reg == NULL)
{ {
/* Yes.. there is a class for this device. Get an instance of uinfo("usbhost_findclass failed\n");
* its interface. ret = -EINVAL;
*/ goto errour_with_members;
#warning Missing logic }
{
/* Then bind the newly instantiated class instance as an /* Yes.. there is a class for this device. Get an instance of its
* composite class member. * interface.
*/
#warning Missing logic
{
/* On failures, call the class disconnect method which
* should then free the allocated usbclass instance.
*/ */
goto errout_with_members; member->usbclass = CLASS_CREATE(reg, hport, id);
} if (member->usbclass == NULL)
} {
uinfo("CLASS_CREATE failed\n");
ret = -ENOMEM;
goto errour_with_members;
} }
} }