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

Timestamp:

2014-07-23T21:38:25Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ffa96c2

Parents:

87a3df7f

Message:

Convert OHCI and UHCI away from DDF_DATA_IMPLANT.

File:

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

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

@@ -230 +230 @@
  *
  * @param[in] instance Memory place to initialize.
+ * @param[in] HC function node
  * @param[in] regs Range of device's I/O control registers.
  * @param[in] interrupts True if hw interrupts should be used.
@@ -238 +239 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
+int hc_init(hc_t *instance, ddf_fun_t *fun, addr_range_t *regs, bool interrupts)
 {
         assert(regs->size >= sizeof(uhci_regs_t));
@@ -266 +267 @@
         }
 
-        hcd_init(&instance->generic, USB_SPEED_FULL,
+        instance->generic = ddf_fun_data_alloc(fun, sizeof(hcd_t));
+        if (instance->generic == NULL) {
+                usb_log_error("Out of memory.\n");
+                return ENOMEM;
+        }
+
+        hcd_init(instance->generic, USB_SPEED_FULL,
             BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
 
-        instance->generic.private_data = instance;
-        instance->generic.schedule = hc_schedule;
-        instance->generic.ep_add_hook = NULL;
+        instance->generic->private_data = instance;
+        instance->generic->schedule = hc_schedule;
+        instance->generic->ep_add_hook = NULL;
 
         hc_init_hw(instance);