Changeset 7e1b130 in mainline for uspace/lib/usb/src/ddfiface.c

Timestamp:

2011-12-23T18:13:33Z (12 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/lib/usb/src/ddfiface.c (modified) (4 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -44 +44 @@
 #include <assert.h>
 
+#include <usb/dev.h>
+
 /** DDF interface for USB device, implementation for typical hub. */
 usb_iface_t usb_iface_hub_impl = {
@@ -66 +68 @@
 {
         assert(fun);
-        return usb_hc_find(fun->handle, handle);
+        return usb_get_hc_by_handle(fun->handle, handle);
 }
 
@@ -97 +99 @@
 {
         assert(fun);
-
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle,
-            IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-        if (!exch) {
-                async_hangup(parent_sess);
-                return ENOMEM;
-        }
-
-        const int ret = usb_get_my_address(exch, address);
-
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-
-        return ret;
+        return usb_get_address_by_handle(fun->handle, address);
 }
 
@@ -134 +118 @@
         assert(fun);
         assert(fun->driver_data);
-        usb_hub_attached_device_t *device = fun->driver_data;
+        const usb_hub_attached_device_t *device = fun->driver_data;
         assert(device->fun == fun);
         if (address)