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

Timestamp:

2011-12-23T18:13:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3819ce5, b39eb79, f0b74b2

Parents:

2f0dd2a (diff), 153cc76a (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:

USB branch changes.

+ USB device drivers use single async session to host controller, this session (represented by usb_hc_connection_t) is used for both HC requests and to back usb device connection.
+ Pipe locking was removed. Reference counting was moved to usb_hc_connection_t. Every read/write operation uses separate parallel exchange thus any contention is resolved on hc side.

• async_sess_t setup using EXCHANGE_PARALLEL uses one extra phone (session phone, each exch creates its own), thus the number of phones used by usb dvice driver might increase. Possible solutions are: make read/write calls atomic (all other calls are atomic) and use EXCHANGE_ATOMIC, any other solution provided by changes to async_sess_t.

File:

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

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

@@ -137 +137 @@
                 return ret;
         }
-        usb_device_manager_bind_address(&instance->generic.dev_manager,
-            instance->rh.address, hub_fun->handle);
 
 #define CHECK_RET_UNREG_RETURN(ret, message...) \
@@ -150 +148 @@
         return ret; \
 } else (void)0
+
         ret = usb_endpoint_manager_add_ep(
             &instance->generic.ep_manager, instance->rh.address, 0,
@@ -165 +164 @@
         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,
+            instance->rh.address, hub_fun->handle);
+        if (ret != EOK)
+                usb_log_warning("Failed to bind root hub address: %s.\n",
+                    str_error(ret));
 
         return EOK;