Changeset 486f479 in mainline for uspace/drv/bus/usb/ehci/ehci_rh.c

Timestamp:

2014-01-22T19:28:46Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9ff59981

Parents:

82a639cd

Message:

ehci, rh: Port owner bit indicates companion control.

File:

• uspace/drv/bus/usb/ehci/ehci_rh.c (modified) (3 diffs)

uspace/drv/bus/usb/ehci/ehci_rh.c

@@ -275 +275 @@
             (((reg & USB_PORTSC_LINE_STATUS_MASK) == USB_PORTSC_LINE_STATUS_K) ?
                 (1 << USB_HUB_FEATURE_PORT_LOW_SPEED) : 0) |
-            EHCI2USB(reg, USB_PORTSC_PORT_OWNER_FLAG, USB_HUB_FEATURE_PORT_HIGH_SPEED) |
+            ((reg & USB_PORTSC_PORT_OWNER_FLAG) ? 0 : (1 << USB_HUB_FEATURE_PORT_HIGH_SPEED)) |
             EHCI2USB(reg, USB_PORTSC_PORT_TEST_MASK, 11) |
             EHCI2USB(reg, USB_PORTSC_INDICATOR_MASK, 12) |
@@ -396 +396 @@
                 if (!(EHCI_RD(hub->registers->portsc[port]) &
                     USB_PORTSC_ENABLED_FLAG)) {
-                        EHCI_CLR(hub->registers->portsc[port],
+                        EHCI_SET(hub->registers->portsc[port],
                             USB_PORTSC_PORT_OWNER_FLAG);
                 } else {
@@ -443 +443 @@
                             (status & USB_PORTSC_LINE_STATUS_MASK) ==
                                 USB_PORTSC_LINE_STATUS_K)
-                                EHCI_CLR(hub->registers->portsc[port],
+                                EHCI_SET(hub->registers->portsc[port],
                                     USB_PORTSC_PORT_OWNER_FLAG);
                         else