Changeset eb1a2f4 in mainline for uspace/drv/vhc/hub.c

Timestamp:

2011-02-22T23:30:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3b5d1535, a9c674e0

Parents:

dbe25f1 (diff), 664af708 (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:

Merge mainline changes (DDF refactoring)

This merge includes DDF refactoring that brought multifunctional devices
(i.e. ddf_dev_t and ddf_fun_t). Please, see ticket #295 at HelenOS
upstream Trac.

The conflicts themselves were easy to solve (merely several renamings).

Changes to USB subsystem:

• drivers uses ddf_dev_t and ddf_fun_t
• different signatures of many library functions
• several hacks around communication with parent device (now the communication is clearer and somehow what we have now is hack about other hacks)
  • will repair and clean later
• maybe added some extra debugging messages (the diff has about 240K, and I admit I have no energy to double check that)

WARNING:

• the diff is VERY long, recommended is viewing partial diffs of the merge (i.e. merges in mainline branch that lead to the parent one)
• merging with your branches might involve huge renamings, sorry, no other way is possible

BUGS:

• hub driver will not work (no function created)

GOOD NEWS:

• QEMU keyboard seems to work with QEMU 0.13 and 0.14
• we are up-to-date with mainline again

File:

• uspace/drv/vhc/hub.c (modified) (5 diffs)

uspace/drv/vhc/hub.c

@@ -39 +39 @@
 #include <str_error.h>
 #include <stdlib.h>
-#include <driver.h>
+#include <ddf/driver.h>
+#include <devman.h>
 #include <usb/hub.h>
 #include <usb/recognise.h>
@@ -46 +47 @@
 #include "hub/virthub.h"
 #include "vhcd.h"
+#include "conn.h"
 
 usbvirt_device_t virtual_hub_device;
+static ddf_dev_ops_t rh_ops = {
+        .interfaces[USB_DEV_IFACE] = &rh_usb_iface,
+};
 
 static int hub_register_in_devman_fibril(void *arg);
 
-void virtual_hub_device_init(device_t *hc_dev)
+void virtual_hub_device_init(ddf_fun_t *hc_dev)
 {
         virthub_init(&virtual_hub_device);
@@ -83 +88 @@
 int hub_register_in_devman_fibril(void *arg)
 {
-        device_t *hc_dev = (device_t *) arg;
+        ddf_fun_t *hc_dev = (ddf_fun_t *) arg;
 
         /*
@@ -94 +99 @@
         async_hangup(phone);
 
+        int rc;
+
         usb_hc_connection_t hc_conn;
-        usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
+        rc = usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
+        assert(rc == EOK);
 
-        usb_hc_connection_open(&hc_conn);
+        rc = usb_hc_connection_open(&hc_conn);
+        assert(rc == EOK);
 
-        int rc = usb_hc_new_device_wrapper(hc_dev, &hc_conn, USB_SPEED_FULL,
+        ddf_fun_t *hub_dev;
+        rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn,
+            USB_SPEED_FULL,
             pretend_port_rest, 0, NULL,
-            NULL, NULL);
+            NULL, NULL, &rh_ops, hc_dev, &hub_dev);
         if (rc != EOK) {
                 usb_log_fatal("Failed to create root hub: %s.\n",
@@ -108 +119 @@
 
         usb_hc_connection_close(&hc_conn);
+
+        usb_log_info("Created root hub function (handle %zu).\n",
+            (size_t) hub_dev->handle);
 
         return 0;