Changeset b4ca0a9c in mainline for uspace/lib/usbdev/src/recognise.c

Timestamp:

2012-07-10T11:53:50Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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

File:

• uspace/lib/usbdev/src/recognise.c (modified) (6 diffs)

uspace/lib/usbdev/src/recognise.c

@@ -33 +33 @@
  * Functions for recognition of attached devices.
  */
+
 #include <sys/types.h>
 #include <fibril_synch.h>
@@ -311 +312 @@
  *      will be written.
  * @return Error code.
+ *
  */
 int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
@@ -318 +320 @@
         if (child_fun == NULL || ctrl_pipe == NULL)
                 return EINVAL;
-
+        
         if (!dev_ops && dev_data) {
                 usb_log_warning("Using standard fun ops with arbitrary "
                     "driver data. This does not have to work.\n");
         }
-
+        
         /** Index to append after device name for uniqueness. */
         static atomic_t device_name_index = {0};
         const size_t this_device_name_index =
             (size_t) atomic_preinc(&device_name_index);
-
+        
         ddf_fun_t *child = NULL;
         int rc;
-
+        
         /*
          * TODO: Once the device driver framework support persistent
          * naming etc., something more descriptive could be created.
          */
-        char child_name[12]; /* The format is: "usbAB_aXYZ", length 11 */
+        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);
@@ -342 +344 @@
                 goto failure;
         }
-
+        
         child = ddf_fun_create(parent, fun_inner, child_name);
         if (child == NULL) {
@@ -348 +350 @@
                 goto failure;
         }
-
-        if (dev_ops != NULL) {
+        
+        if (dev_ops != NULL)
                 child->ops = dev_ops;
-        } else {
+        else
                 child->ops = &child_ops;
-        }
-
+        
         child->driver_data = dev_data;
-        /* Store the attached device in fun driver data if there is no
-         * other data */
+        /*
+         * Store the attached device in fun
+         * driver data if there is no other data
+         */
         if (!dev_data) {
                 usb_hub_attached_device_t *new_device = ddf_fun_data_alloc(
@@ -365 +368 @@
                         goto failure;
                 }
+                
                 new_device->address = ctrl_pipe->wire->address;
                 new_device->fun = child;
         }
-
-
+        
         rc = usb_device_create_match_ids(ctrl_pipe, &child->match_ids);
-        if (rc != EOK) {
+        if (rc != EOK)
                 goto failure;
-        }
-
+        
         rc = ddf_fun_bind(child);
-        if (rc != EOK) {
+        if (rc != EOK)
                 goto failure;
-        }
-
+        
         *child_fun = child;
         return EOK;
-
+        
 failure:
         if (child != NULL) {
                 /* We know nothing about the data if it came from outside. */
-                if (dev_data) {
+                if (dev_data)
                         child->driver_data = NULL;
-                }
+                
                 /* This takes care of match_id deallocation as well. */
                 ddf_fun_destroy(child);
         }
-
+        
         return rc;
 }
 
-
 /**
  * @}