Changes in uspace/srv/hid/console/console.c [60ebe63:b48e680f] in mainline

File:

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

uspace/srv/hid/console/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -120 +120 @@
 static errno_t input_ev_active(input_t *);
 static errno_t input_ev_deactive(input_t *);
-static errno_t input_ev_key(input_t *, unsigned, kbd_event_type_t, keycode_t,
-    keymod_t, char32_t);
-static errno_t input_ev_move(input_t *, unsigned, int, int);
-static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned,
-    unsigned, unsigned);
-static errno_t input_ev_button(input_t *, unsigned, int, int);
-static errno_t input_ev_dclick(input_t *, unsigned, int);
+static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t);
+static errno_t input_ev_move(input_t *, int, int);
+static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
+static errno_t input_ev_button(input_t *, int, int);
+static errno_t input_ev_dclick(input_t *, int);
 
 static input_ev_ops_t input_ev_ops = {
@@ -359 +357 @@
 }
 
-static errno_t input_ev_key(input_t *input, unsigned kbd_id,
-    kbd_event_type_t type, keycode_t key, keymod_t mods, char32_t c)
+static errno_t input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key,
+    keymod_t mods, char32_t c)
 {
         cons_event_t event;
@@ -371 +369 @@
                 event.type = CEV_KEY;
 
-                (void)kbd_id;
                 event.ev.key.type = type;
                 event.ev.key.key = key;
@@ -420 +417 @@
 }
 
-static errno_t input_ev_move(input_t *input, unsigned pos_id, int dx, int dy)
-{
-        (void) pos_id;
+static errno_t input_ev_move(input_t *input, int dx, int dy)
+{
         pointer_update(pointer_x + dx, pointer_y + dy);
         return EOK;
 }
 
-static errno_t input_ev_abs_move(input_t *input, unsigned pos_id, unsigned x,
-    unsigned y, unsigned max_x, unsigned max_y)
-{
-        (void)pos_id;
+static errno_t input_ev_abs_move(input_t *input, unsigned x, unsigned y,
+    unsigned max_x, unsigned max_y)
+{
         pointer_update(mouse_scale_x * cols * x / max_x, mouse_scale_y * rows * y / max_y);
         return EOK;
 }
 
-static errno_t input_ev_button(input_t *input, unsigned pos_id, int bnum,
-    int bpress)
+static errno_t input_ev_button(input_t *input, int bnum, int bpress)
 {
         cons_event_t event;
-
-        (void)pos_id;
 
         event.type = CEV_POS;
@@ -452 +444 @@
 }
 
-static errno_t input_ev_dclick(input_t *input, unsigned pos_id, int bnum)
+static errno_t input_ev_dclick(input_t *input, int bnum)
 {
         cons_event_t event;
-
-        (void)pos_id;
 
         event.type = CEV_POS;