Changes in uspace/drv/bus/usb/uhcirh/main.c [89e061d:5203e256] in mainline

File:

• uspace/drv/bus/usb/uhcirh/main.c (modified) (5 diffs)

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

@@ -36 +36 @@
 #include <ddf/driver.h>
 #include <devman.h>
-#include <device/hw_res_parsed.h>
+#include <device/hw_res.h>
 #include <errno.h>
 #include <str_error.h>
@@ -51 +51 @@
     uintptr_t *io_reg_address, size_t *io_reg_size);
 
-static int uhci_rh_dev_add(ddf_dev_t *device);
+static int uhci_rh_add_device(ddf_dev_t *device);
 
 static driver_ops_t uhci_rh_driver_ops = {
-        .dev_add = uhci_rh_dev_add,
+        .add_device = uhci_rh_add_device,
 };
 
@@ -82 +82 @@
  * @return Error code.
  */
-static int uhci_rh_dev_add(ddf_dev_t *device)
+static int uhci_rh_add_device(ddf_dev_t *device)
 {
         if (!device)
                 return EINVAL;
 
-        usb_log_debug2("uhci_rh_dev_add(handle=%" PRIun ")\n",
+        usb_log_debug2("uhci_rh_add_device(handle=%" PRIun ")\n",
             device->handle);
 
@@ -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_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);
+        
+        hw_resource_list_t hw_resources;
+        const int ret = hw_res_get_resource_list(parent_sess, &hw_resources);
         if (ret != EOK) {
+                async_hangup(parent_sess);
                 return ret;
         }
-
-        if (hw_res.io_ranges.count != 1) {
-                hw_res_list_parsed_clean(&hw_res);
-                return EINVAL;
+        
+        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;
+                }
+        
         }
-
+        async_hangup(parent_sess);
+        
+        if (!io_found)
+                return ENOENT;
+        
         if (io_reg_address != NULL)
-                *io_reg_address = hw_res.io_ranges.ranges[0].address;
-
+                *io_reg_address = io_address;
+        
         if (io_reg_size != NULL)
-                *io_reg_size = hw_res.io_ranges.ranges[0].size;
-
-        hw_res_list_parsed_clean(&hw_res);
+                *io_reg_size = io_size;
+        
         return EOK;
 }