Changeset 15d0046 in mainline for uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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:

Merge mainline changes

File:

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

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -34 +34 @@
  */
 
+#include <align.h>
 #include <assert.h>
 #include <errno.h>
 #include <ddf/log.h>
 #include <ddi.h>
-#include <abi/mm/as.h>
+#include <as.h>
 
 #include "amdm37x_dispc.h"
@@ -274 +275 @@
         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);