Changeset 8e7c9fe in mainline for kernel/genarch/src/kbrd/kbrd.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/genarch/src/kbrd/kbrd.c (modified) (4 diffs)

kernel/genarch/src/kbrd/kbrd.c

@@ -56 +56 @@
 #include <arch.h>
 #include <macros.h>
+#include <str.h>
 
 #define IGNORE_CODE  0x7f
@@ -65 +66 @@
 
 static indev_operations_t kbrd_raw_ops = {
-        .poll = NULL
+        .poll = NULL,
+        .signal = NULL
 };
 
@@ -104 +106 @@
         bool shift;
         bool capslock;
+        wchar_t ch;
         
         spinlock_lock(&instance->keylock);
@@ -127 +130 @@
                 
                 if (shift)
-                        indev_push_character(instance->sink, sc_secondary_map[sc]);
+                        ch = sc_secondary_map[sc];
                 else
-                        indev_push_character(instance->sink, sc_primary_map[sc]);
+                        ch = sc_primary_map[sc];
+                
+                switch (ch) {
+                case U_PAGE_UP:
+                        indev_signal(instance->sink, INDEV_SIGNAL_SCROLL_UP);
+                        break;
+                case U_PAGE_DOWN:
+                        indev_signal(instance->sink, INDEV_SIGNAL_SCROLL_DOWN);
+                        break;
+                default:
+                        indev_push_character(instance->sink, ch);
+                }
+                
                 break;
         }