Changeset 1d4148e in mainline

Timestamp:

2017-08-20T17:09:49Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

d271f78

Parents:

9304b66

Message:

Added a trb own flag to the command structure to avoid tries to deallocate parts of the command ring.

Location:

uspace/drv/bus/usb/xhci

Files:

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

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

@@ -108 +108 @@
          */
         cmd->has_owner = true;
+        cmd->owns_trb = false;
 
         return cmd;
@@ -118 +119 @@
         if (cmd->ictx)
                 free32(cmd->ictx);
-        if (cmd->trb)
+        if (cmd->owns_trb && cmd->trb)
                 free32(cmd->trb);
 
@@ -550 +551 @@
                 command->trb = malloc32(sizeof(xhci_trb_t));
                 xhci_trb_copy(command->trb, command_trb);
+                command->owns_trb = true;
         }
 

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

@@ -54 +54 @@
         bool completed;
         bool has_owner;
+        bool owns_trb;
 } xhci_cmd_t;