Changeset 1382446 in mainline

Timestamp:

2020-12-14T19:09:05Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d1582b50

Parents:

0350033

Message:

Display device backend for output server

This provides console on a grahpical device, similar to the old kfb
backend. It talks to the userspace kfb driver, instead of mapping
the kfb directly. You can get graphical console by configuring
CONFIG_FB=y and CONFIG_WINSYS=n

Files:

• HelenOS.config (modified) (1 diff)
• uspace/app/init/init.c (modified) (4 diffs)
• uspace/srv/hid/output/meson.build (modified) (1 diff)
• uspace/srv/hid/output/output.c (modified) (2 diffs)
• uspace/srv/hid/output/port/ddev.c (added)
• uspace/srv/hid/output/port/ddev.h (added)

HelenOS.config

@@ -608 +608 @@
 ! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
 
+% Window system
+! [CONFIG_FB=y] CONFIG_WINSYS (y/n)
+
 % Display double buffering
 ! [CONFIG_FB=y] CONFIG_DISP_DOUBLE_BUF (y/n)

uspace/app/init/init.c

@@ -272 +272 @@
 }
 
+#ifdef CONFIG_WINSYS
+
 static errno_t display_server(void)
 {
@@ -302 +304 @@
         return retval;
 }
+
+#endif
 
 static void getterm(const char *svc, const char *app, bool msg)
@@ -468 +472 @@
         init_sysvol();
 
+#ifdef CONFIG_WINSYS
         if (!config_key_exists("console")) {
                 rc = display_server();
@@ -476 +481 @@
                 }
         }
-
+#endif
         rc = console(HID_INPUT, HID_OUTPUT);
         if (rc == EOK) {

uspace/srv/hid/output/meson.build

@@ -28 +28 @@
 #
 
-deps = [ 'drv' ]
+deps = [ 'drv', 'fbfont', 'pixconv', 'ddev' ]
 src = files(
         'ctl/serial.c',
         'port/ega.c',
         'port/chardev.c',
+        'port/ddev.c',
         'proto/vt100.c',
         'output.c',

uspace/srv/hid/output/output.c

@@ -41 +41 @@
 #include "port/ega.h"
 #include "port/chardev.h"
+#include "port/ddev.h"
 #include "output.h"
 
@@ -486 +487 @@
         if (!config_key_exists("console")) {
                 ega_init();
+#if defined(CONFIG_FB) && !defined(CONFIG_WINSYS)
+                /*
+                 * NOTE: We don't have a good way of detecting the absence
+                 * of a KFB display device at run time because of the
+                 * asunchronous nature of device discovery
+                 */
+                output_ddev_init();
+#endif
         }