Changeset 6af4b4f in mainline for uspace/srv/hid/display/main.c

Timestamp:

2019-10-05T08:45:25Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bef51cf

Parents:

c8cf261

git-author:

Jiri Svoboda <jiri@…> (2019-10-04 17:52:54)

git-committer:

Jiri Svoboda <jiri@…> (2019-10-05 08:45:25)

Message:

Introduce ds_display_t, ds_window_t

File:

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

uspace/srv/hid/display/main.c

@@ -46 +46 @@
 #include <task.h>
 #include "display.h"
-#include "wingc.h"
+#include "window.h"
 
 #define NAME  "display"
@@ -55 +55 @@
 static errno_t display_srv_init(void)
 {
+        ds_display_t *disp = NULL;
         errno_t rc;
+
+        rc = ds_display_create(&disp);
+        if (rc != EOK)
+                goto error;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "display_srv_init()");
 
-        async_set_fallback_port_handler(display_client_conn, NULL/*parts*/);
+        async_set_fallback_port_handler(display_client_conn, disp);
 
         rc = loc_server_register(NAME);
@@ -77 +82 @@
         return EOK;
 error:
+        if (disp != NULL)
+                ds_display_destroy(disp);
         return rc;
 }
@@ -86 +93 @@
         sysarg_t wnd_id;
         sysarg_t svc_id;
-        win_gc_t *wgc = NULL;
+        ds_window_t *wnd;
+        ds_display_t *disp = (ds_display_t *) arg;
         gfx_context_t *gc;
-        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "display_client_conn arg1=%zu arg2=%zu arg3=%zu arg4=%zu.",
@@ -103 +110 @@
                 /* Display management */
                 srv.ops = &display_srv_ops;
-                srv.arg = NULL;
+                srv.arg = disp;
 
                 display_conn(icall, &srv);
         } else {
-                (void) wnd_id;
                 /* Window GC */
-                rc = win_gc_create(&wgc);
-                if (rc != EOK) {
-                        async_answer_0(icall, ENOMEM);
+                wnd = ds_display_find_window(disp, wnd_id);
+                if (wnd == NULL) {
+                        async_answer_0(icall, ENOENT);
                         return;
                 }
 
-                gc = win_gc_get_ctx(wgc);
+                gc = ds_window_get_ctx(wnd);
                 gc_conn(icall, gc);
-
-                win_gc_delete(wgc);
         }
 }