Changeset 159776f in mainline for uspace/srv/hid/display/main.c

Timestamp:

2019-10-10T10:17:17Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

78a71936

Parents:

bef51cf

git-author:

Jiri Svoboda <jiri@…> (2019-10-09 17:07:14)

git-committer:

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

Message:

Provisional display server output via canvas/guigfx

File:

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

uspace/srv/hid/display/main.c

@@ -7 +7 @@
  * are met:
  *
- * - Redistributions of source code must retain the above copyright
+ * - Redistribution1s of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright
@@ -46 +46 @@
 #include <task.h>
 #include "display.h"
+#include "output.h"
 #include "window.h"
 
@@ -56 +57 @@
 {
         ds_display_t *disp = NULL;
+        gfx_context_t *gc = NULL;
         errno_t rc;
 
-        rc = ds_display_create(&disp);
+        rc = output_init(&gc);
+        if (rc != EOK)
+                goto error;
+
+        rc = ds_display_create(gc, &disp);
         if (rc != EOK)
                 goto error;
@@ -82 +88 @@
         return EOK;
 error:
+        if (gc != NULL)
+                gfx_context_delete(gc);
         if (disp != NULL)
                 ds_display_destroy(disp);