Changeset a0d4afe in mainline for uspace/srv/hid/display/display.c

Timestamp:

2023-01-18T16:51:44Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3e7e226

Parents:

b0ae23f

Message:

Make sure input device configuration is destroyed together with seat

When a seat is destroyed without unassigning devices first, this causes
a dangling seat pointer that would cause the display server to crash
if the corresponding device generates an event.

File:

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

uspace/srv/hid/display/display.c

@@ -796 +796 @@
 {
         assert(idevcfg->display == NULL);
-        assert(!link_used(&idevcfg->lidevcfgs));
+        assert(!link_used(&idevcfg->ldispidcfgs));
 
         idevcfg->display = disp;
-        list_append(&idevcfg->lidevcfgs, &disp->idevcfgs);
+        list_append(&idevcfg->ldispidcfgs, &disp->idevcfgs);
 }
 
@@ -808 +808 @@
 void ds_display_remove_idevcfg(ds_idevcfg_t *idevcfg)
 {
-        list_remove(&idevcfg->lidevcfgs);
+        list_remove(&idevcfg->ldispidcfgs);
         idevcfg->display = NULL;
 }
@@ -824 +824 @@
                 return NULL;
 
-        return list_get_instance(link, ds_idevcfg_t, lidevcfgs);
+        return list_get_instance(link, ds_idevcfg_t, ldispidcfgs);
 }
 
@@ -834 +834 @@
 ds_idevcfg_t *ds_display_next_idevcfg(ds_idevcfg_t *idevcfg)
 {
-        link_t *link = list_next(&idevcfg->lidevcfgs, &idevcfg->display->idevcfgs);
-
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ds_idevcfg_t, lidevcfgs);
+        link_t *link = list_next(&idevcfg->ldispidcfgs, &idevcfg->display->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, ldispidcfgs);
 }