Changes in uspace/lib/usb/src/recognise.c [3f0ef89d:0f21c0c] in mainline

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>
@@ -42 +41 @@
 #include <stdio.h>
 #include <errno.h>
-#include <assert.h>
 
 static size_t device_name_index = 0;
 static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
 
-ddf_dev_ops_t child_ops = {
+device_ops_t child_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface_hub_child_impl
 };
@@ -310 +308 @@
         }
 
+        /*
+         * As a fallback, provide the simplest match id possible.
+         */
+        ADD_MATCHID_OR_RETURN(matches, 1, "usb&fallback");
+
         return EOK;
 }
@@ -323 +326 @@
 int usb_device_register_child_in_devman(usb_address_t address,
     devman_handle_t hc_handle,
-    ddf_dev_t *parent, devman_handle_t *child_handle,
-    ddf_dev_ops_t *dev_ops, void *dev_data, ddf_fun_t **child_fun)
+    device_t *parent, devman_handle_t *child_handle)
 {
         size_t this_device_name_index;
@@ -333 +335 @@
         fibril_mutex_unlock(&device_name_index_mutex);
 
-        ddf_fun_t *child = NULL;
+        device_t *child = NULL;
         char *child_name = NULL;
         int rc;
@@ -350 +352 @@
         }
 
+        child = create_device();
+        if (child == NULL) {
+                rc = ENOMEM;
+                goto failure;
+        }
+
         /*
          * TODO: Once the device driver framework support persistent
@@ -358 +366 @@
                 goto failure;
         }
-
-        child = ddf_fun_create(parent, fun_inner, child_name);
-        if (child == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        if (dev_ops != NULL) {
-                child->ops = dev_ops;
-        } else {
-                child->ops = &child_ops;
-        }
-
-        child->driver_data = dev_data;
+        child->parent = parent;
+        child->name = child_name;
+        child->ops = &child_ops;
 
         rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
@@ -388 +385 @@
         }
 
-        rc = ddf_fun_bind(child);
+        rc = child_device_register(child, parent);
         if (rc != EOK) {
                 goto failure;
@@ -395 +392 @@
         if (child_handle != NULL) {
                 *child_handle = child->handle;
-        }
-
-        if (child_fun != NULL) {
-                *child_fun = child;
         }
 
@@ -407 +400 @@
                 child->name = NULL;
                 /* This takes care of match_id deallocation as well. */
-                ddf_fun_destroy(child);
+                delete_device(child);
         }
         if (child_name != NULL) {