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

Timestamp:

2017-07-06T13:20:32Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

3256a6c

Parents:

8cbc167

Message:

added scratchpad definition, allocation and deallocation

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (3 diffs)

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

@@ -41 +41 @@
 #include "hc.h"
 #include "hw_struct/trb.h"
+#include "scratchpad.h"
 
 static const irq_cmd_t irq_commands[] = {
@@ -206 +207 @@
                 goto err_cmd_ring;
 
-        // TODO: Allocate scratchpad buffers
-
-        return EOK;
-
+        if ((err = xhci_scratchpad_alloc(hc)))
+                goto err_scratchpad;
+
+        return EOK;
+
+err_scratchpad:
         xhci_event_ring_fini(&hc->event_ring);
 err_cmd_ring:
@@ -434 +437 @@
         xhci_trb_ring_fini(&hc->command_ring);
         xhci_event_ring_fini(&hc->event_ring);
+        xhci_scratchpad_free(hc);
         pio_disable(hc->base, RNGSZ(hc->mmio_range));
         usb_log_info("HC(%p): Finalized.", hc);