Changeset dcf0597 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-10-13T17:40:48Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2297fab

Parents:

063dfe8

Message:

xhci rh: move away from virthub

xHC's root hub is too different from other HCs, that it does not make sense to use usbhub for driving it.

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (4 diffs)

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

@@ -425 +425 @@
         XHCI_REG_SET(hc->op_regs, XHCI_OP_RS, 1);
 
+        /* The reset changed status of all ports, and SW originated reason does
+         * not cause an interrupt.
+         */
+        xhci_rh_handle_port_change(&hc->rh);
+
         return EOK;
 }
@@ -451 +456 @@
 {
         assert(batch);
-
-        /* Check for root hub communication */
-        if (batch->ep->target.address == xhci_rh_get_address(&hc->rh)) {
-                usb_log_debug("XHCI root hub request.\n");
-                return xhci_rh_schedule(&hc->rh, batch);
-        }
 
         usb_log_debug2("EP(%d:%d) started %s transfer of size %lu.",
@@ -488 +487 @@
 static event_handler event_handlers [] = {
         [XHCI_TRB_TYPE_COMMAND_COMPLETION_EVENT] = &xhci_handle_command_completion,
-        [XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT] = &xhci_handle_port_status_change_event,
+        [XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT] = &xhci_rh_handle_port_status_change_event,
         [XHCI_TRB_TYPE_TRANSFER_EVENT] = &xhci_handle_transfer_event,
 };
@@ -559 +558 @@
         status = xhci2host(32, status);
 
-        /* TODO: Figure out how root hub interrupts work. */
         if (status & XHCI_REG_MASK(XHCI_OP_PCD)) {
                 usb_log_debug2("Root hub interrupt.");
-                xhci_rh_interrupt(&hc->rh);
-
+                xhci_rh_handle_port_change(&hc->rh);
                 status &= ~XHCI_REG_MASK(XHCI_OP_PCD);
         }