Changeset 43c3937 in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-01-07T10:43:15Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

5097bed4

Parents:

5f7d96e (diff), 0f191a2 (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 with usb/development

File:

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

uspace/lib/usb/src/recognise.c

@@ -33 +33 @@
  * @brief Functions for recognising kind of attached devices.
  */
+#include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/classes/classes.h>
@@ -38 +39 @@
 #include <errno.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
+};
 
 #define BCD_INT(a) (((unsigned int)(a)) / 256)
@@ -285 +313 @@
                 goto failure;
         }
+        child->parent = parent;
         child->name = child_name;
+        child->ops = &child_ops;
         
         rc = usb_drv_create_device_match_ids(hc, &child->match_ids, address);