Changeset 72cf064 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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/srv/hid/console/console.c (modified) (3 diffs)

uspace/srv/hid/console/console.c

@@ -617 +617 @@
         
         size_t pos = 0;
-
+        
         /*
          * Read input from keyboard and copy it to the buffer.
@@ -628 +628 @@
                         buf[pos] = cons->char_remains[0];
                         pos++;
+                        
                         /* Unshift the array. */
-                        for (size_t i = 1; i < cons->char_remains_len; i++) {
+                        for (size_t i = 1; i < cons->char_remains_len; i++)
                                 cons->char_remains[i - 1] = cons->char_remains[i];
-                        }
+                        
                         cons->char_remains_len--;
                 }
+                
                 /* Still not enough? Then get another key from the queue. */
                 if (pos < size) {
                         link_t *link = prodcons_consume(&cons->input_pc);
                         kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
-
+                        
                         /* Accept key presses of printable chars only. */
                         if ((event->type == KEY_PRESS) && (event->c != 0)) {
@@ -645 +647 @@
                                 cons->char_remains_len = str_size(cons->char_remains);
                         }
-
+                        
                         free(event);
                 }