Changeset 00aece0 in mainline for uspace/drv/bus/usb/ohci/pci.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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:

Merge mainline changes.

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.h>
+#include <device/hw_res_parsed.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 =
@@ -70 +67 @@
         if (!parent_sess)
                 return ENOMEM;
-        
-        hw_resource_list_t hw_resources;
-        int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
-        if (rc != EOK) {
-                async_hangup(parent_sess);
-                return rc;
+
+        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) {
+                return ret;
         }
-        
-        uintptr_t mem_address = 0;
-        size_t mem_size = 0;
-        bool mem_found = false;
-        
-        int irq = 0;
-        bool irq_found = false;
-        
-        size_t i;
-        for (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;
-                }
+
+        /* 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;
         }
-        
-        if (mem_found && irq_found) {
-                *mem_reg_address = mem_address;
-                *mem_reg_size = mem_size;
-                *irq_no = irq;
-                rc = EOK;
-        } else
-                rc = ENOENT;
-        
-        async_hangup(parent_sess);
-        return rc;
+
+        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;
 }