Changeset eb1a2f4 in mainline for uspace/lib/usb/src/recognise.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/lib/usb/src/recognise.c (modified) (9 diffs)

uspace/lib/usb/src/recognise.c

@@ -34 +34 @@
  */
 #include <sys/types.h>
+#include <fibril_synch.h>
 #include <usb/pipes.h>
 #include <usb/recognise.h>
@@ -41 +42 @@
 #include <stdio.h>
 #include <errno.h>
+#include <assert.h>
 
 static size_t device_name_index = 0;
 static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
 
-device_ops_t child_ops = {
+ddf_dev_ops_t child_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface_hub_child_impl
 };
@@ -326 +328 @@
 int usb_device_register_child_in_devman(usb_address_t address,
     devman_handle_t hc_handle,
-    device_t *parent, devman_handle_t *child_handle)
+    ddf_dev_t *parent, devman_handle_t *child_handle,
+    ddf_dev_ops_t *dev_ops, void *dev_data, ddf_fun_t **child_fun)
 {
         size_t this_device_name_index;
@@ -335 +338 @@
         fibril_mutex_unlock(&device_name_index_mutex);
 
-        device_t *child = NULL;
+        ddf_fun_t *child = NULL;
         char *child_name = NULL;
         int rc;
@@ -352 +355 @@
         }
 
-        child = create_device();
+        /*
+         * TODO: Once the device driver framework support persistent
+         * naming etc., something more descriptive could be created.
+         */
+        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
+        if (rc < 0) {
+                goto failure;
+        }
+
+        child = ddf_fun_create(parent, fun_inner, child_name);
         if (child == NULL) {
                 rc = ENOMEM;
@@ -358 +370 @@
         }
 
-        /*
-         * TODO: Once the device driver framework support persistent
-         * naming etc., something more descriptive could be created.
-         */
-        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
-        if (rc < 0) {
-                goto failure;
-        }
-        child->parent = parent;
-        child->name = child_name;
-        child->ops = &child_ops;
+        if (dev_ops != NULL) {
+                child->ops = dev_ops;
+        } else {
+                child->ops = &child_ops;
+        }
+
+        child->driver_data = dev_data;
 
         rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
@@ -385 +393 @@
         }
 
-        rc = child_device_register(child, parent);
+        rc = ddf_fun_bind(child);
         if (rc != EOK) {
                 goto failure;
@@ -392 +400 @@
         if (child_handle != NULL) {
                 *child_handle = child->handle;
+        }
+
+        if (child_fun != NULL) {
+                *child_fun = child;
         }
 
@@ -400 +412 @@
                 child->name = NULL;
                 /* This takes care of match_id deallocation as well. */
-                delete_device(child);
+                ddf_fun_destroy(child);
         }
         if (child_name != NULL) {