Changes in uspace/srv/hid/output/output.c [fafb8e5:ca48672] in mainline

File:

• uspace/srv/hid/output/output.c (modified) (7 diffs)

uspace/srv/hid/output/output.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -39 +40 @@
 #include <ipc/output.h>
 #include <config.h>
+#include <vt/vt100.h>
 #include "port/ega.h"
 #include "port/chardev.h"
+#include "port/ddev.h"
 #include "output.h"
-
-#define MAX_COLS  128
-#define MAX_ROWS  128
 
 typedef struct {
@@ -114 +114 @@
 static void srv_get_dimensions(ipc_call_t *icall)
 {
-        sysarg_t cols = MAX_COLS;
-        sysarg_t rows = MAX_ROWS;
-
-        list_foreach(outdevs, link, outdev_t, dev) {
-                cols = min(cols, dev->cols);
-                rows = min(rows, dev->rows);
+        sysarg_t cols = 0;
+        sysarg_t rows = 0;
+        bool first;
+
+        first = true;
+        list_foreach(outdevs, link, outdev_t, dev) {
+                if (first) {
+                        cols = dev->cols;
+                        rows = dev->rows;
+                        first = false;
+                } else {
+                        cols = min(cols, dev->cols);
+                        rows = min(rows, dev->rows);
+                }
         }
 
@@ -462 +470 @@
 int main(int argc, char *argv[])
 {
+        loc_srv_t *srv;
+
         if (argc < 2) {
                 usage(argv[0]);
@@ -471 +481 @@
         /* Register server */
         async_set_fallback_port_handler(client_connection, NULL);
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register driver\n", NAME);
@@ -478 +488 @@
 
         service_id_t service_id;
-        rc = loc_service_register(argv[1], &service_id);
+        rc = loc_service_register(srv, argv[1], fallback_port_id, &service_id);
         if (rc != EOK) {
+                loc_server_unregister(srv);
+
                 printf("%s: Unable to register service %s\n", NAME, argv[1]);
                 return rc;
@@ -486 +498 @@
         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
         }