Changeset 2b0db98 in mainline for uspace/drv/vhc/hcd.c

Timestamp:

2011-01-07T14:02:56Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6986418

Parents:

d99120f (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:

Merged development into lelian/hidd

File:

• uspace/drv/vhc/hcd.c (modified) (4 diffs)

uspace/drv/vhc/hcd.c

@@ -46 +46 @@
 
 #include <usb/usb.h>
+#include <usb_iface.h>
 #include "vhcd.h"
 #include "hc.h"
@@ -52 +53 @@
 #include "conn.h"
 
+static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+{
+        /* This shall be called only for VHC device. */
+        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 vhc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
+        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
         .default_handler = default_connection_handler
 };
@@ -70 +85 @@
 
         dev->ops = &vhc_ops;
-
-        /*
-         * Initialize address management.
-         */
-        address_init();
 
         /*
@@ -108 +118 @@
         printf(NAME ": virtual USB host controller driver.\n");
 
+        /*
+         * Initialize address management.
+         */
+        address_init();
+
+        /*
+         * Run the transfer scheduler.
+         */
         hc_manager();
 
+        /*
+         * We are also a driver within devman framework.
+         */
         return driver_main(&vhc_driver);
 }