Changeset 8d40181 in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2013-09-21T03:25:31Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ea69749f

Parents:

c898236

Message:

ohci,uhci,ehci: Use library provided 'get_registers' function

Location:

uspace/drv/bus/usb/ohci

Files:

• Makefile (modified) (1 diff)
• ohci.c (modified) (3 diffs)
• res.c (deleted)
• res.h (deleted)

uspace/drv/bus/usb/ohci/Makefile

@@ -52 +52 @@
         ohci_endpoint.c \
         ohci_rh.c \
-        res.c \
         hw_struct/endpoint_descriptor.c \
         hw_struct/transfer_descriptor.c

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

@@ -43 +43 @@
 
 #include "ohci.h"
-#include "res.h"
 #include "hc.h"
-
 
 
@@ -80 +78 @@
 int device_setup_ohci(ddf_dev_t *device)
 {
-
-        addr_range_t regs;
-        int irq = 0;
-
-        int ret = get_my_registers(device, &regs, &irq);
-        if (ret != EOK) {
+        hw_res_list_parsed_t hw_res;
+        int ret = hcd_ddf_get_registers(device, &hw_res);
+        if (ret != EOK ||
+            hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) {
                 usb_log_error("Failed to get register memory addresses "
                     "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
@@ -91 +87 @@
                 return ret;
         }
+        addr_range_t regs = hw_res.mem_ranges.ranges[0];
+        const int irq = hw_res.irqs.irqs[0];
+        hw_res_list_parsed_clean(&hw_res);
+
 
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",