Changeset 92574f4 in mainline for uspace/drv/vhc/hcd.c

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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 (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/drv/vhc/hcd.c

@@ -35 +35 @@
 
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>
@@ -43 +42 @@
 #include <errno.h>
 #include <str_error.h>
-#include <driver.h>
+#include <ddf/driver.h>
 
 #include <usb/usb.h>
+#include <usb/ddfiface.h>
 #include <usb_iface.h>
 #include "vhcd.h"
@@ -53 +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 = {
+static ddf_dev_ops_t vhc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USB_DEV_IFACE] = &vhc_usb_iface,
         .close = on_client_close,
         .default_handler = default_connection_handler
 };
 
-static int vhc_count = 0;
-static int vhc_add_device(device_t *dev)
+static int vhc_add_device(ddf_dev_t *dev)
 {
+        static int vhc_count = 0;
+        int rc;
+
         /*
          * Currently, we know how to simulate only single HC.
@@ -83 +72 @@
         }
 
-        vhc_count++;
+        /*
+         * Create exposed function representing the host controller
+         * itself.
+         */
+        ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");
+        if (hc == NULL) {
+                usb_log_fatal("Failed to create device function.\n");
+                return ENOMEM;
+        }
 
-        dev->ops = &vhc_ops;
+        hc->ops = &vhc_ops;
 
-        devman_add_device_to_class(dev->handle, "usbhc");
+        rc = ddf_fun_bind(hc);
+        if (rc != EOK) {
+                usb_log_fatal("Failed to bind HC function: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        ddf_fun_add_to_class(hc, "usbhc");
 
         /*
          * Initialize our hub and announce its presence.
          */
-        virtual_hub_device_init(dev);
+        virtual_hub_device_init(hc);
 
-        usb_log_info("Virtual USB host controller ready (id = %zu).\n",
-            (size_t) dev->handle);
+        usb_log_info("Virtual USB host controller ready (dev %zu, hc %zu).\n",
+            (size_t) dev->handle, (size_t) hc->handle);
 
         return EOK;
@@ -116 +120 @@
          * in devman output.
          */
-        sleep(5);
+        //sleep(5);
 
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
         printf(NAME ": virtual USB host controller driver.\n");
@@ -135 +139 @@
          * We are also a driver within devman framework.
          */
-        return driver_main(&vhc_driver);
+        return ddf_driver_main(&vhc_driver);
 }