Changes in uspace/srv/hid/console/console.c [e273e9e:49aaa0e] in mainline

File:

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

uspace/srv/hid/console/console.c

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