Changeset ddb844e in mainline for uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

Timestamp:

2020-07-03T23:00:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e79a025

Parents:

edb57bc6 (diff), 1a1c75e (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:

Resolve merge conflicts

File:

• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h (modified) (4 diffs)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2020 Jiri Svoboda
  * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
@@ -37 +38 @@
 #define AMDM37X_DISPC_H_
 
-#include <graph.h>
 #include <abi/fb/visuals.h>
+#include <ddev_srv.h>
+#include <ddf/driver.h>
+#include <gfx/context.h>
+#include <gfx/coord.h>
+#include <io/pixel.h>
 #include <pixconv.h>
 #include <ddi.h>
@@ -45 +50 @@
 
 typedef struct {
+        ddf_fun_t *fun;
         amdm37x_dispc_regs_t *regs;
 
@@ -53 +59 @@
                 unsigned pitch;
                 unsigned bpp;
-                unsigned idx;
         } active_fb;
 
+        pixel_t color;
+        gfx_rect_t rect;
         size_t size;
         void *fb_data;
-
-        vslmode_list_element_t modes[1];
 } amdm37x_dispc_t;
 
-errno_t amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis);
-errno_t amdm37x_dispc_fini(amdm37x_dispc_t *instance);
+typedef struct {
+        amdm37x_dispc_t *dispc;
+        gfx_bitmap_alloc_t alloc;
+        gfx_rect_t rect;
+        bool myalloc;
+} amdm37x_bitmap_t;
+
+extern ddev_ops_t amdm37x_ddev_ops;
+extern gfx_context_ops_t amdm37x_gc_ops;
+
+extern errno_t amdm37x_dispc_init(amdm37x_dispc_t *, ddf_fun_t *);
+extern errno_t amdm37x_dispc_fini(amdm37x_dispc_t *);
 
 #endif