Changeset ebb1489 in mainline for uspace/lib/console

Timestamp:

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

Author:

GitHub <noreply@…>

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

Location:

uspace/lib/console

Files:

• include/io/cons_event.h (modified) (3 diffs)
• src/con_srv.c (modified) (3 diffs)
• src/console.c (modified) (5 diffs)

uspace/lib/console/include/io/cons_event.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #define _LIBCONSOLE_IO_CONS_EVENT_H_
 
-#include <adt/list.h>
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
@@ -44 +43 @@
         CEV_KEY,
         /** Position event */
-        CEV_POS
+        CEV_POS,
+        /** Resize event */
+        CEV_RESIZE,
 } cons_event_type_t;
 
 /** Console event structure. */
 typedef struct {
-        /** List handle */
-        link_t link;
-
         /** Event type */
         cons_event_type_t type;

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;
 

uspace/lib/console/src/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2006 Josef Cejka
  * Copyright (c) 2006 Jakub Vana
@@ -36 +36 @@
 
 #include <as.h>
+#include <dbgcon.h>
 #include <libc.h>
 #include <async.h>
@@ -77 +78 @@
 bool console_kcon(void)
 {
-        return __SYSCALL0(SYS_DEBUG_CONSOLE);
+        return dbgcon_enable();
 }
 
@@ -192 +193 @@
                 event->ev.key.mods = ipc_get_arg4(call);
                 event->ev.key.c = ipc_get_arg5(call);
-                break;
+                return EOK;
         case CEV_POS:
                 event->ev.pos.pos_id = ipc_get_arg2(call) >> 16;
@@ -199 +200 @@
                 event->ev.pos.hpos = ipc_get_arg4(call);
                 event->ev.pos.vpos = ipc_get_arg5(call);
-                break;
-        default:
-                return EIO;
-        }
-
-        return EOK;
+                return EOK;
+        case CEV_RESIZE:
+                return EOK;
+        }
+
+        return EIO;
 }