Changeset 2179cf95 in mainline

Timestamp:

2011-11-04T21:55:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

37e4025

Parents:

3238506

Message:

libusbdev: usb_device_register_child_in_devman takes open control pipe.

Instead of doing all the initialization again.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/recognise.h (modified) (1 diff)
• src/hub.c (modified) (1 diff)
• src/recognise.c (modified) (7 diffs)

uspace/lib/usbdev/include/usb/dev/recognise.h

@@ -50 +50 @@
 int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
 
-int usb_device_register_child_in_devman(usb_address_t, devman_handle_t,
+int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
     ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
 

uspace/lib/usbdev/src/hub.c

@@ -348 +348 @@
         /* FIXME: create device_register that will get opened ctrl pipe. */
         ddf_fun_t *child_fun;
-        rc = usb_device_register_child_in_devman(dev_addr, dev_conn.hc_handle,
+        rc = usb_device_register_child_in_devman(&ctrl_pipe,
             parent, dev_ops, new_dev_data, &child_fun);
         if (rc != EOK) {

uspace/lib/usbdev/src/recognise.c

@@ -316 +316 @@
     match_id_list_t *matches)
 {
+        assert(ctrl_pipe);
         int rc;
         /*
@@ -338 +339 @@
 /** Probe for device kind and register it in devman.
  *
- * @param[in] address Address of the (unknown) attached device.
- * @param[in] hc_handle Handle of the host controller.
+ * @param[in] ctrl_pipe Control pipe to the device.
  * @param[in] parent Parent device.
  * @param[in] dev_ops Child device ops. Default child_ops will be used if NULL.
@@ -348 +348 @@
  * @return Error code.
  */
-int usb_device_register_child_in_devman(usb_address_t address,
-    devman_handle_t hc_handle, ddf_dev_t *parent,
-    ddf_dev_ops_t *dev_ops, void *dev_data, ddf_fun_t **child_fun)
+int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
+    ddf_dev_t *parent, ddf_dev_ops_t *dev_ops, void *dev_data,
+    ddf_fun_t **child_fun)
 {
-        if (child_fun == NULL)
+        if (child_fun == NULL || ctrl_pipe == NULL)
                 return EINVAL;
 
@@ -360 +360 @@
         }
 
-        size_t this_device_name_index;
-
         fibril_mutex_lock(&device_name_index_mutex);
-        this_device_name_index = device_name_index;
-        device_name_index++;
+        const size_t this_device_name_index = device_name_index++;
         fibril_mutex_unlock(&device_name_index_mutex);
 
         ddf_fun_t *child = NULL;
-        char *child_name = NULL;
         int rc;
-        usb_device_connection_t dev_connection;
-        usb_pipe_t ctrl_pipe;
-
-        rc = usb_device_connection_initialize(
-            &dev_connection, hc_handle, address);
-        if (rc != EOK) {
-                goto failure;
-        }
-
-        rc = usb_pipe_initialize_default_control(&ctrl_pipe, &dev_connection);
-        if (rc != EOK) {
-                goto failure;
-        }
-        rc = usb_pipe_probe_default_control(&ctrl_pipe);
-        if (rc != EOK) {
-                goto failure;
-        }
 
         /*
@@ -392 +371 @@
          * naming etc., something more descriptive could be created.
          */
-        rc = asprintf(&child_name, "usb%02zu_a%d",
-            this_device_name_index, address);
+        char child_name[12]; /* The format is: "usbAB_aXYZ", length 11 */
+        rc = snprintf(child_name, sizeof(child_name),
+            "usb%02zu_a%d", this_device_name_index, ctrl_pipe->wire->address);
         if (rc < 0) {
                 goto failure;
@@ -399 +379 @@
 
         child = ddf_fun_create(parent, fun_inner, child_name);
-        free(child_name);
         if (child == NULL) {
                 rc = ENOMEM;
@@ -421 +400 @@
                         goto failure;
                 }
-                new_device->address = address;
+                new_device->address = ctrl_pipe->wire->address;
                 new_device->fun = child;
         }
 
 
-        rc = usb_device_create_match_ids(&ctrl_pipe, &child->match_ids);
+        rc = usb_device_create_match_ids(ctrl_pipe, &child->match_ids);
         if (rc != EOK) {
                 goto failure;