Changeset de19d4a in mainline

Timestamp:

2020-06-26T20:41:14Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

aef48ce

Parents:

78445be8

Message:

Clean up vestiges of visualizer interface

Files:

• abi/include/abi/ipc/interfaces.h (modified) (1 diff)
• meson/part/initrd_manifest/meson.build (modified) (1 diff)
• uspace/drv/fb/amdm37x_dispc/main.c (modified) (2 diffs)
• uspace/lib/c/generic/io/visualizer.c (deleted)
• uspace/lib/c/include/io/visualizer.h (deleted)
• uspace/lib/c/include/ipc/graph.h (deleted)
• uspace/lib/c/meson.build (modified) (1 diff)
• uspace/lib/gui/window.c (modified) (1 diff)
• uspace/srv/hid/rfb/main.c (modified) (2 diffs)
• uspace/srv/locsrv/locsrv.c (modified) (1 diff)

abi/include/abi/ipc/interfaces.h

@@ -112 +112 @@
         INTERFACE_OUTPUT =
             FOURCC_COMPACT('o', 'u', 'd', 'v') | IFACE_EXCHANGE_SERIALIZE,
-        INTERFACE_COMPOSITOR =
-            FOURCC_COMPACT('c', 'm', 'p', 's') | IFACE_EXCHANGE_SERIALIZE,
         INTERFACE_HOUND =
             FOURCC_COMPACT('h', 'o', 'u', 'n') | IFACE_EXCHANGE_PARALLEL,
-        INTERFACE_VISUALIZER_CB =
-            FOURCC_COMPACT('v', 's', 'd', 'v') | IFACE_EXCHANGE_PARALLEL | IFACE_MOD_CALLBACK,
         INTERFACE_LOC_SUPPLIER =
             FOURCC_COMPACT('l', 'o', 'c', 's') | IFACE_EXCHANGE_SERIALIZE,

meson/part/initrd_manifest/meson.build

@@ -63 +63 @@
                 'app/vterm',
 
-                'srv/hid/compositor',
+                'srv/hid/display',
         ]
 endif

uspace/drv/fb/amdm37x_dispc/main.c

@@ -91 +91 @@
         ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "a");
         if (!fun) {
-                ddf_log_error("Failed to create visualizer function.");
+                ddf_log_error("Failed to create display device function.");
                 return ENOMEM;
         }
@@ -124 +124 @@
         rc = ddf_fun_add_to_category(fun, "display-device");
         if (rc != EOK) {
-                ddf_log_error("Failed to add function: %s to visualizer "
+                ddf_log_error("Failed to add function: %s to display device "
                     "category.", str_error(rc));
                 amdm37x_dispc_fini(dispc);

uspace/lib/c/meson.build

@@ -131 +131 @@
         'generic/io/console.c',
         'generic/io/table.c',
-        'generic/io/visualizer.c',
         'generic/iplink.c',
         'generic/iplink_srv.c',

uspace/lib/gui/window.c

@@ -405 +405 @@
         errno_t rc;
 
-        if (width < 2 * border_thickness + header_min_width) {
-                //win_damage(win->osess, 0, 0, 0, 0);
-                return;
-        }
-
-        if (height < 2 * border_thickness + header_height) {
-                //win_damage(win->osess, 0, 0, 0, 0);
-                return;
-        }
+        if (width < 2 * border_thickness + header_min_width)
+                return;
+
+        if (height < 2 * border_thickness + header_height)
+                return;
 
         fibril_mutex_lock(&win->guard);

uspace/srv/hid/rfb/main.c

@@ -427 +427 @@
         rc = loc_category_get_id("display-device", &ddev_cid, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                fprintf(stderr, NAME ": Unable to get visualizer category id.\n");
+                fprintf(stderr, NAME ": Unable to get display device category id.\n");
                 return 1;
         }
@@ -433 +433 @@
         rc = loc_service_add_to_cat(service_id, ddev_cid);
         if (rc != EOK) {
-                fprintf(stderr, NAME ": Unable to add service to visualizer category.\n");
+                fprintf(stderr, NAME ": Unable to add service to display device category.\n");
                 return 1;
         }

uspace/srv/locsrv/locsrv.c

@@ -1378 +1378 @@
         categ_dir_add_cat(&cdir, cat);
 
-        cat = category_new("visualizer");
-        categ_dir_add_cat(&cdir, cat);
-
         cat = category_new("renderer");
         categ_dir_add_cat(&cdir, cat);