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

Timestamp:

2017-10-25T08:03:13Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

a5b3de6

Parents:

0206d35

Message:

Big command refactoring. Unified and encapsulated command function API. Removed explicit heap command (de)allocation functions. Added three functions for (a)synchronous command issuing and neat inline macro with syntax sugar.

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (1 diff)

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

@@ -374 +374 @@
         // ctx is an out parameter as of now
         assert(dev);
-
-        ctx = malloc(sizeof(xhci_port_bandwidth_ctx_t));
-        if(!ctx)
+        assert(ctx);
+
+        xhci_port_bandwidth_ctx_t *in_ctx = malloc32(sizeof(xhci_port_bandwidth_ctx_t));
+        if (!in_ctx) {
                 return ENOMEM;
+        }
 
         xhci_cmd_t cmd;
-        xhci_cmd_init(&cmd);
-
-        xhci_get_port_bandwidth_command(dev->hc, &cmd, ctx, speed);
-
-        int err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT);
-        if(err != EOK) {
-                free(ctx);
-                ctx = NULL;
-        }
-
+        xhci_cmd_init(&cmd, XHCI_CMD_GET_PORT_BANDWIDTH);
+
+        cmd.bandwidth_ctx = in_ctx;
+        cmd.device_speed = speed;
+
+        int err;
+        if ((err = xhci_cmd_sync(dev->hc, &cmd))) {
+                goto end;
+        }
+
+        memcpy(ctx, in_ctx, sizeof(xhci_port_bandwidth_ctx_t));
+
+end:
+        xhci_cmd_fini(&cmd);
         return EOK;
 }