Changeset 51b46f2 in mainline for uspace/drv/usbhid/conv.c

Timestamp:

2011-03-01T15:39:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e135751

Parents:

0e3505a (diff), cc44f7e (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 development/ changes

File:

• uspace/drv/usbhid/conv.c (modified) (3 diffs)

uspace/drv/usbhid/conv.c

@@ -36 +36 @@
 #include <io/keycode.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <usb/debug.h>
 #include "conv.h"
 
@@ -141 +143 @@
         //[0xe7] = KC_R // TODO: right GUI
         
+        [0x53] = KC_NUM_LOCK,
+        [0x54] = KC_NSLASH,
+        [0x55] = KC_NTIMES,
+        [0x56] = KC_NMINUS,
+        [0x57] = KC_NPLUS,
+        [0x58] = KC_NENTER,
+        [0x59] = KC_N1,
+        [0x5a] = KC_N2,
+        [0x5b] = KC_N3,
+        [0x5c] = KC_N4,
+        [0x5d] = KC_N5,
+        [0x5e] = KC_N6,
+        [0x5f] = KC_N7,
+        [0x60] = KC_N8,
+        [0x61] = KC_N9,
+        [0x62] = KC_N0,
+        [0x63] = KC_NPERIOD
+        
 };
 
@@ -189 +209 @@
 
         key = map[scancode];
+        
+        if (scancode == 0x53) {
+                usb_log_debug("\n\nWe have a NUM LOCK!, sending key %u\n\n", key);
+        }
+        
+        if (scancode == 0x47) {
+                usb_log_debug("\n\nWe have a SCROLL LOCK!, sending key %u\n\n", key);
+        }
+        
+        if (scancode == 0x39) {
+                usb_log_debug("\n\nWe have a CAPS LOCK!, sending key %u\n\n", key);
+        }
+        
 //      if (key != 0)
 //              kbd_push_ev(type, key);