Changeset 1d758fc in mainline for uspace/lib/drv/generic/remote_usbhc.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/lib/drv/generic/remote_usbhc.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -210 +210 @@
                         ? AS_AREA_WRITE : AS_AREA_READ;
 
-                const errno_t ret = async_share_out_start(exch, req->base, flags);
+                const errno_t ret = async_share_out_start(exch, req->buffer.virt, flags);
                 if (ret != EOK) {
                         async_forget(opening_request);
@@ -374 +374 @@
                 return;
         }
-        if (trans->request.base != NULL) {
-                as_area_destroy(trans->request.base);
+        if (trans->request.buffer.virt != NULL) {
+                as_area_destroy(trans->request.buffer.virt);
         }
 
@@ -422 +422 @@
         }
 
-        if ((err = async_share_out_finalize(data_callid, &trans->request.base)))
+        if ((err = async_share_out_finalize(data_callid, &trans->request.buffer.virt)))
                 return err;
 
         /*
-         * As we're going to check the mapping, we must make sure the memory is
-         * actually mapped. We must do it right now, because the area might be
-         * read-only or write-only, and we may be unsure later.
+         * As we're going to get physical addresses of the mapping, we must make
+         * sure the memory is actually mapped. We must do it right now, because
+         * the area might be read-only or write-only, and we may be unsure
+         * later.
          */
         if (flags & AS_AREA_READ) {
                 char foo = 0;
-                volatile const char *buf = trans->request.base + trans->request.offset;
+                volatile const char *buf = trans->request.buffer.virt + trans->request.offset;
                 for (size_t i = 0; i < size; i += PAGE_SIZE)
                         foo += buf[i];
         } else {
-                volatile char *buf = trans->request.base + trans->request.offset;
+                volatile char *buf = trans->request.buffer.virt + trans->request.offset;
                 for (size_t i = 0; i < size; i += PAGE_SIZE)
                         buf[i] = 0xff;
@@ -482 +483 @@
         } else {
                 /* The value was valid on the other side, for us, its garbage. */
-                trans->request.base = NULL;
+                trans->request.buffer.virt = NULL;
         }