Changeset 357a302 in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-02-20T14:17:40Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b68b279

Parents:

3ae93a8

Message:

USB interfaces reorganization

The most important change is that getting USB address of a device
is an operation of generic USB interface, not USB-HC interface.
That is needed for proper functionality of a MID driver.

Also added sample implementation of USB interface operations as is
needed by most drivers (sample does not mean unfunctional or partially
implemented here).
They are stored in libusb/ddfiface.h

Updated UHCI, UHCI-RH, hub, VHC drivers to use these sample
implementations.

Updated libusb device recognition routines to route get_address requests
through USB interface.

File:

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

uspace/lib/usb/src/recognise.c

@@ -34 +34 @@
  */
 #include <sys/types.h>
-#include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/pipes.h>
 #include <usb/recognise.h>
+#include <usb/ddfiface.h>
 #include <usb/request.h>
 #include <usb/classes/classes.h>
@@ -46 +46 @@
 static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
 
-/** Callback for getting host controller handle.
- *
- * @param dev Device in question.
- * @param[out] handle Devman handle of the host controller.
- * @return Error code.
- */
-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
-};
-
 device_ops_t child_ops = {
-        .interfaces[USB_DEV_IFACE] = &usb_iface
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_child_impl
 };