Changeset bf9cb2f in mainline for uspace/drv/fb

Timestamp:

2014-05-19T01:01:27Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

10ef47ba

Parents:

527f1ca

Message:

complete the desired API semantics of physmem_map() and dmamem_map_anonymous() to be compatible with as_area_create()
(the user is allowed to request a specific virtual memory base address, the kernel uses an available base address if AS_AREA_ANY is used)

Location:

uspace/drv/fb

Files:

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

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -38 +38 @@
 #include <ddf/log.h>
 #include <ddi.h>
-#include <abi/mm/as.h>
+#include <as.h>
 
 #include "amdm37x_dispc.h"
@@ -274 +274 @@
         const size_t size = ALIGN_UP(x * y * bpp, PAGE_SIZE);
         uintptr_t pa;
-        void *buffer;
+        void *buffer = AS_AREA_ANY;
         int ret = dmamem_map_anonymous(size, DMAMEM_4GiB,
             AS_AREA_READ | AS_AREA_WRITE, 0, &pa, &buffer);

uspace/drv/fb/kfb/port.c

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