Changes in uspace/drv/bus/usb/ohci/pci.c [8f5b4d44:9b8958b] in mainline

File:

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

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

@@ -42 +42 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <device/hw_res_parsed.h>
+#include <device/hw_res.h>
 
 #include <usb/debug.h>
@@ -61 +61 @@
 {
         assert(dev);
+        assert(mem_reg_address);
+        assert(mem_reg_size);
+        assert(irq_no);
 
         async_sess_t *parent_sess =
@@ -68 +71 @@
                 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);
+        hw_resource_list_t hw_resources;
+        int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
         async_hangup(parent_sess);
-        if (ret != EOK) {
-                return ret;
+        if (rc != EOK) {
+                return rc;
         }
 
-        /* We want one irq and one mem range. */
-        if (hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) {
-                hw_res_list_parsed_clean(&hw_res);
-                return EINVAL;
+        uintptr_t mem_address = 0;
+        size_t mem_size = 0;
+        bool mem_found = false;
+
+        int irq = 0;
+        bool irq_found = false;
+
+        for (size_t i = 0; i < hw_resources.count; i++) {
+                hw_resource_t *res = &hw_resources.resources[i];
+                switch (res->type) {
+                case INTERRUPT:
+                        irq = res->res.interrupt.irq;
+                        irq_found = true;
+                        usb_log_debug2("Found interrupt: %d.\n", irq);
+                        break;
+                case MEM_RANGE:
+                        if (res->res.mem_range.address != 0
+                            && res->res.mem_range.size != 0 ) {
+                                mem_address = res->res.mem_range.address;
+                                mem_size = res->res.mem_range.size;
+                                usb_log_debug2("Found mem: %p %zu.\n",
+                                    (void *) mem_address, mem_size);
+                                mem_found = true;
+                        }
+                default:
+                        break;
+                }
         }
+        free(hw_resources.resources);
 
-        if (mem_reg_address)
-                *mem_reg_address = hw_res.mem_ranges.ranges[0].address;
-        if (mem_reg_size)
-                *mem_reg_size = hw_res.mem_ranges.ranges[0].size;
-        if (irq_no)
-                *irq_no = hw_res.irqs.irqs[0];
-
-        hw_res_list_parsed_clean(&hw_res);
-        return EOK;
+        if (mem_found && irq_found) {
+                *mem_reg_address = mem_address;
+                *mem_reg_size = mem_size;
+                *irq_no = irq;
+                return EOK;
+        }
+        return ENOENT;
 }