Changeset 00aece0 in mainline for uspace/drv/bus/usb/usbhid/kbd/conv.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/drv/bus/usb/usbhid/kbd/conv.c (modified) (7 diffs)

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

@@ -87 +87 @@
         [0x26] = KC_9,
         [0x27] = KC_0,
-        
+
         [0x28] = KC_ENTER,
         [0x29] = KC_ESCAPE,
@@ -109 +109 @@
 
         [0x39] = KC_CAPS_LOCK,
-        
+
         [0x3a] = KC_F1,
         [0x3b] = KC_F2,
@@ -122 +122 @@
         [0x44] = KC_F11,
         [0x45] = KC_F12,
-        
+
         [0x46] = KC_PRTSCR,
         [0x47] = KC_SCROLL_LOCK,
@@ -136 +136 @@
         [0x51] = KC_DOWN,
         [0x52] = KC_UP,
-        
+
         //[0x64] = // some funny key
-        
+
         [0xe0] = KC_LCTRL,
         [0xe1] = KC_LSHIFT,
@@ -147 +147 @@
         [0xe6] = KC_RALT,
         //[0xe7] = KC_R // TODO: right GUI
-        
+
         [0x53] = KC_NUM_LOCK,
         [0x54] = KC_NSLASH,
@@ -165 +165 @@
         [0x62] = KC_N0,
         [0x63] = KC_NPERIOD
-        
+
 };
 
@@ -186 +186 @@
 
         key = map[scancode];
-        
+
         return key;
 }