Changeset 2e833cf7 in mainline

Timestamp:

2011-06-17T21:22:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a8bc7f8

Parents:

051f96b

Message:

mkbd quits on Escape key

The actual quit is rather brutal (no letting the main fibril know
about ending) but better than need to run killall .

File:

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

uspace/app/mkbd/main.c

@@ -52 +52 @@
 #include <usb/hid/hiddescriptor.h>
 #include <usb/hid/usages/consumer.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <assert.h>
 
@@ -166 +168 @@
         
         usb_hid_report_path_free(path);
+}
+
+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;
 }
 
@@ -242 +271 @@
         }
         
+        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;
-        
+
         while (true) {
                 /** @todo Try blocking call. */