Changeset e67c50a in mainline for uspace/drv/bus/usb/ohci/ohci_bus.c

Timestamp:

2018-02-01T21:13:23Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

64ce0c1

Parents:

3e6ff9a

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-01 21:13:22)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-01 21:13:23)

Message:

ohci: use dma memory responsibly

Instead of leaving arbitrary TD behind to be used by next transfer,
prepare two of them in endpoint and use them in a cyclic manner. This
reduces the number of pages allocated per transfer to one.

File:

• uspace/drv/bus/usb/ohci/ohci_bus.c (modified) (4 diffs)

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -75 +75 @@
         assert(dev);
 
-        ohci_endpoint_t *ohci_ep = malloc(sizeof(ohci_endpoint_t));
+        ohci_endpoint_t *ohci_ep = calloc(1, sizeof(ohci_endpoint_t));
         if (ohci_ep == NULL)
                 return NULL;
@@ -81 +81 @@
         endpoint_init(&ohci_ep->base, dev, desc);
 
-        ohci_ep->ed = malloc32(sizeof(ed_t));
-        if (ohci_ep->ed == NULL) {
+        const errno_t err = dma_buffer_alloc(&ohci_ep->dma_buffer, sizeof(ed_t) + 2 * sizeof(td_t));
+        if (err) {
                 free(ohci_ep);
                 return NULL;
         }
 
-        ohci_ep->td = malloc32(sizeof(td_t));
-        if (ohci_ep->td == NULL) {
-                free32(ohci_ep->ed);
-                free(ohci_ep);
-                return NULL;
-        }
+        ohci_ep->ed = ohci_ep->dma_buffer.virt;
+
+        ohci_ep->tds[0] = (td_t *) ohci_ep->ed + 1;
+        ohci_ep->tds[1] = ohci_ep->tds[0] + 1;
 
         link_initialize(&ohci_ep->eplist_link);
@@ -109 +107 @@
         ohci_endpoint_t *instance = ohci_endpoint_get(ep);
 
-        free32(instance->ed);
-        free32(instance->td);
+        dma_buffer_free(&instance->dma_buffer);
         free(instance);
 }
@@ -125 +122 @@
                 return err;
 
-        ed_init(ohci_ep->ed, ep, ohci_ep->td);
+        ed_init(ohci_ep->ed, ep, ohci_ep->tds[0]);
         hc_enqueue_endpoint(bus->hc, ep);
         endpoint_set_online(ep, &bus->hc->guard);