Changeset 1215db9 in mainline for uspace/srv

Timestamp:

2021-06-26T23:30:18Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e87415e6

Parents:

bb14312

Message:

Memory GC needs to be able to forward cursor control

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (3 diffs)
• window.c (modified) (2 diffs)

uspace/srv/hid/display/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +53 @@
 static void ds_display_update_cb(void *);
 
+static mem_gc_cb_t ds_display_mem_gc_cb = {
+        .invalidate = ds_display_invalidate_cb,
+        .update = ds_display_update_cb
+};
+
 /** Create display.
  *
@@ -459 +464 @@
                 goto error;
 
-        rc = mem_gc_create(&disp->rect, &alloc,
-            ds_display_invalidate_cb, ds_display_update_cb, (void *) disp,
-            &disp->bbgc);
+        rc = mem_gc_create(&disp->rect, &alloc, &ds_display_mem_gc_cb,
+            (void *) disp, &disp->bbgc);
         if (rc != EOK)
                 goto error;

uspace/srv/hid/display/window.c

@@ -53 +53 @@
 static void ds_window_get_preview_rect(ds_window_t *, gfx_rect_t *);
 
+static mem_gc_cb_t ds_window_mem_gc_cb = {
+        .invalidate = ds_window_invalidate_cb,
+        .update = ds_window_update_cb
+};
+
 /** Create window.
  *
@@ -108 +113 @@
         }
 
-        rc = mem_gc_create(&params->rect, &alloc, ds_window_invalidate_cb,
-            ds_window_update_cb, (void *)wnd, &wnd->mgc);
+        rc = mem_gc_create(&params->rect, &alloc, &ds_window_mem_gc_cb,
+            (void *)wnd, &wnd->mgc);
         if (rc != EOK)
                 goto error;