Changeset 8a9a41e in mainline for uspace/lib/ui/include/types/ui/ui.h

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (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.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/lib/ui/include/types/ui/ui.h (modified) (2 diffs)

uspace/lib/ui/include/types/ui/ui.h

@@ -42 +42 @@
 typedef struct ui ui_t;
 
-/** Use the default display service (argument to ui_create() */
+/** Use the default display service (argument to ui_create()) */
 #define UI_DISPLAY_DEFAULT NULL
+/** Use the default console service (argument to ui_create()) */
+#define UI_CONSOLE_DEFAULT "cons@"
+/** Use dummy output (argument to ui_create()) */
+#define UI_DISPLAY_NULL "null@"
 
 /** Window system */
@@ -52 +56 @@
         ui_ws_display,
         /** Console */
-        ui_ws_console
+        ui_ws_console,
+        /** Dummy output */
+        ui_ws_null
 } ui_winsys_t;