Changeset c46c356 in mainline

Timestamp:

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

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

2e7692f

Parents:

e50bdd92

Message:

Added command list deallocation during hc finalization.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (1 diff)
• commands.h (modified) (1 diff)
• hc.c (modified) (1 diff)

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

@@ -50 +50 @@
         list_initialize(&hc->commands);
         return EOK;
+}
+
+void xhci_fini_commands(xhci_hc_t *hc)
+{
+        // Note: Untested.
+        assert(hc);
+
+        // We assume that the hc is dying/stopping, so we ignore
+        // the ownership of the commands.
+        list_foreach(hc->commands, link, xhci_cmd_t, cmd) {
+                xhci_free_command(cmd);
+        }
 }
 

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

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

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

@@ -489 +489 @@
         xhci_event_ring_fini(&hc->event_ring);
         hc_dcbaa_fini(hc);
+        xhci_fini_commands(hc);
         pio_disable(hc->base, RNGSZ(hc->mmio_range));
         usb_log_info("HC(%p): Finalized.", hc);