Changeset bf45993 in mainline for uspace/srv/hid/input/ctl/apple.c

Timestamp:

2014-09-19T10:56:30Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6b646dc

Parents:

824208bf (diff), 58f26cb (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/input/ctl/apple.c (modified) (4 diffs)

uspace/srv/hid/input/ctl/apple.c

@@ -52 +52 @@
 };
 
-#define KBD_KEY_RELEASE         0x80
-
-static kbd_dev_t *kbd_dev;
-
-static int scanmap[];
-
-static int apple_ctl_init(kbd_dev_t *kdev)
-{
-        kbd_dev = kdev;
-        return 0;
-}
-
-static void apple_ctl_parse(sysarg_t scancode)
-{
-        kbd_event_type_t type;
-        unsigned int key;
-
-        if (scancode >= 0x100)
-                return;
-
-        if (scancode & KBD_KEY_RELEASE) {
-                scancode &= ~KBD_KEY_RELEASE;
-                type = KEY_RELEASE;
-        } else {
-                type = KEY_PRESS;
-        }
-
-        key = scanmap[scancode];
-        if (key != 0)
-                kbd_push_event(kbd_dev, type, key);
-}
-
-static void apple_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
-{
-        (void) mods;
-}
-
-static int scanmap[] = {
+#define KBD_KEY_RELEASE  0x80
+
+static unsigned int scanmap[] = {
         [0x00] = KC_A,
         [0x01] = KC_S,
@@ -195 +160 @@
         [0x67] = KC_F11,
         [0x68] = 0,
-        [0x69] = 0,
+        [0x69] = KC_SYSREQ,
         [0x6a] = 0,
         [0x6b] = KC_SCROLL_LOCK,
@@ -203 +168 @@
         [0x6f] = KC_F12,
         [0x70] = 0,
-        [0x71] = 0,
+        [0x71] = KC_PAUSE,
         [0x72] = KC_INSERT,
         [0x73] = KC_HOME,
@@ -220 +185 @@
 };
 
+static kbd_dev_t *kbd_dev;
+
+static int apple_ctl_init(kbd_dev_t *kdev)
+{
+        kbd_dev = kdev;
+        return 0;
+}
+
+static void apple_ctl_parse(sysarg_t scancode)
+{
+        kbd_event_type_t type;
+        
+        if (scancode & KBD_KEY_RELEASE) {
+                scancode &= ~KBD_KEY_RELEASE;
+                type = KEY_RELEASE;
+        } else
+                type = KEY_PRESS;
+        
+        if (scancode >= sizeof(scanmap) / sizeof(unsigned int))
+                return;
+        
+        unsigned int key = scanmap[scancode];
+        if (key != 0)
+                kbd_push_event(kbd_dev, type, key);
+}
+
+static void apple_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
+{
+        (void) mods;
+}
+
 /** @}
  */