Changeset 7265558 in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2011-10-28T20:53:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

48ae3ef

Parents:

83c3123

Message:

libusbhost: Drop hash_table and use multiple lists instead.

This has several advantages:
Knowing that all endpoints on one address are in one list makes toggle resets more efficient.
Endpoint search is done only once for inserts and deletes.
Lists are part of the structure and not allocated separately, removing one more failure point from init path.

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (1 diff)

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

@@ -192 +192 @@
             "Device registers at %p (%zuB) accessible.\n", io, reg_size);
 
-        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
+        ret = hc_init_mem_structures(instance);
+        CHECK_RET_RETURN(ret,
+            "Failed to initialize UHCI memory structures: %s.\n",
+            str_error(ret));
+
+#undef CHECK_RET_RETURN
+
+        hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
             bandwidth_count_usb11);
-        CHECK_RET_RETURN(ret, "Failed to initialize HCD generic driver: %s.\n",
-            str_error(ret));
 
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;
         instance->generic.ep_add_hook = NULL;
-
-#undef CHECK_RET_DEST_FUN_RETURN
-
-        ret = hc_init_mem_structures(instance);
-        if (ret != EOK) {
-                usb_log_error(
-                    "Failed to initialize UHCI memory structures: %s.\n",
-                    str_error(ret));
-                hcd_destroy(&instance->generic);
-                return ret;
-        }
 
         hc_init_hw(instance);