Changeset 41e645c in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-02-20T21:43:50Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

070f11e, ace12560

Parents:

423e8c81 (diff), 063ead6f (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:

Add simple USB multi interface device driver

The MID driver serves as a mini bus driver for devices with several
interfaces or for devices with classes defined at interface level.

The keyboard driver is working with this driver with the same problems
as before introduction of USB MID driver.

The merge also includes addition of bulk transfers.

File:

• uspace/drv/uhci-hcd/main.c (modified) (2 diffs)

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include <driver.h>
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <device/hw_res.h>
 
@@ -48 +49 @@
 
 static int uhci_add_device(device_t *device);
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle);
-/*----------------------------------------------------------------------------*/
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+
+static int usb_iface_get_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
 {
-        /* This shall be called only for the UHCI itself. */
-        assert(dev->parent == NULL);
+        assert(dev);
+        uhci_t *hc = dev_to_uhci(dev);
+        assert(hc);
 
-        *handle = dev->handle;
+        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
+            handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        if (address != NULL) {
+                *address = addr;
+        }
+
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
+
 static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
+        .get_address = usb_iface_get_address
 };
 /*----------------------------------------------------------------------------*/