Changeset ddb844e in mainline for uspace/lib/c

Timestamp:

2020-07-03T23:00:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e79a025

Parents:

edb57bc6 (diff), 1a1c75e (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.

Message:

Resolve merge conflicts

Location:

uspace/lib/c

Files:

• generic/io/visualizer.c (deleted)
• generic/io/window.c (deleted)
• include/io/kbd_event.h (modified) (1 diff)
• include/io/window.h (modified) (2 diffs)
• include/ipc/services.h (modified) (1 diff)
• meson.build (modified) (1 diff)

uspace/lib/c/include/io/kbd_event.h

@@ -37 +37 @@
 
 #include <adt/list.h>
+#include <inttypes.h>
 #include <io/keycode.h>
 

uspace/lib/c/include/io/window.h

@@ -36 +36 @@
 #define _LIBC_IO_WINDOW_H_
 
-#include <stdbool.h>
-#include <async.h>
-#include <loc.h>
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <types/common.h>
 
 typedef enum {
@@ -113 +111 @@
 } window_event_t;
 
-extern errno_t win_register(async_sess_t *, window_flags_t, service_id_t *,
-    service_id_t *);
-
-extern errno_t win_get_event(async_sess_t *, window_event_t *);
-
-extern errno_t win_damage(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
-extern errno_t win_grab(async_sess_t *, sysarg_t, sysarg_t);
-extern errno_t win_resize(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    window_placement_flags_t, void *);
-extern errno_t win_close(async_sess_t *);
-extern errno_t win_close_request(async_sess_t *);
-
 #endif
 

uspace/lib/c/include/ipc/services.h

@@ -54 +54 @@
 #define SERVICE_NAME_CLIPBOARD "clipboard"
 #define SERVICE_NAME_CORECFG  "corecfg"
+#define SERVICE_NAME_DISPLAY  "hid/display"
 #define SERVICE_NAME_DHCP     "net/dhcp"
 #define SERVICE_NAME_DNSR     "net/dnsr"

uspace/lib/c/meson.build

@@ -131 +131 @@
         'generic/io/console.c',
         'generic/io/table.c',
-        'generic/io/visualizer.c',
-        'generic/io/window.c',
         'generic/iplink.c',
         'generic/iplink_srv.c',