Changeset eb1a2f4 in mainline for uspace/drv/uhci-hcd/root_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/uhci-hcd/root_hub.c (modified) (2 diffs)

uspace/drv/uhci-hcd/root_hub.c

@@ -39 +39 @@
 
 #include "root_hub.h"
+#include "uhci.h"
 
-extern device_ops_t child_ops;
+static int usb_iface_get_hc_handle_rh_impl(ddf_fun_t *root_hub_fun,
+    devman_handle_t *handle)
+{
+        ddf_fun_t *hc_fun = root_hub_fun->driver_data;
+        assert(hc_fun != NULL);
+
+        *handle = hc_fun->handle;
+
+        return EOK;
+}
+
+static int usb_iface_get_address_rh_impl(ddf_fun_t *fun, devman_handle_t handle,
+    usb_address_t *address)
+{
+        assert(fun);
+        ddf_fun_t *hc_fun = fun->driver_data;
+        assert(hc_fun);
+        uhci_t *hc = fun_to_uhci(hc_fun);
+        assert(hc);
+
+        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
+            handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        if (address != NULL) {
+                *address = addr;
+        }
+
+        return EOK;
+}
+
+usb_iface_t usb_iface_root_hub_fun_impl = {
+        .get_hc_handle = usb_iface_get_hc_handle_rh_impl,
+        .get_address = usb_iface_get_address_rh_impl
+};
+
+static ddf_dev_ops_t root_hub_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface_root_hub_fun_impl
+};
+
 /*----------------------------------------------------------------------------*/
-int setup_root_hub(device_t **device, device_t *hc)
+int setup_root_hub(ddf_fun_t **fun, ddf_dev_t *hc)
 {
-        assert(device);
-        device_t *hub = create_device();
+        assert(fun);
+        int ret;
+
+        ddf_fun_t *hub = ddf_fun_create(hc, fun_inner, "root-hub");
         if (!hub) {
                 usb_log_error("Failed to create root hub device structure.\n");
-                return ENOMEM;
-        }
-        char *name;
-        int ret = asprintf(&name, "UHCI Root Hub");
-        if (ret < 0) {
-                usb_log_error("Failed to create root hub name.\n");
-                free(hub);
                 return ENOMEM;
         }
@@ -62 +99 @@
         if (ret < 0) {
                 usb_log_error("Failed to create root hub match string.\n");
-                free(hub);
-                free(name);
+                ddf_fun_destroy(hub);
                 return ENOMEM;
         }
 
-        match_id_t *match_id = create_match_id();
-        if (!match_id) {
-                usb_log_error("Failed to create root hub match id.\n");
-                free(hub);
-                free(match_str);
+        ret = ddf_fun_add_match_id(hub, match_str, 100);
+        if (ret != EOK) {
+                usb_log_error("Failed to add root hub match id.\n");
+                ddf_fun_destroy(hub);
                 return ENOMEM;
         }
-        match_id->id = match_str;
-        match_id->score = 90;
 
-        add_match_id(&hub->match_ids, match_id);
-        hub->name = name;
-        hub->parent = hc;
-        hub->ops = &child_ops;
+        hub->ops = &root_hub_ops;
 
-        *device = hub;
+        *fun = hub;
         return EOK;
 }