Changeset dad6e8a in mainline for uspace/drv/vhc/hubops.c

Timestamp:

2010-12-12T10:34:48Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

14388b4

Parents:

cf978f2 (diff), 5174c62 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/drv/vhc/hubops.c (modified) (2 diffs)

uspace/drv/vhc/hubops.c

@@ -195 +195 @@
 }
 
-static int get_hub_descriptor(uint8_t descriptor_type,
-    uint8_t descriptor_index, uint16_t length)
-{
+static int get_hub_descriptor(struct usbvirt_device *dev,
+    uint8_t descriptor_index,
+    uint8_t descriptor_type, uint16_t length)
+{
+        if (descriptor_type == USB_DESCTYPE_HUB) {
+                int rc = dev->control_transfer_reply(dev, 0,
+                    &hub_descriptor, hub_descriptor.length);
+
+                return rc;
+
+        }
+
         return ENOTSUP;
 }
@@ -313 +322 @@
                         
                 case USB_HUB_REQUEST_GET_DESCRIPTOR:
-                        return get_hub_descriptor(request->value_low,
+                        return get_hub_descriptor(dev, request->value_low,
                             request->value_high, request->length);