Changeset 687efaa in mainline

Timestamp:

2011-02-11T15:00:18Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

518372c

Parents:

6cd7b17

Message:

Reuse libusb usbdevice interface

Location:

uspace

Files:

• drv/uhci-hcd/root_hub.c (modified) (2 diffs)
• lib/usb/src/recognise.c (modified) (1 diff)

uspace/drv/uhci-hcd/root_hub.c

@@ -35 +35 @@
 #include <errno.h>
 #include <stdio.h>
-
 #include <usb_iface.h>
-
 #include <usb/debug.h>
 
 #include "root_hub.h"
+
+extern device_ops_t child_ops;
 /*----------------------------------------------------------------------------*/
-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 rh_ops = {
-        .interfaces[USB_DEV_IFACE] = &usb_iface
-};
-
 int setup_root_hub(device_t **device, device_t *hc)
 {
@@ -108 +80 @@
         hub->name = name;
         hub->parent = hc;
-        hub->ops = &rh_ops;
+        hub->ops = &child_ops;
 
         *device = hub;

uspace/lib/usb/src/recognise.c

@@ -70 +70 @@
 };
 
-static device_ops_t child_ops = {
+device_ops_t child_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface
 };