Changes in uspace/app/mkbd/main.c [7beb220:79ae36dd] in mainline

File:

• uspace/app/mkbd/main.c (modified) (5 diffs)

uspace/app/mkbd/main.c

@@ -43 +43 @@
 #include <getopt.h>
 #include <devman.h>
-#include <loc.h>
+#include <devmap.h>
 #include <usb/dev/hub.h>
 #include <usb/hid/iface.h>
@@ -52 +52 @@
 #include <usb/hid/hiddescriptor.h>
 #include <usb/hid/usages/consumer.h>
-#include <io/console.h>
-#include <io/keycode.h>
 #include <assert.h>
 
@@ -170 +168 @@
 }
 
-static int wait_for_quit_fibril(void *arg)
-{
-        console_ctrl_t *con = console_init(stdin, stdout);
-
-        printf("Press <ESC> to quit the application.\n");
-
-        while (1) {
-                kbd_event_t ev;
-                bool ok = console_get_kbd_event(con, &ev);
-                if (!ok) {
-                        printf("Connection with console broken: %s.\n",
-                            str_error(errno));
-                        break;
-                }
-
-                if (ev.key == KC_ESCAPE) {
-                        break;
-                }
-        }
-
-        console_done(con);
-
-        exit(0);
-
-        return EOK;
-}
-
 #define MAX_PATH_LENGTH 1024
 
@@ -240 +211 @@
         
         char path[MAX_PATH_LENGTH];
-        rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
+        rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
         if (rc != EOK) {
                 return ENOMEM;
@@ -271 +242 @@
         }
         
-        fid_t quit_fibril = fibril_create(wait_for_quit_fibril, NULL);
-        if (quit_fibril == 0) {
-                printf("Failed to start extra fibril.\n");
-                return -1;
-        }
-        fibril_add_ready(quit_fibril);
-
         size_t actual_size;
         int event_nr;