Changeset 0f191a2 in mainline for uspace/drv/uhci/main.c

Timestamp:

2011-01-07T09:20:13Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2b0db98, 2c98e78, 43c3937

Parents:

ae1f70e (diff), 8f8a0cd6 (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:

Merged vojtechhorky/ - connecting to HC

Fixed ticket #6:
Currently, all USB device drivers connect to the virtual host
controller. The usb_drv_hc_connect() function must connect
the caller to the host controller driver the device is
physically attached to.

File:

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

uspace/drv/uhci/main.c

@@ -27 +27 @@
  */
 #include <usb/hcdhubd.h>
+#include <usb_iface.h>
 #include <usb/debug.h>
 #include <errno.h>
@@ -32 +33 @@
 #include "uhci.h"
 
+static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+{
+        /* This shall be called only for the UHCI itself. */
+        assert(dev->parent == NULL);
+
+        *handle = dev->handle;
+        return EOK;
+}
+
+static usb_iface_t hc_usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle
+};
+
 static device_ops_t uhci_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
+        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USBHC_DEV_IFACE] = &uhci_iface
 };