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

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

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

@@ -151 +151 @@
                 return rc;
         }
-
+        
         irq_code_t irq_code = {
                 .rangecount = hc_irq_pio_range_count,
@@ -158 +158 @@
                 .cmds = irq_cmds
         };
-
-        /* Register handler to avoid interrupt lockup */
-        rc = register_interrupt_handler(device, irq, handler, &irq_code);
-        if (rc != EOK) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
+        
+        /* Register handler to avoid interrupt lockup */
+        rc = register_interrupt_handler(device, irq, handler, &irq_code);
+        if (rc != EOK) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+        
         return EOK;
 }
@@ -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);
@@ -425 +432 @@
         instance->transfers[USB_SPEED_FULL][USB_TRANSFER_BULK] =
           &instance->transfers_bulk_full;
+        instance->transfers[USB_SPEED_LOW][USB_TRANSFER_BULK] =
+          &instance->transfers_bulk_full;
 
         return EOK;