Changeset 7da3219 in mainline

Timestamp:

2010-10-13T21:29:00Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1880c65

Parents:

2c381250

Message:

Virtual keyboard sends key codes

The virtual USB keyboard sends a fixed batch of keyboard events.
These events shall switch to VT6 and type 'Hello' there.

Location:

uspace/app/virtusbkbd

Files:

• Makefile (modified) (1 diff)
• kbdconfig.c (modified) (2 diffs)
• keys.c (added)
• keys.h (added)
• virtusbkbd.c (modified) (3 diffs)

uspace/app/virtusbkbd/Makefile

@@ -37 +37 @@
 SOURCES = \
         kbdconfig.c \
+        keys.c \
         virtusbkbd.c
 

uspace/app/virtusbkbd/kbdconfig.c

@@ -35 +35 @@
  */
 #include "kbdconfig.h"
+#include "keys.h"
 #include <usb/hcd.h>
 #include <usb/hid.h>
@@ -96 +97 @@
                 /* LED states padding */
                 OUTPUT(IOF_CONSTANT),
-                REPORT_COUNT1(6),
+                REPORT_COUNT1(KB_MAX_KEYS_AT_ONCE),
                 REPORT_SIZE1(8),
                 LOGICAL_MINIMUM1(0),

uspace/app/virtusbkbd/virtusbkbd.c

@@ -53 +53 @@
 
 #include "kbdconfig.h"
+#include "keys.h"
 
 #define LOOPS 5
@@ -136 +137 @@
 
 
+/** Callback when keyboard status changed.
+ *
+ * @param status Current keyboard status.
+ */
+static void on_keyboard_change(kb_status_t *status)
+{
+        printf("%s: Current keyboard status: %08hhb", NAME, status->modifiers);
+        size_t i;
+        for (i = 0; i < KB_MAX_KEYS_AT_ONCE; i++) {
+                printf(" 0x%02X", (int)status->pressed_keys[i]);
+        }
+        printf("\n");
+        
+        uint8_t data[3 + KB_MAX_KEYS_AT_ONCE];
+        data[0] = status->modifiers;
+        data[1] = 0;
+        data[2] = 0;
+        for (i = 0; i < KB_MAX_KEYS_AT_ONCE; i++) {
+                data[3 + i] = status->pressed_keys[i];
+        }
+        
+        int rc = keyboard_dev.send_data(&keyboard_dev, 0, data, sizeof(data));
+        printf("%s:   Sent to VHCD (%s).\n", NAME, str_error(rc));
+        
+        fibril_sleep(1);
+}
+
+/** Simulated keyboard events. */
+static kb_event_t keyboard_events[] = {
+        /* Switch to VT6 (Alt+F6) */
+        M_DOWN(KB_MOD_LEFT_ALT),
+        K_PRESS(63),
+        M_UP(KB_MOD_LEFT_ALT),
+        /* Type the word 'Hello' */
+        M_DOWN(KB_MOD_LEFT_SHIFT),
+        K_PRESS(KB_KEY_H),
+        M_UP(KB_MOD_LEFT_SHIFT),
+        K_PRESS(KB_KEY_E),
+        K_PRESS(KB_KEY_L),
+        K_PRESS(KB_KEY_L),
+        K_PRESS(KB_KEY_O)
+};
+static size_t keyboard_events_count =
+    sizeof(keyboard_events)/sizeof(keyboard_events[0]);
+
+
+
 int main(int argc, char * argv[])
 {
@@ -156 +204 @@
         }
         
-        
-        for (i = 0; i < LOOPS; i++) {
-                size_t size = 5;
-                char *data = (char *) "Hullo, World!";
-                
-                if (i > 0) {
-                        fibril_sleep(2);
-                }
-                
-                printf("%s: Will send data to VHCD...\n", NAME);
-                int rc = keyboard_dev.send_data(&keyboard_dev, 0, data, size);
-                printf("%s:   ...data sent (%s).\n", NAME, str_error(rc));
-        }
-        
-        fibril_sleep(1);
+        kb_status_t status;
+        kb_init(&status);
+        
+        printf("%s: Simulating keyboard events...\n", NAME);
+        kb_process_events(&status, keyboard_events, keyboard_events_count,
+            on_keyboard_change);
+        
         printf("%s: Terminating...\n", NAME);