Changeset 9cc4b2b4 in mainline

Timestamp:

2013-01-20T21:06:33Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

96228d0

Parents:

74db5a1

Message:

amdm37x_dispc: Init vizualizer.

Location:

uspace/drv/fb/amdm37x_dispc

Files:

• Makefile (modified) (1 diff)
• amdm37x_dispc.c (added)
• amdm37x_dispc.h (modified) (2 diffs)
• main.c (modified) (4 diffs)

uspace/drv/fb/amdm37x_dispc/Makefile

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

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

@@ -37 +37 @@
 #define AMDM37X_DISPC_H_
 
+#include <graph.h>
+
 #include "amdm37x_dispc_regs.h"
 
@@ -44 +46 @@
 } amdm37x_dispc_t;
 
-static inline int amdm37x_dispc_init(amdm37x_dispc_t *instance)
-{
-        return EOK;
-};
-static inline int amdm37x_dispc_fini(amdm37x_dispc_t *instance)
-{
-        return EOK;
-};
+extern const visualizer_ops_t amdm37x_dispc_vis_ops;
+
+int amdm37x_dispc_init(amdm37x_dispc_t *instance);
+int amdm37x_dispc_fini(amdm37x_dispc_t *instance);
 
 #endif
-
 /** @}
  */

uspace/drv/fb/amdm37x_dispc/main.c

@@ -62 +62 @@
                 return ENOMEM;
         }
+
+        /* Hw part */
         amdm37x_dispc_t *dispc =
-            ddf_fun_data_alloc(fun, sizeof(amdm37x_dispc_t));
+            ddf_dev_data_alloc(dev, sizeof(amdm37x_dispc_t));
         if (!dispc) {
                 ddf_log_error("Failed to allocate dispc structure\n");
@@ -69 +71 @@
                 return ENOMEM;
         }
-        ddf_fun_set_ops(fun, &graph_fun_ops);
+
         int ret = amdm37x_dispc_init(dispc);
         if (ret != EOK) {
@@ -76 +78 @@
                 return ret;
         }
+
+        /* Visualizer part */
+        visualizer_t *vis = ddf_fun_data_alloc(fun, sizeof(visualizer_t));
+        if (!vis) {
+                ddf_log_error("Failed to allocate visualizer structure\n");
+                ddf_fun_destroy(fun);
+                return ENOMEM;
+        }
+
+        graph_init_visualizer(vis);
+        vis->def_mode_idx = 0; // TODO: What is this? Why is this not handled
+                               // via init?
+        vis->ops = amdm37x_dispc_vis_ops;
+        vis->dev_ctx = dispc;
+        vis->reg_svc_handle = ddf_fun_get_handle(fun);
+
+        ddf_fun_set_ops(fun, &graph_fun_ops);
         ret = ddf_fun_bind(fun);
         if (ret != EOK) {
@@ -83 +102 @@
                 return ret;
         }
+        ddf_fun_add_to_category(fun, "visualizer");
         return EOK;
 }