Changeset 03e0beaf in mainline

Timestamp:

2016-12-27T12:52:04Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ce5a0f1

Parents:

1a2befb

Message:

Switch to using config_get_value()

Location:

uspace/srv/hid

Files:

• input/input.c (modified) (2 diffs)
• output/port/chardev.c (modified) (2 diffs)

uspace/srv/hid/input/input.c

@@ -43 +43 @@
 #include <ipc/input.h>
 #include <sysinfo.h>
+#include <config.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -903 +904 @@
         }
 
-        char *boot_args;
-        size_t size;
-
-        boot_args = sysinfo_get_data("boot_args", &size);
-        if (boot_args && size) {
-                char *args = boot_args;
-                char *arg;
-#define ARG_CONSOLE     "console="
-                while ((arg = str_tok(args, " ", &args)) != NULL) {
-                        if (!str_lcmp(arg, ARG_CONSOLE,
-                            str_length(ARG_CONSOLE))) {
-                                serial_console = arg + str_length(ARG_CONSOLE);
-                                break;
-                        }
-                }
-        }
+        serial_console = config_get_value("console");
         
         /* Add legacy keyboard devices. */

uspace/srv/hid/output/port/chardev.c

@@ -39 +39 @@
 #include <errno.h>
 #include <str.h>
-#include <sysinfo.h>
+#include <config.h>
 #include "../ctl/serial.h"
 #include "../output.h"
@@ -134 +134 @@
 int chardev_init(void)
 {
-        char *boot_args;
-        size_t size;
-        int rc;
-
-        boot_args = sysinfo_get_data("boot_args", &size);
-        if (!boot_args || !size) {
+        console = config_get_value("console");
+        if (!console) {
                 /*
-                 * Ok, there is nothing in the boot arguments. That means that
-                 * the user did not specify a serial console device.
+                 * The system is not configured to use serial console.
                  */
                 return EOK;
         }
 
-        char *args = boot_args;
-        char *arg;
-#define ARG_CONSOLE     "console="
-        while ((arg = str_tok(args, " ", &args)) != NULL) {
-                if (!str_lcmp(arg, ARG_CONSOLE, str_length(ARG_CONSOLE))) {
-                        console = arg + str_length(ARG_CONSOLE);
-                        break;
-                }
-        }
-
-        if (!console) {
-                /*
-                 * The user specified some boot arguments, but the serial
-                 * console service was not among them.
-                 */
-                return EOK;
-        }
-
-        rc = loc_category_get_id("serial", &serial_cat_id, IPC_FLAG_BLOCKING);
+        int rc = loc_category_get_id("serial", &serial_cat_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Failed to get \"serial\" category ID.\n", NAME);