Changeset c7d11a0b in mainline

Timestamp:

2013-01-21T00:10:36Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a14f346

Parents:

6ab189f

Message:

amdm37x_dispc: Fixes.

Assign vizualizer ops.
Store pointer to newly created fb.
Compile fixes in previously unused functions.
Pass bits per pixel instead of bytes to the setup function.
Drop kfb leftovers.

Location:

uspace/drv/fb/amdm37x_dispc

Files:

• Makefile (modified) (1 diff)
• amdm37x_dispc.c (modified) (6 diffs)
• main.c (modified) (3 diffs)
• port.c (deleted)
• port.h (deleted)

uspace/drv/fb/amdm37x_dispc/Makefile

@@ -44 +44 @@
 
 SOURCES = \
-        port.c \
         amdm37x_dispc.c \
         main.c

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -42 +42 @@
 #include "amdm37x_dispc.h"
 
-
 static int change_mode(visualizer_t *vis, vslmode_t mode);
 static int handle_damage(visualizer_t *vs,
     sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
     sysarg_t x_offset, sysarg_t y_offset);
+static int dummy(visualizer_t *vs)
+{
+        return EOK;
+}
 
 static const visualizer_ops_t amdm37x_dispc_vis_ops = {
         .change_mode = change_mode,
         .handle_damage = handle_damage,
-        // TODO DO we need dummy implementations of stuff like claim, yield, ...
+        .claim = dummy,
+        .yield = dummy,
+        .suspend = dummy,
+        .wakeup = dummy,
 };
-
 
 static const struct {
@@ -127 +132 @@
         vis->dev_ctx = instance;
         vis->def_mode_idx = 0;
+        vis->ops = amdm37x_dispc_vis_ops;
         list_append(&instance->modes[0].link, &vis->modes);
 
@@ -237 +243 @@
         regs->control |= AMDM37X_DISPC_CONTROL_LCD_ENABLE_FLAG;
         regs->control |= AMDM37X_DISPC_CONTROL_DIGITAL_ENABLE_FLAG;
+        return EOK;
 }
 
@@ -251 +258 @@
         const unsigned x = mode.screen_width;
         const unsigned y = mode.screen_height;
-        ddf_log_note("Setting mode: %ux%ux%u\n", x, y, bpp);
-        const size_t size = x * y * bpp;
+        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,
@@ -260 +267 @@
                 return ret;
         }
-        amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp, (uint32_t)pa);
+        amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp *8, (uint32_t)pa);
         dispc->active_fb.idx = mode.index;
         dispc->active_fb.width = x;
@@ -267 +274 @@
         dispc->active_fb.bpp = bpp;
         dispc->active_fb.pixel2visual = p2v;
+        dispc->fb_data = buffer;
+        dispc->size = size;
         assert(mode.index < 1);
 

uspace/drv/fb/amdm37x_dispc/main.c

@@ -41 +41 @@
 #include <ops/graph_dev.h>
 #include <graph.h>
-#include "port.h"
 
 #include "amdm37x_dispc.h"
@@ -57 +56 @@
 static int amdm37x_dispc_dev_add(ddf_dev_t *dev)
 {
+        assert(dev);
         /* Visualizer part */
-        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "dispc");
+        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "viz");
         if (!fun) {
                 ddf_log_error("Failed to create visualizer function\n");
@@ -100 +100 @@
         }
         ddf_fun_add_to_category(fun, "visualizer");
+
+        ddf_log_note("Added device `%s'\n", ddf_dev_get_name(dev));
         return EOK;
 }