Changes in uspace/drv/fb/amdm37x_dispc/main.c [de19d4a:4f87a85a] in mainline

File:

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

uspace/drv/fb/amdm37x_dispc/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
  * Copyright (c) 2013 Jan Vesely
  * Copyright (c) 2011 Petr Koupy
@@ -36 +35 @@
  */
 
-#include <ddev_srv.h>
 #include <ddf/driver.h>
 #include <ddf/log.h>
 #include <errno.h>
-#include <ipcgfx/server.h>
 #include <str_error.h>
 #include <stdio.h>
+#include <graph.h>
 
 #include "amdm37x_dispc.h"
@@ -48 +46 @@
 #define NAME  "amdm37x_dispc"
 
-static void amdm37x_client_conn(ipc_call_t *icall, void *arg)
+static void graph_vsl_connection(ipc_call_t *icall, void *arg)
 {
-        amdm37x_dispc_t *dispc;
-        ddev_srv_t srv;
-        sysarg_t gc_id;
-        gfx_context_t *gc;
-        errno_t rc;
+        visualizer_t *vsl;
 
-        dispc = (amdm37x_dispc_t *) ddf_dev_data_get(
-            ddf_fun_get_dev((ddf_fun_t *) arg));
-
-        gc_id = ipc_get_arg3(icall);
-
-        if (gc_id == 0) {
-                /* Set up protocol structure */
-                ddev_srv_initialize(&srv);
-                srv.ops = &amdm37x_ddev_ops;
-                srv.arg = dispc;
-
-                /* Handle connection */
-                ddev_conn(icall, &srv);
-        } else {
-                assert(gc_id == 42);
-
-                rc = gfx_context_new(&amdm37x_gc_ops, dispc, &gc);
-                if (rc != EOK)
-                        goto error;
-
-                /* GC connection */
-                gc_conn(icall, gc);
-        }
-
-        return;
-error:
-        async_answer_0(icall, rc);
+        vsl = (visualizer_t *) ddf_fun_data_get((ddf_fun_t *)arg);
+        graph_visualizer_connection(vsl, icall, NULL);
 }
 
@@ -88 +57 @@
 {
         assert(dev);
-
-        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "a");
+        /* Visualizer part */
+        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "viz");
         if (!fun) {
-                ddf_log_error("Failed to create display device function.");
+                ddf_log_error("Failed to create visualizer function.");
                 return ENOMEM;
         }
 
-        ddf_fun_set_conn_handler(fun, &amdm37x_client_conn);
+        visualizer_t *vis = ddf_fun_data_alloc(fun, sizeof(visualizer_t));
+        if (!vis) {
+                ddf_log_error("Failed to allocate visualizer structure.");
+                ddf_fun_destroy(fun);
+                return ENOMEM;
+        }
 
+        graph_init_visualizer(vis);
+        vis->reg_svc_handle = ddf_fun_get_handle(fun);
+
+        ddf_fun_set_conn_handler(fun, graph_vsl_connection);
         /* Hw part */
         amdm37x_dispc_t *dispc =
@@ -106 +84 @@
         }
 
-        errno_t rc = amdm37x_dispc_init(dispc, fun);
+        errno_t rc = amdm37x_dispc_init(dispc, vis);
         if (rc != EOK) {
                 ddf_log_error("Failed to init dispc: %s.", str_error(rc));
@@ -122 +100 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, "display-device");
+        rc = ddf_fun_add_to_category(fun, "visualizer");
         if (rc != EOK) {
-                ddf_log_error("Failed to add function: %s to display device "
+                ddf_log_error("Failed to add function: %s to visualizer "
                     "category.", str_error(rc));
                 amdm37x_dispc_fini(dispc);