Changeset 8e4a408 in mainline

Timestamp:

2014-07-09T23:25:28Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1b979a

Parents:

7d276395

Message:

Visualizer should use a custom connection handler instead of a single-method devman interface. This fixes rfb, which was broken.

Location:

uspace

Files:

• drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (1 diff)
• drv/fb/amdm37x_dispc/main.c (modified) (3 diffs)
• drv/fb/kfb/kfb.c (modified) (2 diffs)
• drv/fb/kfb/port.c (modified) (2 diffs)
• lib/c/include/ipc/dev_iface.h (modified) (1 diff)
• lib/drv/Makefile (modified) (1 diff)
• lib/drv/generic/dev_iface.c (modified) (2 diffs)
• lib/drv/generic/private/remote_graph_dev.h (deleted)
• lib/drv/generic/remote_graph_dev.c (deleted)
• lib/drv/include/graph_iface.h (deleted)
• lib/drv/include/ops/graph_dev.h (deleted)
• srv/hid/compositor/compositor.c (modified) (2 diffs)

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));

uspace/lib/c/include/ipc/dev_iface.h

@@ -40 +40 @@
         /** Character device interface */
         CHAR_DEV_IFACE,
-
-        /** Graphic device interface */
-        GRAPH_DEV_IFACE,
 
         /** Audio device mixer interface */

uspace/lib/drv/Makefile

@@ -47 +47 @@
         generic/remote_pio_window.c \
         generic/remote_char_dev.c \
-        generic/remote_graph_dev.c \
         generic/remote_nic.c \
         generic/remote_usb.c \

uspace/lib/drv/generic/dev_iface.c

@@ -45 +45 @@
 #include "remote_led_dev.h"
 #include "remote_battery_dev.h"
-#include "remote_graph_dev.h"
 #include "remote_nic.h"
 #include "remote_usb.h"
@@ -62 +61 @@
                 [PIO_WINDOW_DEV_IFACE] = &remote_pio_window_iface,
                 [CHAR_DEV_IFACE] = &remote_char_dev_iface,
-                [GRAPH_DEV_IFACE] = &remote_graph_dev_iface,
                 [NIC_DEV_IFACE] = &remote_nic_iface,
                 [PCI_DEV_IFACE] = &remote_pci_iface,

uspace/srv/hid/compositor/compositor.c

@@ -57 +57 @@
 
 #include <event.h>
-#include <graph_iface.h>
 #include <io/keycode.h>
 #include <io/mode.h>
@@ -1156 +1155 @@
         if (sess == NULL) {
                 printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
-                return NULL;
-        }
-
-        rc = graph_dev_connect(sess);
-        if (rc != EOK) {
-                printf("%s: Failed initializing visualiser %s\n", NAME, svc);
                 return NULL;
         }