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

Timestamp:

2018-01-19T15:25:20Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

861b5d6

Parents:

c7d5189

Message:

xhci: setup also slot context where needed

File:

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

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

@@ -87 +87 @@
 
         /* Address device */
-        if ((err = hc_address_device(bus->hc, dev, ep0)))
+        if ((err = hc_address_device(dev, ep0)))
                 goto err_added;
 
@@ -128 +128 @@
         xhci_setup_endpoint_context(ep0, &ep_ctx);
 
-        if ((err = hc_update_endpoint(hc, dev->slot_id, 0, &ep_ctx)))
+        if ((err = hc_update_endpoint(dev, 0, &ep_ctx)))
                 return err;
 
@@ -238 +238 @@
 
         /* Transition the device from the Addressed to the Configured state. */
-        if ((err = hc_configure_device(bus->hc, dev->slot_id))) {
+        if ((err = hc_configure_device(dev))) {
                 usb_log_warning("Failed to configure device " XHCI_DEV_FMT ".", XHCI_DEV_ARGS(*dev));
                 return err;
@@ -263 +263 @@
 
         /* Issue one HC command to simultaneously drop all endpoints except zero. */
-        if ((err = hc_deconfigure_device(bus->hc, dev->slot_id))) {
+        if ((err = hc_deconfigure_device(dev))) {
                 usb_log_warning("Failed to deconfigure device " XHCI_DEV_FMT ".",
                     XHCI_DEV_ARGS(*dev));
@@ -312 +312 @@
 {
         int err;
-        xhci_bus_t *bus = bus_to_xhci_bus(endpoint_get_bus(ep_base));
         xhci_endpoint_t *ep = xhci_endpoint_get(ep_base);
         xhci_device_t *dev = xhci_device_get(ep_base->device);
@@ -319 +318 @@
         xhci_setup_endpoint_context(ep, &ep_ctx);
 
-        if ((err = hc_add_endpoint(bus->hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx)))
+        if ((err = hc_add_endpoint(dev, xhci_endpoint_index(ep), &ep_ctx)))
                 return err;
 
@@ -330 +329 @@
 static int endpoint_abort(endpoint_t *ep)
 {
-        xhci_bus_t *bus = bus_to_xhci_bus(endpoint_get_bus(ep));
         xhci_device_t *dev = xhci_device_get(ep->device);
 
@@ -337 +335 @@
         if (ep->active_batch) {
                 if (dev->slot_id) {
-                        const int err = hc_stop_endpoint(bus->hc, dev->slot_id, xhci_endpoint_dci(xhci_endpoint_get(ep)));
+                        const int err = hc_stop_endpoint(dev, xhci_endpoint_dci(xhci_endpoint_get(ep)));
                         if (err) {
                                 usb_log_warning("Failed to stop endpoint %u of device " XHCI_DEV_FMT ": %s",
@@ -370 +368 @@
 {
         int err;
-        xhci_bus_t *bus = bus_to_xhci_bus(endpoint_get_bus(ep_base));
         xhci_endpoint_t *ep = xhci_endpoint_get(ep_base);
         xhci_device_t *dev = xhci_device_get(ep_base->device);
@@ -379 +376 @@
         if (dev->slot_id) {
 
-                if ((err = hc_drop_endpoint(bus->hc, dev->slot_id, xhci_endpoint_index(ep)))) {
+                if ((err = hc_drop_endpoint(dev, xhci_endpoint_index(ep)))) {
                         usb_log_error("Failed to drop endpoint " XHCI_EP_FMT ": %s", XHCI_EP_ARGS(*ep), str_error(err));
                 }