Changeset 7e1b130 in mainline for uspace/drv/bus/usb/uhcirh/main.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/drv/bus/usb/uhcirh/main.c (modified) (3 diffs)

uspace/drv/bus/usb/uhcirh/main.c

@@ -36 +36 @@
 #include <ddf/driver.h>
 #include <devman.h>
-#include <device/hw_res.h>
+#include <device/hw_res_parsed.h>
 #include <errno.h>
 #include <str_error.h>
@@ -136 +136 @@
 {
         assert(dev);
-        
+
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
@@ -142 +142 @@
         if (!parent_sess)
                 return ENOMEM;
-        
-        hw_resource_list_t hw_resources;
-        const int ret = hw_res_get_resource_list(parent_sess, &hw_resources);
+
+        hw_res_list_parsed_t hw_res;
+        hw_res_list_parsed_init(&hw_res);
+        const int ret =  hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        async_hangup(parent_sess);
         if (ret != EOK) {
-                async_hangup(parent_sess);
                 return ret;
         }
-        
-        uintptr_t io_address = 0;
-        size_t io_size = 0;
-        bool io_found = false;
-        
-        size_t i = 0;
-        for (; i < hw_resources.count; i++) {
-                hw_resource_t *res = &hw_resources.resources[i];
-                if (res->type == IO_RANGE) {
-                        io_address = res->res.io_range.address;
-                        io_size = res->res.io_range.size;
-                        io_found = true;
-                }
-        
+
+        if (hw_res.io_ranges.count != 1) {
+                hw_res_list_parsed_clean(&hw_res);
+                return EINVAL;
         }
-        async_hangup(parent_sess);
-        
-        if (!io_found)
-                return ENOENT;
-        
+
         if (io_reg_address != NULL)
-                *io_reg_address = io_address;
-        
+                *io_reg_address = hw_res.io_ranges.ranges[0].address;
+
         if (io_reg_size != NULL)
-                *io_reg_size = io_size;
-        
+                *io_reg_size = hw_res.io_ranges.ranges[0].size;
+
+        hw_res_list_parsed_clean(&hw_res);
         return EOK;
 }