Changeset 11797d5 in mainline

Timestamp:

2011-01-21T16:37:26Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

3ee48f2, 9097c16a

Parents:

7d540c8

Message:

Fixes + layouts

• Fixed scancode → keycode map.
• Removed copied layout file, layouts are now symlinked from generic kbd driver
• Layout settings in kbd driver

Location:

uspace/drv/usbkbd

Files:

• Makefile (modified) (2 diffs)
• conv.c (modified) (2 diffs)
• kbd.h (added)
• main.c (modified) (4 diffs)
• us_qwerty.c (deleted)

uspace/drv/usbkbd/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
 BINARY = usbkbd
+SRV_KBD = $(USPACE_PREFIX)/srv/hid/kbd
 
 SOURCES = \
@@ -37 +38 @@
         descdump.c \
         conv.c \
-        us_qwerty.c
+        us_qwerty.c \
+        us_dvorak.c \
+        cz.c
 
 include $(USPACE_PREFIX)/Makefile.common
+
+us_qwerty.c:
+        ln -snf $(SRV_KBD)/layout/$@ $@
+
+us_dvorak.c:
+        ln -snf $(SRV_KBD)/layout/$@ $@
+
+cz.c:
+        ln -snf $(SRV_KBD)/layout/$@ $@
+
+

uspace/drv/usbkbd/conv.c

@@ -30 +30 @@
 #include "conv.h"
 
-static int scanmap_simple[] = {
+static int scanmap_simple[255] = {
 
 //      [0x29] = KC_BACKTICK,
@@ -56 +56 @@
         [0x16] = KC_S,
         [0x17] = KC_T,
-        [0x12] = KC_U,
+        [0x18] = KC_U,
         [0x19] = KC_V,
         [0x1a] = KC_W,

uspace/drv/usbkbd/main.c

@@ -134 +134 @@
 };
 
-// TODO: put to device?
 static int active_layout = 0;
 
@@ -189 +188 @@
         printf("keycode: %u\n", key);
 */
-        /*
+        
         if (type == KEY_PRESS && (mods & KM_LCTRL) &&
                 key == KC_F1) {
@@ -210 +209 @@
                 return;
         }
-        */
+        
         ev.type = type;
         ev.key = key;
@@ -236 +235 @@
  */
 static void usbkbd_process_keycodes(const uint8_t *key_codes, size_t count,
-                                    uint8_t modifiers, void *arg)
+    uint8_t modifiers, void *arg)
 {
         printf("Got keys: ");