Changeset 72d120e in mainline for uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

Timestamp:

2014-06-16T20:17:44Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Integrate from mainline.

File:

• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (2 diffs)

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);