Changeset 8442d10 in mainline for uspace/drv/fb

Timestamp:

2013-09-09T21:48:12Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c67dbd6

Parents:

2e2c18a1

Message:

improve the API of physmem_map(), dmamem_map() and dmamem_map_anonymous()
the "constraint" argument of dmamem_map_anonymous() should be used to specify bits disallowed in the physical frame address

Location:

uspace/drv/fb

Files:

• amdm37x_dispc/amdm37x_dispc.c (modified) (1 diff)
• kfb/port.c (modified) (1 diff)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -273 +273 @@
         ddf_log_note("Setting mode: %ux%ux%u\n", x, y, bpp*8);
         const size_t size = ALIGN_UP(x * y * bpp, PAGE_SIZE);
-        void *buffer, *pa;
-        int ret = dmamem_map_anonymous(size, AS_AREA_READ | AS_AREA_WRITE,
-            0, &pa, &buffer);
+        uintptr_t pa;
+        void *buffer;
+        int ret = dmamem_map_anonymous(size, DMAMEM_4GiB,
+            AS_AREA_READ | AS_AREA_WRITE, 0, &pa, &buffer);
         if (ret != EOK) {
                 ddf_log_error("Failed to get new FB\n");

uspace/drv/fb/kfb/port.c

@@ -333 +333 @@
         
         kfb.size = scanline * height;
-        rc = physmem_map((void *) paddr + offset,
+        rc = physmem_map(paddr + offset,
             ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
             AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);