Changeset e273e9e in mainline for uspace/srv/hid/console

Timestamp:

2024-10-03T18:48:48Z (10 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

5132379

Parents:

b2c9e42c

Message:

Move link out of cons_event_t

Location:

uspace/srv/hid/console

Files:

• console.c (modified) (4 diffs)
• console.h (modified) (2 diffs)

uspace/srv/hid/console/console.c

@@ -334 +334 @@
 {
         /* Got key press/release event */
-        cons_event_t *event =
-            (cons_event_t *) malloc(sizeof(cons_event_t));
+        cons_qevent_t *event =
+            (cons_qevent_t *) malloc(sizeof(cons_qevent_t));
         if (event == NULL)
                 return;
 
-        *event = *ev;
+        event->ev = *ev;
         link_initialize(&event->link);
 
@@ -556 +556 @@
                 if (pos < size) {
                         link_t *link = prodcons_consume(&cons->input_pc);
-                        cons_event_t *event = list_get_instance(link,
-                            cons_event_t, link);
+                        cons_qevent_t *qevent = list_get_instance(link,
+                            cons_qevent_t, link);
+                        cons_event_t *event = &qevent->ev;
 
                         /* Accept key presses of printable chars only. */
@@ -567 +568 @@
                         }
 
-                        free(event);
+                        free(qevent);
                 }
         }
@@ -703 +704 @@
         console_t *cons = srv_to_console(srv);
         link_t *link = prodcons_consume(&cons->input_pc);
-        cons_event_t *cevent = list_get_instance(link, cons_event_t, link);
-
-        *event = *cevent;
-        free(cevent);
+        cons_qevent_t *qevent = list_get_instance(link, cons_qevent_t, link);
+
+        *event = qevent->ev;
+        free(qevent);
         return EOK;
 }

uspace/srv/hid/console/console.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2006 Josef Cejka
  * All rights reserved.
@@ -36 +37 @@
 #define CONSOLE_CONSOLE_H__
 
+#include <adt/prodcons.h>
+#include <io/cons_event.h>
+
 #define CONSOLE_COUNT   11
+
+/** Console event queue entry */
+typedef struct {
+        /** Link to list of events */
+        link_t link;
+        /** Console event */
+        cons_event_t ev;
+} cons_qevent_t;
 
 #endif