Changeset 1d758fc in mainline for uspace/drv/bus/usb/xhci/commands.c

Timestamp:

2018-02-12T10:11:47Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5fe3f954

Parents:

2f762a7

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)

Message:

usb: rethinking DMA buffers

File:

• uspace/drv/bus/usb/xhci/commands.c (modified) (4 diffs)

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

@@ -470 +470 @@
         xhci_trb_clean(&cmd->_header.trb);
 
-        TRB_SET_ICTX(cmd->_header.trb, cmd->input_ctx.phys);
+        const uintptr_t phys = dma_buffer_phys_base(&cmd->input_ctx);
+        TRB_SET_ICTX(cmd->_header.trb, phys);
 
         /**
@@ -496 +497 @@
                 assert(dma_buffer_is_set(&cmd->input_ctx));
 
-                TRB_SET_ICTX(cmd->_header.trb, cmd->input_ctx.phys);
+                const uintptr_t phys = dma_buffer_phys_base(&cmd->input_ctx);
+                TRB_SET_ICTX(cmd->_header.trb, phys);
         }
 
@@ -520 +522 @@
         xhci_trb_clean(&cmd->_header.trb);
 
-        TRB_SET_ICTX(cmd->_header.trb, cmd->input_ctx.phys);
+        const uintptr_t phys = dma_buffer_phys_base(&cmd->input_ctx);
+        TRB_SET_ICTX(cmd->_header.trb, phys);
 
         TRB_SET_TYPE(cmd->_header.trb, XHCI_TRB_TYPE_EVALUATE_CONTEXT_CMD);
@@ -594 +597 @@
         xhci_trb_clean(&cmd->_header.trb);
 
-        TRB_SET_ICTX(cmd->_header.trb, cmd->bandwidth_ctx.phys);
+        const uintptr_t phys = dma_buffer_phys_base(&cmd->input_ctx);
+        TRB_SET_ICTX(cmd->_header.trb, phys);
 
         TRB_SET_TYPE(cmd->_header.trb, XHCI_TRB_TYPE_GET_PORT_BANDWIDTH_CMD);