Changeset 02f45748 in mainline for uspace/srv/hid/display/main.c

Timestamp:

2019-12-10T10:07:43Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

23e86c6

Parents:

df1a019

git-author:

Jiri Svoboda <jiri@…> (2019-12-09 18:07:30)

git-committer:

Jiri Svoboda <jiri@…> (2019-12-10 10:07:43)

Message:

Source display server events from input server

File:

• uspace/srv/hid/display/main.c (modified) (3 diffs)

uspace/srv/hid/display/main.c

@@ -50 +50 @@
 #include "display.h"
 #include "dsops.h"
+#include "input.h"
 #include "main.h"
 #include "output.h"
@@ -61 +62 @@
         .ev_pending = display_client_ev_pending
 };
-
-static void display_kbd_event(void *arg, kbd_event_t *event)
-{
-        ds_display_t *disp = (ds_display_t *) arg;
-
-        ds_display_post_kbd_event(disp, event);
-}
-
-static void display_pos_event(void *arg, pos_event_t *event)
-{
-        ds_display_t *disp = (ds_display_t *) arg;
-
-        ds_display_post_pos_event(disp, event);
-}
 
 static void display_client_ev_pending(void *arg)
@@ -102 +89 @@
                 goto error;
 
-#if 0
         rc = ds_input_open(disp);
         if (rc != EOK)
                 goto error;
-#endif
-        rc = ds_output_create(display_kbd_event, (void *) disp,
-            display_pos_event, (void *) disp, &output);
+
+        rc = ds_output_create(&output);
         if (rc != EOK)
                 goto error;