Changeset 8e7c9fe in mainline for uspace/drv/fb/amdm37x_dispc/main.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

uspace/drv/fb/amdm37x_dispc/main.c

@@ -35 +35 @@
  */
 
+#include <ddf/driver.h>
 #include <ddf/log.h>
 #include <errno.h>
 #include <str_error.h>
 #include <stdio.h>
-#include <ops/graph_dev.h>
 #include <graph.h>
 
@@ -46 +46 @@
 #define NAME  "amdm37x_dispc"
 
-static graph_dev_ops_t graph_vsl_dev_ops = {
-        .connect = (connect_func) &graph_visualizer_connection
-};
+static void graph_vsl_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        visualizer_t *vsl;
 
-static ddf_dev_ops_t graph_fun_ops = {
-        .interfaces[GRAPH_DEV_IFACE] = &graph_vsl_dev_ops
-};
+        vsl = (visualizer_t *) ddf_fun_data_get((ddf_fun_t *)arg);
+        graph_visualizer_connection(vsl, iid, icall, NULL);
+}
 
 static int amdm37x_dispc_dev_add(ddf_dev_t *dev)
@@ -74 +74 @@
         vis->reg_svc_handle = ddf_fun_get_handle(fun);
 
-        ddf_fun_set_ops(fun, &graph_fun_ops);
+        ddf_fun_set_conn_handler(fun, graph_vsl_connection);
         /* Hw part */
         amdm37x_dispc_t *dispc =