Changeset cdc8a391 in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2013-07-12T14:08:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

322ac35c

Parents:

98abd40 (diff), b66ffb1 (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/drv/bus/usb/ohci/hc.c (modified) (5 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -35 +35 @@
 
 #include <errno.h>
+#include <stdbool.h>
 #include <str_error.h>
 #include <adt/list.h>
@@ -183 +184 @@
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
 {
+        bool addr_reqd = false;
+        bool ep_added = false;
+        bool fun_bound = false;
+        int rc;
+
         assert(instance);
         assert(hub_fun);
@@ -188 +194 @@
         /* Try to get address 1 for root hub. */
         instance->rh.address = 1;
-        int ret = usb_device_manager_request_address(
+        rc = usb_device_manager_request_address(
             &instance->generic.dev_manager, &instance->rh.address, false,
             USB_SPEED_FULL);
-        if (ret != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Failed to get OHCI root hub address: %s\n",
-                    str_error(ret));
-                return ret;
-        }
-
-#define CHECK_RET_UNREG_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        usb_endpoint_manager_remove_ep( \
-            &instance->generic.ep_manager, instance->rh.address, 0, \
-            USB_DIRECTION_BOTH, NULL, NULL); \
-        usb_device_manager_release_address( \
-            &instance->generic.dev_manager, instance->rh.address); \
-        return ret; \
-} else (void)0
-
-        ret = usb_endpoint_manager_add_ep(
+                    str_error(rc));
+                goto error;
+        }
+
+        addr_reqd = true;
+
+        rc = usb_endpoint_manager_add_ep(
             &instance->generic.ep_manager, instance->rh.address, 0,
             USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
             0, NULL, NULL);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to register root hub control endpoint: %s.\n",
-            str_error(ret));
-
-        ret = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to add root hub match-id: %s.\n", str_error(ret));
-
-        ret = ddf_fun_bind(hub_fun);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to bind root hub function: %s.\n", str_error(ret));
-
-        ret = usb_device_manager_bind_address(&instance->generic.dev_manager,
+        if (rc != EOK) {
+                usb_log_error("Failed to register root hub control endpoint: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        ep_added = true;
+
+        rc = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100);
+        if (rc != EOK) {
+                usb_log_error("Failed to add root hub match-id: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        rc = ddf_fun_bind(hub_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to bind root hub function: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        fun_bound = true;
+
+        rc = usb_device_manager_bind_address(&instance->generic.dev_manager,
             instance->rh.address, ddf_fun_get_handle(hub_fun));
-        if (ret != EOK)
+        if (rc != EOK) {
                 usb_log_warning("Failed to bind root hub address: %s.\n",
-                    str_error(ret));
-
-        return EOK;
-#undef CHECK_RET_RELEASE
+                    str_error(rc));
+        }
+
+        return EOK;
+error:
+        if (fun_bound)
+                ddf_fun_unbind(hub_fun);
+        if (ep_added) {
+                usb_endpoint_manager_remove_ep(
+                    &instance->generic.ep_manager, instance->rh.address, 0,
+                    USB_DIRECTION_BOTH, NULL, NULL);
+        }
+        if (addr_reqd) {
+                usb_device_manager_release_address(
+                    &instance->generic.dev_manager, instance->rh.address);
+        }
+        return rc;
 }
 
@@ -246 +268 @@
         assert(instance);
 
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-} else (void)0
-
-        int ret =
+        int rc =
             pio_enable((void*)regs, reg_size, (void**)&instance->registers);
-        CHECK_RET_RETURN(ret,
-            "Failed to gain access to device registers: %s.\n", str_error(ret));
+        if (rc != EOK) {
+                usb_log_error("Failed to gain access to device registers: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
         list_initialize(&instance->pending_batches);
@@ -266 +285 @@
         instance->generic.ep_remove_hook = ohci_endpoint_fini;
 
-        ret = hc_init_memory(instance);
-        CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
-            str_error(ret));
-#undef CHECK_RET_RETURN
+        rc = hc_init_memory(instance);
+        if (rc != EOK) {
+                usb_log_error("Failed to create OHCI memory structures: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
         fibril_mutex_initialize(&instance->guard);