Changeset 8ff0bd2 in mainline for uspace/app/mkbd/main.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/app/mkbd/main.c

@@ -43 +43 @@
 #include <getopt.h>
 #include <devman.h>
-#include <devmap.h>
+#include <loc.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>
 
@@ -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;
 }
 
@@ -211 +240 @@
         
         char path[MAX_PATH_LENGTH];
-        rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
+        rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
         if (rc != EOK) {
                 return ENOMEM;
@@ -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;