Changeset ddb844e in mainline for uspace/lib/ddev/include/ddev_srv.h

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

File:

• uspace/lib/ddev/include/ddev_srv.h (moved) (moved from uspace/lib/c/include/io/visualizer.h ) (3 diffs)

uspace/lib/ddev/include/ddev_srv.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Petr Koupy
+ * Copyright (c) 2019 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdisplay
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef _LIBC_IO_VISUALIZER_H_
-#define _LIBC_IO_VISUALIZER_H_
+#ifndef _LIBDDEV_DDEV_SRV_H_
+#define _LIBDDEV_DDEV_SRV_H_
 
 #include <async.h>
-#include <io/mode.h>
+#include <errno.h>
+#include <gfx/context.h>
+#include "types/ddev/info.h"
 
-extern errno_t visualizer_claim(async_sess_t *, sysarg_t);
-extern errno_t visualizer_yield(async_sess_t *);
+typedef struct ddev_ops ddev_ops_t;
 
-extern errno_t visualizer_enumerate_modes(async_sess_t *, vslmode_t *, sysarg_t);
-extern errno_t visualizer_get_default_mode(async_sess_t *, vslmode_t *);
-extern errno_t visualizer_get_current_mode(async_sess_t *, vslmode_t *);
-extern errno_t visualizer_get_mode(async_sess_t *, vslmode_t *, sysarg_t);
-extern errno_t visualizer_set_mode(async_sess_t *, sysarg_t, sysarg_t, void *);
+/** Display device server structure (per client session) */
+typedef struct {
+        async_sess_t *client_sess;
+        ddev_ops_t *ops;
+        void *arg;
+} ddev_srv_t;
 
-extern errno_t visualizer_update_damaged_region(async_sess_t *,
-    sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
+struct ddev_ops {
+        errno_t (*get_gc)(void *, sysarg_t *, sysarg_t *);
+        errno_t (*get_info)(void *, ddev_info_t *);
+};
 
-extern errno_t visualizer_suspend(async_sess_t *);
-extern errno_t visualizer_wakeup(async_sess_t *);
+extern void ddev_conn(ipc_call_t *, ddev_srv_t *);
+extern void ddev_srv_initialize(ddev_srv_t *);
 
 #endif