Changeset af2a76c in mainline for uspace/drv

Timestamp:

2014-07-13T17:25:15Z (12 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

7493e7b

Parents:

b8e75319 (diff), 78192cc7 (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.

Location:

uspace/drv

Files:

• bus/isa/isa.c (modified) (1 diff)
• fb/amdm37x_dispc/amdm37x_dispc.c (modified) (1 diff)
• fb/amdm37x_dispc/main.c (modified) (3 diffs)
• fb/kfb/kfb.c (modified) (2 diffs)
• fb/kfb/port.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -355 +355 @@
 
         /* Get the name part of the rest of the line. */
-        strtok(line, ":");
+        str_tok(line, ":", NULL);
         return line;
 }

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -34 +34 @@
  */
 
+#include <align.h>
 #include <assert.h>
 #include <errno.h>

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 =

uspace/drv/fb/kfb/kfb.c

@@ -40 +40 @@
 #include <task.h>
 #include <graph.h>
-#include <ops/graph_dev.h>
 #include "port.h"
 #include "kfb.h"
@@ -60 +59 @@
 };
 
-static graph_dev_ops_t graph_vsl_dev_ops = {
-        .connect = (connect_func) &graph_visualizer_connection
-};
-
-ddf_dev_ops_t graph_vsl_device_ops = {
-        .interfaces[GRAPH_DEV_IFACE] = &graph_vsl_dev_ops
-};
-
-static graph_dev_ops_t graph_rnd_dev_ops = {
-        .connect = (connect_func) &graph_renderer_connection
-};
-
-ddf_dev_ops_t graph_rnd_device_ops = {
-        .interfaces[GRAPH_DEV_IFACE] = &graph_rnd_dev_ops
-};
-
 int main(int argc, char *argv[])
 {

uspace/drv/fb/kfb/port.c

@@ -207 +207 @@
 };
 
+static void graph_vsl_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        visualizer_t *vsl;
+
+        vsl = (visualizer_t *) ddf_fun_data_get((ddf_fun_t *)arg);
+        graph_visualizer_connection(vsl, iid, icall, NULL);
+}
+
 int port_init(ddf_dev_t *dev)
 {
@@ -346 +354 @@
                 return ENOMEM;
         }
-        ddf_fun_set_ops(fun_vs, &graph_vsl_device_ops);
+        ddf_fun_set_conn_handler(fun_vs, &graph_vsl_connection);
 
         visualizer_t *vs = ddf_fun_data_alloc(fun_vs, sizeof(visualizer_t));