Changeset 96228d0 in mainline for uspace/drv/fb/amdm37x_dispc/main.c

Timestamp:

2013-01-20T21:34:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7fa2031

Parents:

9cc4b2b4

Message:

amdm37x_dispc: Initialize associated visualizer in dispc_init

File:

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

uspace/drv/fb/amdm37x_dispc/main.c

@@ -57 +57 @@
 static int amdm37x_dispc_dev_add(ddf_dev_t *dev)
 {
+        /* Visualizer part */
         ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "dispc");
         if (!fun) {
@@ -63 +64 @@
         }
 
+        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->reg_svc_handle = ddf_fun_get_handle(fun);
+
+        ddf_fun_set_ops(fun, &graph_fun_ops);
         /* Hw part */
         amdm37x_dispc_t *dispc =
@@ -72 +84 @@
         }
 
-        int ret = amdm37x_dispc_init(dispc);
+        int ret = amdm37x_dispc_init(dispc, vis);
         if (ret != EOK) {
                 ddf_log_error("Failed to init dispc: %s\n", str_error(ret));
@@ -79 +91 @@
         }
 
-        /* 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);
+        /* Report to devman */
         ret = ddf_fun_bind(fun);
         if (ret != EOK) {