Changeset c4d4fa2 in mainline

Timestamp:

2017-07-23T19:13:15Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

e50bdd92

Parents:

a06fd64

Message:

Removed unused parameter to command waiting function. Removed redundant code in command completion handler. Added trb copying for later use by the owner of the command. Added deallocation of the aforementioned trb copy when the command that owns it is deallocated.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (5 diffs)
• commands.h (modified) (1 diff)

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

@@ -52 +52 @@
 }
 
-int xhci_wait_for_command(xhci_hc_t *hc, xhci_cmd_t *cmd, uint32_t timeout)
+int xhci_wait_for_command(xhci_cmd_t *cmd, uint32_t timeout)
 {
         uint32_t time = 0;
@@ -85 +85 @@
 void xhci_free_command(xhci_cmd_t *cmd)
 {
-        // TODO: If we decide to copy trb, free it here.
         if (cmd->ictx)
                 free32(cmd->ictx);
+        if (cmd->trb)
+                free32(cmd->trb);
 
         free32(cmd);
@@ -382 +383 @@
 {
         // TODO: Update dequeue ptrs.
-        // TODO: Possibly clone command trb, as it may get overwritten before
-        //       it is processed (if somebody polls the command completion).
         assert(hc);
         assert(trb);
@@ -393 +392 @@
         xhci_cmd_t *command;
         xhci_trb_t *command_trb;
-
-        code = XHCI_DWORD_EXTRACT(trb->status, 31, 24);
-        slot_id = XHCI_DWORD_EXTRACT(trb->control, 31, 24);
-        (void) slot_id;
 
         command = get_next_command(hc);
@@ -451 +446 @@
         command->completed = true;
 
-        if (!command->has_owner)
+        if (!command->has_owner) {
                 xhci_free_command(command);
+        } else {
+                /* Copy the trb for later use so that we can free space on the cmd ring. */
+                command->trb = malloc32(sizeof(xhci_trb_t));
+                xhci_trb_copy(command->trb, command_trb);
+        }
 
         return EOK;

uspace/drv/bus/usb/xhci/commands.h

@@ -57 +57 @@
 
 int xhci_init_commands(xhci_hc_t *);
-int xhci_wait_for_command(xhci_hc_t *, xhci_cmd_t *, uint32_t);
+int xhci_wait_for_command(xhci_cmd_t *, uint32_t);
 xhci_cmd_t *xhci_alloc_command(void);
 void xhci_free_command(xhci_cmd_t *);