Changeset b5111c46 in mainline for uspace/drv/bus/usb/ohci/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/ohci/hc.c (modified) (6 diffs)

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

@@ -193 +193 @@
         instance->rh.address = 1;
         rc = usb_device_manager_request_address(
-            &instance->generic.dev_manager, &instance->rh.address, false,
+            &instance->generic->dev_manager, &instance->rh.address, false,
             USB_SPEED_FULL);
         if (rc != EOK) {
@@ -204 +204 @@
 
         rc = usb_endpoint_manager_add_ep(
-            &instance->generic.ep_manager, instance->rh.address, 0,
+            &instance->generic->ep_manager, instance->rh.address, 0,
             USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
             0, NULL, NULL);
@@ -231 +231 @@
         fun_bound = true;
 
-        rc = usb_device_manager_bind_address(&instance->generic.dev_manager,
+        rc = usb_device_manager_bind_address(&instance->generic->dev_manager,
             instance->rh.address, ddf_fun_get_handle(hub_fun));
         if (rc != EOK) {
@@ -244 +244 @@
         if (ep_added) {
                 usb_endpoint_manager_remove_ep(
-                    &instance->generic.ep_manager, instance->rh.address, 0,
+                    &instance->generic->ep_manager, instance->rh.address, 0,
                     USB_DIRECTION_BOTH, NULL, NULL);
         }
         if (addr_reqd) {
                 usb_device_manager_release_address(
-                    &instance->generic.dev_manager, instance->rh.address);
+                    &instance->generic->dev_manager, instance->rh.address);
         }
         return rc;
@@ -257 +257 @@
  *
  * @param[in] instance Memory place for the structure.
+ * @param[in] HC function node
  * @param[in] regs Device's I/O registers range.
  * @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)
+int hc_init(hc_t *instance, ddf_fun_t *fun, addr_range_t *regs, bool interrupts)
 {
         assert(instance);
@@ -274 +275 @@
         list_initialize(&instance->pending_batches);
 
-        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 = ohci_endpoint_init;
-        instance->generic.ep_remove_hook = ohci_endpoint_fini;
+        instance->generic->private_data = instance;
+        instance->generic->schedule = hc_schedule;
+        instance->generic->ep_add_hook = ohci_endpoint_init;
+        instance->generic->ep_remove_hook = ohci_endpoint_fini;
 
         rc = hc_init_memory(instance);