Changes in uspace/app/virtusbkbd/virtusbkbd.c [d5e7668:ad79d80] 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"
 
@@ -76 +75 @@
 }
 
-
-/** 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_class_request(struct usbvirt_device *dev,
+    usb_device_request_setup_packet_t *request, uint8_t *data)
+{       
+        printf("%s: class request (%d)\n", NAME, (int) request->request);
+        
+        return EOK;
 }
 
@@ -103 +86 @@
     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;
@@ -120 +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);
         
@@ -131 +106 @@
 }
 
-static usbvirt_control_transfer_handler_t endpoint_zero_handlers[] = {
-        {
-                .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(
-                    USB_DIRECTION_IN,
-                    USBVIRT_REQUEST_TYPE_STANDARD,
-                    USBVIRT_REQUEST_RECIPIENT_DEVICE),
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
-                .name = "GetDescriptor",
-                .callback = stdreq_on_get_descriptor
-        },
-        {
-                .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(
-                    USB_DIRECTION_IN,
-                    USBVIRT_REQUEST_TYPE_CLASS,
-                    USBVIRT_REQUEST_RECIPIENT_DEVICE),
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
-                .name = "GetDescriptor",
-                .callback = stdreq_on_get_descriptor
-        },
-        USBVIRT_CONTROL_TRANSFER_HANDLER_LAST
-};
 
 /** Keyboard callbacks.
@@ -157 +111 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .control_transfer_handlers = endpoint_zero_handlers,
+        .standard_request_ops = &standard_request_ops,
+        .on_class_device_request = on_class_request,
         .on_data = on_incoming_data,
         .on_data_request = on_request_for_data
@@ -197 +152 @@
         .ops = &keyboard_ops,
         .descriptors = &descriptors,
-        .lib_debug_level = 3,
-        .lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL,
         .name = "keyboard"
 };
@@ -224 +177 @@
         printf("\n");
         
-        fibril_sleep(KEY_PRESS_DELAY);
+        fibril_sleep(1);
 }
 
@@ -270 +223 @@
         
         printf("%s: Simulating keyboard events...\n", NAME);
-        fibril_sleep(10);
-        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);