Changeset 2ff7360 in mainline

Timestamp:

2011-05-18T15:23:16Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

45e0e07

Parents:

aeca5a3

Message:

Use better error handling in root hub registration routine

File:

• uspace/drv/ohci/hc.c (modified) (3 diffs)

uspace/drv/ohci/hc.c

@@ -56 +56 @@
         assert(hub_fun);
 
-        int ret;
-
-        usb_address_t hub_address =
+        const usb_address_t hub_address =
             device_keeper_get_free_address(&instance->manager, USB_SPEED_FULL);
         if (hub_address <= 0) {
-                usb_log_error("Failed to get OHCI root hub address.\n");
+                usb_log_error("Failed(%d) to get OHCI root hub address.\n",
+                    hub_address);
                 return hub_address;
         }
@@ -68 +67 @@
             &instance->manager, hub_address, hub_fun->handle);
 
-        ret = hc_add_endpoint(instance, hub_address, 0, USB_SPEED_FULL,
+#define CHECK_RET_RELEASE(ret, message...) \
+if (ret != EOK) { \
+        usb_log_error(message); \
+        hc_remove_endpoint(instance, hub_address, 0, USB_DIRECTION_BOTH); \
+        usb_device_keeper_release(&instance->manager, hub_address); \
+        return ret; \
+} else (void)0
+
+        int ret = hc_add_endpoint(instance, hub_address, 0, USB_SPEED_FULL,
             USB_TRANSFER_CONTROL, USB_DIRECTION_BOTH, 64, 0, 0);
-        if (ret != EOK) {
-                usb_log_error("Failed to add OHCI rh endpoint 0.\n");
-                usb_device_keeper_release(&instance->manager, hub_address);
-                return ret;
-        }
+        CHECK_RET_RELEASE(ret, "Failed(%d) to add OHCI rh endpoint 0.\n", ret);
 
         char *match_str = NULL;
         /* DDF needs heap allocated string */
         ret = asprintf(&match_str, "usb&class=hub");
-        if (ret < 0) {
-                usb_log_error(
-                    "Failed(%d) to create root hub match-id string.\n", ret);
-                usb_device_keeper_release(&instance->manager, hub_address);
-                return ret;
-        }
+        ret = ret > 0 ? 0 : ret;
+        CHECK_RET_RELEASE(ret, "Failed(%d) to create match-id string.\n", ret);
 
         ret = ddf_fun_add_match_id(hub_fun, match_str, 100);
-        if (ret != EOK) {
-                usb_log_error("Failed add root hub match-id.\n");
-        }
+        CHECK_RET_RELEASE(ret, "Failed(%d) add root hub match-id.\n", ret);
+
         ret = ddf_fun_bind(hub_fun);
-        return ret;
+        CHECK_RET_RELEASE(ret, "Failed(%d) to bind root hub function.\n", ret);
+
+        return EOK;
+#undef CHECK_RET_RELEASE
 }
 /*----------------------------------------------------------------------------*/
@@ -121 +122 @@
 #undef CHECK_RET_RETURN
 
-
-//      hc_init_hw(instance);
+        fibril_mutex_initialize(&instance->guard);
         hc_gain_control(instance);
-        fibril_mutex_initialize(&instance->guard);
 
         rh_init(&instance->rh, instance->registers);