Changeset 8a9a41e in mainline for uspace/srv/hid/display/window.c

Timestamp:

2021-10-24T08:28:43Z (4 years ago)

Author:

GitHub <noreply@…>

Children:

9ea3a41

Parents:

2ce943a (diff), cd981f2a (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.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/srv/hid/display/window.c (modified) (2 diffs)

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;