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

Timestamp:

2017-10-02T19:16:29Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1f76b7d

Parents:

370a1c8

Message:

xhci commands: enable (and encourage) keeping commands on the stack

It is now not necessary to use the heap for simple commands.

File:

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

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

@@ -63 +63 @@
         int err;
 
-        xhci_cmd_t *cmd = xhci_alloc_command();
-        if (!cmd)
-                return ENOMEM;
-
-        xhci_send_enable_slot_command(hc, cmd);
-        if ((err = xhci_wait_for_command(cmd, 100000)) != EOK) {
-                usb_log_error("Failed to enable a slot for the device.");
-                goto err_command;
-        }
-
-        uint32_t slot_id = cmd->slot_id;
+        xhci_cmd_t cmd;
+        xhci_cmd_init(&cmd);
+
+        xhci_send_enable_slot_command(hc, &cmd);
+        if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
+                return err;
+
+        uint32_t slot_id = cmd.slot_id;
+
         usb_log_debug2("Obtained slot ID: %u.\n", slot_id);
-
-        xhci_free_command(cmd);
-        cmd = NULL;
+        xhci_cmd_fini(&cmd);
 
         xhci_input_ctx_t *ictx = malloc32(sizeof(xhci_input_ctx_t));
         if (!ictx) {
-                err = ENOMEM;
-                goto err_command;
+                return ENOMEM;
         }
 
@@ -90 +85 @@
         XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 1);
 
-        /* Initialize slot_ctx according to section 4.3.3 point 3. */
+        /* Initialize slot_ctx according to section 4.3.3 point 3. */
         /* Attaching to root hub port, root string equals to 0. */
         XHCI_SLOT_ROOT_HUB_PORT_SET(ictx->slot_ctx, port);
@@ -133 +128 @@
         hc->dcbaa_virt[slot_id].dev_ctx = dctx;
 
-        cmd = xhci_alloc_command();
-        cmd->ictx = ictx;
-        xhci_send_address_device_command(hc, cmd);
-        if ((err = xhci_wait_for_command(cmd, 100000)) != EOK)
+        xhci_cmd_init(&cmd);
+        xhci_send_address_device_command(hc, &cmd, ictx);
+        if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
                 goto err_dctx;
 
-        xhci_free_command(cmd);
-        ictx = NULL;
+        xhci_cmd_fini(&cmd);
 
         // TODO: Issue configure endpoint commands (sec 4.3.5).
@@ -158 +151 @@
         }
 err_ictx:
-        if (ictx) {
-                /* Avoid double free. */
-                if (cmd && cmd->ictx && cmd->ictx == ictx)
-                        cmd->ictx = NULL;
-                free32(ictx);
-        }
-err_command:
-        if (cmd)
-                xhci_free_command(cmd);
+        free32(ictx);
         return err;
 }