Changeset 7813516 in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2014-01-01T01:19:10Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7191992

Parents:

d1df381

Message:

uhci,ohci,ehci: Use all hw resources to initialize HC

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (3 diffs)

uspace/drv/bus/usb/uhci/hc.c

@@ -212 +212 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
-{
-        assert(instance);
-        assert(regs);
-        assert(regs->size >= sizeof(uhci_regs_t));
+int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
+{
+        assert(instance);
+        assert(hw_res);
+        if (hw_res->io_ranges.count != 1 ||
+            hw_res->io_ranges.ranges[0].size < sizeof(uhci_regs_t))
+            return EINVAL;
 
         instance->hw_interrupts = interrupts;
@@ -222 +224 @@
 
         /* allow access to hc control registers */
-        uhci_regs_t *io;
-        int ret = pio_enable_range(regs, (void **) &io);
+        int ret = pio_enable_range(&hw_res->io_ranges.ranges[0],
+            (void **) &instance->registers);
         if (ret != EOK) {
-                usb_log_error("Failed to gain access to registers at %p: %s.\n",
-                    io, str_error(ret));
+                usb_log_error("Failed to gain access to registers: %s.\n",
+                    str_error(ret));
                 return ret;
         }
-        instance->registers = io;
-
-        usb_log_debug(
-            "Device registers at %p (%zuB) accessible.\n", io, regs->size);
+
+        usb_log_debug("Device registers at %" PRIx64 " (%zuB) accessible.\n",
+            hw_res->io_ranges.ranges[0].address.absolute,
+            hw_res->io_ranges.ranges[0].size);
 
         ret = hc_init_mem_structures(instance);
@@ -253 +255 @@
 
         return EOK;
+}
+
+/** Safely dispose host controller internal structures
+ *
+ * @param[in] instance Host controller structure to use.
+ */
+void hc_fini(hc_t *instance)
+{
+        assert(instance);
+        //TODO Implement
 }