Changeset aa2b32c in mainline for uspace/app/bdsh

Timestamp:

2013-04-29T12:44:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a269d05

Parents:

06b0211b (diff), 9e7898e (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

Location:

uspace/app/bdsh/cmds/modules

Files:

• cat/cat.c (modified) (1 diff)
• cp/cp.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -117 +117 @@
 static void waitkey()
 {
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         
         while (true) {
-                if (!console_get_kbd_event(console, &ev)) {
+                if (!console_get_event(console, &ev)) {
                         return;
                 }
-                if (ev.type == KEY_PRESS) {
-                        if (ev.key == KC_ESCAPE || ev.key == KC_Q) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        kev = &ev.ev.key;
+                        
+                        if (kev->key == KC_ESCAPE || kev->key == KC_Q) {
                                 should_quit = true;
                                 return;
                         }
-                        if (ev.key == KC_C) {
+                        if (kev->key == KC_C) {
                                 paging_enabled = false;
                                 return;
                         }
-                        if (ev.key == KC_ENTER || ev.key == KC_SPACE ||
-                            ev.key == KC_PAGE_DOWN) {
+                        if (kev->key == KC_ENTER || kev->key == KC_SPACE ||
+                            kev->key == KC_PAGE_DOWN) {
                                 return;
                         }

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -152 +152 @@
 
         while (true) {
-                kbd_event_t ev;
+                cons_event_t ev;
                 console_flush(con);
-                console_get_kbd_event(con, &ev);
-                if ((ev.type != KEY_PRESS)
-                    || (ev.mods & (KM_CTRL | KM_ALT)) != 0) {
+                console_get_event(con, &ev);
+                if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS ||
+                    (ev.ev.key.mods & (KM_CTRL | KM_ALT)) != 0) {
                         continue;
                 }
 
-                switch(ev.key) {
+                switch(ev.ev.key.key) {
                 case KC_Y:
                         printf("y\n");