Changes in uspace/drv/bus/usb/uhci/hc.c [933b0d7:d57122c] in mainline

File:

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

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

@@ -48 +48 @@
     (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)
 
-
-static const irq_cmd_t uhci_irq_commands[] =
-{
+static const irq_pio_range_t uhci_irq_pio_ranges[] = {
+        {
+                .base = 0,      /* filled later */
+                .size = sizeof(uhci_regs_t)
+        }
+};
+
+static const irq_cmd_t uhci_irq_commands[] = {
         { .cmd = CMD_PIO_READ_16, .dstarg = 1, .addr = NULL/*filled later*/},
         { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2,
@@ -68 +73 @@
 
 /*----------------------------------------------------------------------------*/
+/** Get number of PIO ranges used in IRQ code.
+ * @return Number of ranges.
+ */
+size_t hc_irq_pio_range_count(void)
+{
+        return sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t);
+}
+/*----------------------------------------------------------------------------*/
 /** Get number of commands used in IRQ code.
  * @return Number of commands.
@@ -76 +89 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Generate IRQ code commands.
- * @param[out] cmds Place to store the commands.
- * @param[in] cmd_size Size of the place (bytes).
+/** Generate IRQ code.
+ * @param[out] ranges PIO ranges buffer.
+ * @param[in] ranges_size Size of the ranges buffer (bytes).
+ * @param[out] cmds Commands buffer.
+ * @param[in] cmds_size Size of the commands buffer (bytes).
  * @param[in] regs Physical address of device's registers.
  * @param[in] reg_size Size of the register area (bytes).
@@ -84 +99 @@
  * @return Error code.
  */
-int hc_get_irq_commands(
-    irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size)
-{
-        if (cmd_size < sizeof(uhci_irq_commands)
-            || reg_size < sizeof(uhci_regs_t))
+int
+hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[],
+    size_t cmds_size, uintptr_t regs, size_t reg_size)
+{
+        if ((ranges_size < sizeof(uhci_irq_pio_ranges)) ||
+            (cmds_size < sizeof(uhci_irq_commands)) ||
+            (reg_size < sizeof(uhci_regs_t)))
                 return EOVERFLOW;
 
-        uhci_regs_t *registers = (uhci_regs_t*)regs;
+        memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
+        ranges[0].base = regs;
 
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
-
-        cmds[0].addr = (void*)&registers->usbsts;
-        cmds[3].addr = (void*)&registers->usbsts;
+        uhci_regs_t *registers = (uhci_regs_t *) regs;
+        cmds[0].addr = &registers->usbsts;
+        cmds[3].addr = &registers->usbsts;
+
         return EOK;
 }
@@ -130 +149 @@
                         uhci_transfer_batch_t *batch =
                             uhci_transfer_batch_from_link(item);
-                        uhci_transfer_batch_call_dispose(batch);
+                        uhci_transfer_batch_finish_dispose(batch);
                 }
         }
@@ -192 +211 @@
             "Device registers at %p (%zuB) accessible.\n", io, reg_size);
 
-        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
-        CHECK_RET_RETURN(ret, "Failed to initialize HCD generic driver: %s.\n",
+        ret = hc_init_mem_structures(instance);
+        CHECK_RET_RETURN(ret,
+            "Failed to initialize UHCI memory structures: %s.\n",
             str_error(ret));
+
+#undef CHECK_RET_RETURN
+
+        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;
-
-#undef CHECK_RET_DEST_FUN_RETURN
-
-        ret = hc_init_mem_structures(instance);
-        if (ret != EOK) {
-                usb_log_error(
-                    "Failed to initialize UHCI memory structures: %s.\n",
-                    str_error(ret));
-                hcd_destroy(&instance->generic);
-                return ret;
-        }
 
         hc_init_hw(instance);
@@ -299 +312 @@
         const uint32_t queue = LINK_POINTER_QH(
                 addr_to_phys(instance->transfers_interrupt.queue_head));
-        unsigned i = 0;
-        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
+
+        for (unsigned i = 0; i < UHCI_FRAME_LIST_COUNT; ++i) {
                 instance->frame_list[i] = queue;
         }