Changeset decfc8d1 in mainline

Timestamp:

2017-08-20T18:52:03Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

3d8a3bd

Parents:

8b415cc

Message:

Dcbaa_virt now contains the virtual device contexts instead of just containing pointers to them, this eases its use a lot while wasting a negligale amount of memory.

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)
• rh.c (modified) (2 diffs)
• scratchpad.c (modified) (1 diff)

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

@@ -202 +202 @@
                 return ENOMEM;
 
-        hc->dcbaa_virt = malloc32((1 + hc->max_slots) * sizeof(xhci_device_ctx_t*));
+        hc->dcbaa_virt = malloc32((1 + hc->max_slots) * sizeof(xhci_virt_device_ctx_t));
         if (!hc->dcbaa_virt) {
                 err = ENOMEM;
@@ -507 +507 @@
         /* Idx 0 already deallocated by xhci_scratchpad_free. */
         for (unsigned i = 1; i < hc->max_slots + 1; ++i) {
-                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);
-                                }
+                if (hc->dcbaa_virt[i].dev_ctx) {
+                        free32(hc->dcbaa_virt[i].dev_ctx);
+                        hc->dcbaa_virt[i].dev_ctx = NULL;
+                }
+
+                for (unsigned i = 0; i < XHCI_EP_COUNT; ++i) {
+                        trb_ring = hc->dcbaa_virt[i].trs[i];
+                        if (trb_ring) {
+                                hc->dcbaa_virt[i].trs[i] = NULL;
+                                xhci_trb_ring_fini(trb_ring);
+                                free32(trb_ring);
                         }
-
-                        free32(hc->dcbaa_virt[i]);
-                        hc->dcbaa_virt[i] = NULL;
                 }
         }

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

@@ -73 +73 @@
         xhci_event_ring_t event_ring;
         uint64_t *dcbaa;
-        xhci_virt_device_ctx_t **dcbaa_virt;
+        xhci_virt_device_ctx_t *dcbaa_virt;
         xhci_scratchpad_t *scratchpad;
 

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

@@ -126 +126 @@
 
         hc->dcbaa[slot_id] = addr_to_phys(dctx);
-        hc->dcbaa_virt[slot_id]->dev_ctx = dctx;
+
+        memset(&hc->dcbaa_virt[slot_id], 0, sizeof(xhci_virt_device_ctx_t));
+        hc->dcbaa_virt[slot_id].dev_ctx = dctx;
 
         cmd = xhci_alloc_command();
@@ -145 +147 @@
                 free32(dctx);
                 hc->dcbaa[slot_id] = 0;
-                hc->dcbaa_virt[slot_id] = NULL;
+                memset(&hc->dcbaa_virt[slot_id], 0, sizeof(xhci_virt_device_ctx_t));
         }
 err_ring:

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

@@ -132 +132 @@
 
         hc->dcbaa[0] = 0;
-        hc->dcbaa_virt[0] = NULL;
+        memset(&hc->dcbaa_virt[0], 0, sizeof(xhci_virt_device_ctx_t));
+
         return;
 }