Changeset 7c169ce in mainline for uspace/drv/usbkbd/main.c

Timestamp:

2011-01-21T13:01:58Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e2b1548

Parents:

6336b6e (diff), a1d12f4 (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:

Merged development

File:

• uspace/drv/usbkbd/main.c (modified) (6 diffs)

uspace/drv/usbkbd/main.c

@@ -42 +42 @@
 #include "descdump.h"
 #include "conv.h"
+#include "layout.h"
 
 #define BUFFER_SIZE 32
@@ -125 +126 @@
 static unsigned lock_keys;
 
+#define NUM_LAYOUTS 3
+
+static layout_op_t *layout[NUM_LAYOUTS] = {
+        &us_qwerty_op,
+        &us_dvorak_op,
+        &cz_op
+};
+
 // TODO: put to device?
-//static int active_layout = 0;
+static int active_layout = 0;
 
 static void kbd_push_ev(int type, unsigned int key)
@@ -206 +215 @@
         ev.mods = mods;
 
-        //ev.c = layout[active_layout]->parse_ev(&ev);
+        ev.c = layout[active_layout]->parse_ev(&ev);
 
         printf("Sending key %d to the console\n", ev.key);
         assert(console_callback_phone != -1);
-        async_msg_4(console_callback_phone, KBD_EVENT, ev.type, ev.key, ev.mods, 0);
+        async_msg_4(console_callback_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
 }
 /*
@@ -405 +414 @@
         //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
         //    NULL);
-//      printf("Calling usb_hid_boot_keyboard_input_report() with size %d\n",
-//          actual_size);
-//      dump_buffer("bufffer: ", buffer, actual_size);
+        printf("Calling usb_hid_boot_keyboard_input_report() with size %d\n",
+            actual_size);
+        //dump_buffer("bufffer: ", buffer, actual_size);
         int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size, callbacks, 
             NULL);
@@ -457 +466 @@
                  */
                 if (actual_size == 0) {
-                        printf("Keyboar returned NAK\n");
+                        printf("Keyboard returned NAK\n");
                         continue;
                 }
@@ -465 +474 @@
                  */
                 printf("Calling usbkbd_process_interrupt_in()\n");
-                // actual_size is not set, workaround...
-                usbkbd_process_interrupt_in(kbd_dev, buffer, /*actual_size*/8);
+                usbkbd_process_interrupt_in(kbd_dev, buffer, actual_size);
         }