Changeset b80c1ab in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-11-14T23:17:54Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

e76c0ea

Parents:

cfe4852

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 23:15:24)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 23:17:54)

Message:

xhci: use dma_buffers instead of malloc32 util

A bit of refactoring was needed to adapt scratchpad buffers.

File:

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

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

@@ -38 +38 @@
 #include <usb/request.h>
 #include <usb/debug.h>
-#include <usb/host/utils/malloc32.h>
 #include <usb/host/bus.h>
 #include <usb/host/ddf_helpers.h>
+#include <usb/host/dma_buffer.h>
 #include <usb/host/hcd.h>
 
@@ -305 +305 @@
 }
 
-static inline int get_hub_available_bandwidth(xhci_hc_t *hc, xhci_device_t* dev, uint8_t speed, xhci_port_bandwidth_ctx_t *ctx) {
+static inline int get_hub_available_bandwidth(xhci_hc_t *hc, xhci_device_t* dev, uint8_t speed, xhci_port_bandwidth_ctx_t *ctx)
+{
+        int err = EOK;
+
         // TODO: find a correct place for this function + API
         // We need speed, because a root hub device has both USB 2 and USB 3 speeds
@@ -313 +316 @@
         assert(ctx);
 
-        xhci_port_bandwidth_ctx_t *in_ctx = malloc32(sizeof(xhci_port_bandwidth_ctx_t));
-        if (!in_ctx) {
-                return ENOMEM;
-        }
-
         xhci_cmd_t cmd;
         xhci_cmd_init(&cmd, XHCI_CMD_GET_PORT_BANDWIDTH);
 
-        cmd.bandwidth_ctx = in_ctx;
+        if ((err = dma_buffer_alloc(&cmd.bandwidth_ctx, sizeof(xhci_port_bandwidth_ctx_t))))
+                goto end;
+
         cmd.device_speed = speed;
 
-        int err;
-        if ((err = xhci_cmd_sync(hc, &cmd))) {
+        if ((err = xhci_cmd_sync(hc, &cmd)))
                 goto end;
-        }
-
-        memcpy(ctx, in_ctx, sizeof(xhci_port_bandwidth_ctx_t));
+
+        memcpy(ctx, cmd.bandwidth_ctx.virt, sizeof(xhci_port_bandwidth_ctx_t));
 
 end:
         xhci_cmd_fini(&cmd);
-        return EOK;
+        return err;
 }