Changeset 74db5a1 in mainline for uspace/drv/fb/amdm37x_dispc/main.c

Timestamp:

2013-01-20T20:47:02Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9cc4b2b4

Parents:

163bc23

Message:

amdm37x_dispc: Add function initialization.

Covnert register map to uspace.

File:

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

uspace/drv/fb/amdm37x_dispc/main.c

@@ -28 +28 @@
  */
 
-/** @addtogroup kfb
+/** @addtogroup amdm37x
  * @{
  */
@@ -35 +35 @@
  */
 
+#include <ddf/log.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdio.h>
+#include <ops/graph_dev.h>
+#include <graph.h>
 #include "port.h"
+
+#include "amdm37x_dispc.h"
 
 #define NAME  "amdm37x_dispc"
 
+static graph_dev_ops_t graph_vsl_dev_ops = {
+        .connect = (connect_func) &graph_visualizer_connection
+};
+
+static ddf_dev_ops_t graph_fun_ops = {
+        .interfaces[GRAPH_DEV_IFACE] = &graph_vsl_dev_ops
+};
+
 static int amdm37x_dispc_dev_add(ddf_dev_t *dev)
 {
-        port_init(dev);
-        printf("%s: Accepting connections\n", NAME);
+        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "dispc");
+        if (!fun) {
+                ddf_log_error("Failed to create visualizer function\n");
+                return ENOMEM;
+        }
+        amdm37x_dispc_t *dispc =
+            ddf_fun_data_alloc(fun, sizeof(amdm37x_dispc_t));
+        if (!dispc) {
+                ddf_log_error("Failed to allocate dispc structure\n");
+                ddf_fun_destroy(fun);
+                return ENOMEM;
+        }
+        ddf_fun_set_ops(fun, &graph_fun_ops);
+        int ret = amdm37x_dispc_init(dispc);
+        if (ret != EOK) {
+                ddf_log_error("Failed to init dispc: %s\n", str_error(ret));
+                ddf_fun_destroy(fun);
+                return ret;
+        }
+        ret = ddf_fun_bind(fun);
+        if (ret != EOK) {
+                ddf_log_error("Failed to bind function: %s\n", str_error(ret));
+                amdm37x_dispc_fini(dispc);
+                ddf_fun_destroy(fun);
+                return ret;
+        }
         return EOK;
 }
@@ -60 +98 @@
 {
         printf("%s: HelenOS AM/DM37x framebuffer driver\n", NAME);
+        ddf_log_init(NAME);
         return ddf_driver_main(&amdm37x_dispc_driver);
 }