Changeset 25251bb in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-26T08:38:53Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

928afc8d

Parents:

62558202

Message:

xhci: move pointer to hc from device to bus

Also, fixes the bug of hc ptr not set on tier 2+ device.

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (3 diffs)

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

@@ -102 +102 @@
         const xhci_port_speed_t *port_speed = xhci_rh_get_port_speed(rh, port_id);
         xhci_device_t *xhci_dev = xhci_device_get(dev);
-        xhci_dev->hc = rh->hc;
         xhci_dev->usb3 = port_speed->major == 3;
         xhci_dev->rh_port = port_id;
@@ -363 +362 @@
 }
 
-static inline int get_hub_available_bandwidth(xhci_device_t* dev, uint8_t speed, xhci_port_bandwidth_ctx_t *ctx) {
+static inline int get_hub_available_bandwidth(xhci_hc_t *hc, xhci_device_t* dev, uint8_t speed, xhci_port_bandwidth_ctx_t *ctx) {
         // TODO: find a correct place for this function + API
         // We need speed, because a root hub device has both USB 2 and USB 3 speeds
@@ -383 +382 @@
 
         int err;
-        if ((err = xhci_cmd_sync(dev->hc, &cmd))) {
+        if ((err = xhci_cmd_sync(hc, &cmd))) {
                 goto end;
         }