Changeset ebb1489 in mainline for uspace/lib/console/src/con_srv.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/lib/console/src/con_srv.c (modified) (3 diffs)

uspace/lib/console/src/con_srv.c

@@ -53 +53 @@
                 ipc_set_arg4(icall, event->ev.key.mods);
                 ipc_set_arg5(icall, event->ev.key.c);
-                break;
+                return EOK;
         case CEV_POS:
                 ipc_set_arg2(icall, (event->ev.pos.pos_id << 16) | (event->ev.pos.type & 0xffff));
@@ -59 +59 @@
                 ipc_set_arg4(icall, event->ev.pos.hpos);
                 ipc_set_arg5(icall, event->ev.pos.vpos);
-                break;
-        default:
-                return EIO;
-        }
-
-        return EOK;
+                return EOK;
+        case CEV_RESIZE:
+                ipc_set_arg2(icall, 0);
+                ipc_set_arg3(icall, 0);
+                ipc_set_arg4(icall, 0);
+                ipc_set_arg5(icall, 0);
+                return EOK;
+        }
+
+        return EIO;
 }
 
@@ -462 +466 @@
                 }
 
-                if (!received)
+                if (!received || srv->srvs->aborted)
                         break;