Changeset 93fb170c in mainline for uspace/lib/usb/src/hcdhubd.c

Timestamp:

2011-01-08T18:51:31Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15be932

Parents:

8f748215 (diff), a523af4 (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 from main branch

File:

• uspace/lib/usb/src/hcdhubd.c (modified) (3 diffs)

uspace/lib/usb/src/hcdhubd.c

@@ -36 +36 @@
 #include <usb/devreq.h>
 #include <usbhc_iface.h>
+#include <usb_iface.h>
 #include <usb/descriptor.h>
 #include <driver.h>
@@ -45 +46 @@
 #include "hcdhubd_private.h"
 
+
+static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+{
+        assert(dev);
+        assert(dev->parent != NULL);
+
+        device_t *parent = dev->parent;
+
+        if (parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
+                usb_iface_t *usb_iface
+                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
+                assert(usb_iface != NULL);
+                if (usb_iface->get_hc_handle) {
+                        int rc = usb_iface->get_hc_handle(parent, handle);
+                        return rc;
+                }
+        }
+
+        return ENOTSUP;
+}
+
+static usb_iface_t usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle
+};
+
+static device_ops_t child_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface
+};
+
 /** Callback when new device is detected and must be handled by this driver.
  *
@@ -129 +159 @@
         }
         child->name = child_info->name;
+        child->parent = child_info->parent;
+        child->ops = &child_ops;
 
         match_id = create_match_id();