Changeset ca56afa in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-02-25T09:46:23Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d493ac17

Parents:

15b0432 (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:

merge with /usb/development

File:

• uspace/lib/usb/src/recognise.c (modified) (10 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
 };
@@ -308 +310 @@
         }
 
-        /*
-         * As a fallback, provide the simplest match id possible.
-         */
-        ADD_MATCHID_OR_RETURN(matches, 1, "usb&fallback");
-
         return EOK;
 }
@@ -326 +323 @@
 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 +333 @@
         fibril_mutex_unlock(&device_name_index_mutex);
 
-        device_t *child = NULL;
+        ddf_fun_t *child = NULL;
         char *child_name = NULL;
         int rc;
@@ -352 +350 @@
         }
 
-        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 +365 @@
         }
 
-        /*
-         * 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 +388 @@
         }
 
-        rc = child_device_register(child, parent);
+        rc = ddf_fun_bind(child);
         if (rc != EOK) {
                 goto failure;
@@ -392 +395 @@
         if (child_handle != NULL) {
                 *child_handle = child->handle;
+        }
+
+        if (child_fun != NULL) {
+                *child_fun = child;
         }
 
@@ -400 +407 @@
                 child->name = NULL;
                 /* This takes care of match_id deallocation as well. */
-                delete_device(child);
+                ddf_fun_destroy(child);
         }
         if (child_name != NULL) {