Changeset 6eb957dc in mainline for uspace/drv/bus/usb/usbhid/kbd/conv.c

Timestamp:

2014-10-09T03:34:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ef3da5a

Parents:

fa65df1 (diff), 18cc83c (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:

Mainline changes

File:

• uspace/drv/bus/usb/usbhid/kbd/conv.c (modified) (5 diffs)

uspace/drv/bus/usb/usbhid/kbd/conv.c

@@ -45 +45 @@
  */
 static int scanmap_simple[255] = {
-
-//      [0x29] = KC_BACKTICK,
-
-//      [0x02] = KC_1,
-//      [0x03] = KC_2,
         [0x04] = KC_A,
         [0x05] = KC_B,
@@ -94 +89 @@
         [0x2c] = KC_SPACE,
 
-        [0x2d] = KC_MINUS,  // same as DASH? (- or _)
+        [0x2d] = KC_MINUS,
         [0x2e] = KC_EQUALS,
         [0x2f] = KC_LBRACKET,
         [0x30] = KC_RBRACKET,
         [0x31] = KC_BACKSLASH,
-        //[0x32] = KC_, // TODO: HASH??? maybe same as 0x31 - backslash
-        [0x32] = KC_BACKSLASH,
+        [0x32] = KC_HASH,
         [0x33] = KC_SEMICOLON,
-        [0x34] = KC_QUOTE,  // same as APOSTROPHE? (')
-        [0x35] = KC_BACKTICK,  // same as GRAVE ACCENT?? (`)
+        [0x34] = KC_QUOTE,
+        [0x35] = KC_BACKTICK,
         [0x36] = KC_COMMA,
         [0x37] = KC_PERIOD,
@@ -137 +131 @@
         [0x52] = KC_UP,
 
-        //[0x64] = // some funny key
-
-        [0xe0] = KC_LCTRL,
-        [0xe1] = KC_LSHIFT,
-        [0xe2] = KC_LALT,
-        //[0xe3] = KC_L // TODO: left GUI
-        [0xe4] = KC_RCTRL,
-        [0xe5] = KC_RSHIFT,
-        [0xe6] = KC_RALT,
-        //[0xe7] = KC_R // TODO: right GUI
-
         [0x53] = KC_NUM_LOCK,
         [0x54] = KC_NSLASH,
@@ -164 +147 @@
         [0x61] = KC_N9,
         [0x62] = KC_N0,
-        [0x63] = KC_NPERIOD
+        [0x63] = KC_NPERIOD,
 
+        [0x64] = KC_BACKSLASH,
+
+        [0x9a] = KC_SYSREQ,
+
+        [0xe0] = KC_LCTRL,
+        [0xe1] = KC_LSHIFT,
+        [0xe2] = KC_LALT,
+        [0xe4] = KC_RCTRL,
+        [0xe5] = KC_RSHIFT,
+        [0xe6] = KC_RALT,
 };
 
@@ -173 +166 @@
  *
  * @param scancode USB HID key code (from HID Usage Tables).
- * 
+ *
  * @retval HelenOS key code corresponding to the given USB HID key code.
  */