Changeset ee9ea16 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2011-09-19T12:29:04Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d46b13d

Parents:

c94f643

Message:

usbhub: Codestyle

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (5 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -57 +57 @@
 
 static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev);
-
 static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info);
-
 static int usb_hub_set_configuration(usb_hub_info_t *hub_info);
-
 static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info);
-
 static int usb_process_hub_over_current(usb_hub_info_t *hub_info,
     usb_hub_status_t status);
-
 static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info,
     usb_hub_status_t status);
-
 static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info);
-
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
     bool was_error, void *data);
@@ -93 +86 @@
         if (!usb_dev) return EINVAL;
         usb_hub_info_t *hub_info = usb_hub_info_create(usb_dev);
+
         //create hc connection
         usb_log_debug("Initializing USB wire abstraction.\n");
         int opResult = usb_hc_connection_initialize_from_device(
-            &hub_info->connection,
-            hub_info->usb_device->ddf_dev);
-        if (opResult != EOK) {
-                usb_log_error("Could not initialize connection to device, "
-                    " %s\n",
+            &hub_info->connection, hub_info->usb_device->ddf_dev);
+        if (opResult != EOK) {
+                usb_log_error("Could not initialize connection to device: %s\n",
                     str_error(opResult));
                 free(hub_info);
@@ -109 +101 @@
         opResult = usb_hub_set_configuration(hub_info);
         if (opResult != EOK) {
-                usb_log_error("Could not set hub configuration, %s\n",
+                usb_log_error("Could not set hub configuration: %s\n",
                     str_error(opResult));
                 free(hub_info);
@@ -190 +182 @@
  * @return basic usb_hub_info_t structure
  */
-static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev) {
-        usb_hub_info_t * result = malloc(sizeof (usb_hub_info_t));
-        if (!result) return NULL;
+static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev)
+{
+        usb_hub_info_t *result = malloc(sizeof (usb_hub_info_t));
+        if (!result)
+            return NULL;
+
         result->usb_device = usb_dev;
         result->status_change_pipe = usb_dev->pipes[0].pipe;
@@ -205 +200 @@
         fibril_condvar_initialize(&result->pending_ops_cv);
         result->pending_ops_count = 0;
+
         return result;
 }