Changeset 7813516 in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2014-01-01T01:19:10Z (12 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

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)
• ohci.c (modified) (3 diffs)

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

@@ -148 +148 @@
  *
  * @param[in] instance Memory place for the structure.
- * @param[in] regs Device's I/O registers range.
+ * @param[in] regs Device's resources
  * @param[in] interrupts True if w interrupts should be used
  * @return Error code
  */
-int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
-{
-        assert(instance);
-
-        int ret = pio_enable_range(regs, (void **) &instance->registers);
+int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
+{
+        assert(instance);
+        assert(hw_res);
+        if (hw_res->mem_ranges.count != 1 ||
+            hw_res->mem_ranges.ranges[0].size < sizeof(ohci_regs_t))
+            return EINVAL;
+
+        int ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
+            (void **) &instance->registers);
         if (ret != EOK) {
-                usb_log_error("Failed to gain access to device registers: %s.\n",
+                usb_log_error("Failed to gain access to registers: %s.\n",
                     str_error(ret));
                 return ret;
         }
+        usb_log_debug("Device registers at %" PRIx64 " (%zuB) accessible.\n",
+            hw_res->mem_ranges.ranges[0].address.absolute,
+            hw_res->mem_ranges.ranges[0].size);
 
         list_initialize(&instance->pending_batches);
@@ -186 +194 @@
         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*/
+};
 
 void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)

uspace/drv/bus/usb/ohci/hc.h

@@ -77 +77 @@
 int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
-int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts);
-
-/** Safely dispose host controller internal structures
- *
- * @param[in] instance Host controller structure to use.
- */
-static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
+int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts);
+void hc_fini(hc_t *instance);
 
 void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep);

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

@@ -87 +87 @@
         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) {
+        if (ret != EOK) {
                 usb_log_error("Failed to get register memory addresses "
                     "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
@@ -94 +93 @@
                 return ret;
         }
-        addr_range_t regs = hw_res.mem_ranges.ranges[0];
 
         /* Initialize generic HCD driver */
@@ -127 +125 @@
 
         /* Initialize OHCI HC */
-        ret = hc_init(hc, &regs, interrupts);
+        ret = hc_init(hc, &hw_res, interrupts);
         hw_res_list_parsed_clean(&hw_res);
         if (ret != EOK) {