Changes in uspace/app/virtusbkbd/virtusbkbd.c [2aee3e06:56b962d] in mainline

File:

• uspace/app/virtusbkbd/virtusbkbd.c (modified) (9 diffs)

uspace/app/virtusbkbd/virtusbkbd.c

@@ -55 +55 @@
 #include "stdreq.h"
 
-/** Pause between individual key-presses in seconds. */
-#define KEY_PRESS_DELAY 2
+#define LOOPS 5
 #define NAME "virt-usb-kbd"
 
@@ -84 +83 @@
 }
 
-/** Compares current and last status of pressed keys.
- *
- * @warning Has side-efect - changes status_last field.
- *
- * @param status_now Status now.
- * @param status_last Last status.
- * @param len Size of status.
- * @return Whether they are the same.
- */
-static bool keypress_check_with_last_request(uint8_t *status_now,
-    uint8_t *status_last, size_t len)
-{
-        bool same = true;
-        size_t i;
-        for (i = 0; i < len; i++) {
-                if (status_now[i] != status_last[i]) {
-                        status_last[i] = status_now[i];
-                        same = false;
-                }
-        }
-        return same;
-}
-
 static int on_request_for_data(struct usbvirt_device *dev,
     usb_endpoint_t endpoint, void *buffer, size_t size, size_t *actual_size)
 {
-        static uint8_t last_data[2 + KB_MAX_KEYS_AT_ONCE];
-
         if (size < 2 + KB_MAX_KEYS_AT_ONCE) {
                 return EINVAL;
@@ -127 +101 @@
         }
         
-        if (keypress_check_with_last_request(data, last_data,
-            2 + KB_MAX_KEYS_AT_ONCE)) {
-                *actual_size = 0;
-                return EOK;
-        }
-
         memcpy(buffer, &data, *actual_size);
         
@@ -143 +111 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .standard_request_ops = &standard_request_ops,
+        .on_standard_request[USB_DEVREQ_GET_DESCRIPTOR]
+            = stdreq_on_get_descriptor,
         .on_class_device_request = on_class_request,
         .on_data = on_incoming_data,
@@ -184 +153 @@
         .ops = &keyboard_ops,
         .descriptors = &descriptors,
-        .lib_debug_level = 3,
-        .lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL,
         .name = "keyboard"
 };
@@ -204 +171 @@
 static void on_keyboard_change(kb_status_t *status)
 {
-        printf("%s: Current keyboard status: %02hhx", NAME, status->modifiers);
+        printf("%s: Current keyboard status: %08hhb", NAME, status->modifiers);
         size_t i;
         for (i = 0; i < KB_MAX_KEYS_AT_ONCE; i++) {
@@ -211 +178 @@
         printf("\n");
         
-        fibril_sleep(KEY_PRESS_DELAY);
+        fibril_sleep(1);
 }
 
@@ -236 +203 @@
 int main(int argc, char * argv[])
 {
-        printf("Dump of report descriptor (%zu bytes):\n", report_descriptor_size);
+        printf("Dump of report descriptor (%u bytes):\n", report_descriptor_size);
         size_t i;
         for (i = 0; i < report_descriptor_size; i++) {
@@ -257 +224 @@
         
         printf("%s: Simulating keyboard events...\n", NAME);
-        while (1) {
-                kb_process_events(&status, keyboard_events, keyboard_events_count,
-                        on_keyboard_change);
-        }
+        kb_process_events(&status, keyboard_events, keyboard_events_count,
+            on_keyboard_change);
         
         printf("%s: Terminating...\n", NAME);