Changeset 706a3e2 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-08-18T16:21:33Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

5ff9e1d

Parents:

e439f468

Message:

Dcbaa_virt now points to virtual device contexts that contain pointers to trb rings of each of their endpoints for deallocation.

File:

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

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

@@ -483 +483 @@
 static void hc_dcbaa_fini(xhci_hc_t *hc)
 {
+        xhci_trb_ring_t* trb_ring;
         xhci_scratchpad_free(hc);
 
         /* Idx 0 already deallocated by xhci_scratchpad_free. */
         for (unsigned i = 1; i < hc->max_slots + 1; ++i) {
-                if (hc->dcbaa_virt[i] != NULL) {
+                if (hc->dcbaa_virt[i]) {
+                        if (hc->dcbaa_virt[i]->dev_ctx)
+                                free32(hc->dcbaa_virt[i]->dev_ctx);
+
+                        for (unsigned i = 0; i < XHCI_EP_COUNT; ++i) {
+                                trb_ring = hc->dcbaa_virt[i]->trs[i];
+                                if (trb_ring) {
+                                        xhci_trb_ring_fini(trb_ring);
+                                        free32(trb_ring);
+                                }
+                        }
+
                         free32(hc->dcbaa_virt[i]);
                         hc->dcbaa_virt[i] = NULL;