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

File:

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

uspace/app/virtusbkbd/virtusbkbd.c

@@ -76 +76 @@
 }
 
+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;
+}
 
 /** Compares current and last status of pressed keys.
@@ -131 +138 @@
 }
 
-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 +143 @@
  */
 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
@@ -270 +257 @@
         
         printf("%s: Simulating keyboard events...\n", NAME);
-        fibril_sleep(10);
         while (1) {
                 kb_process_events(&status, keyboard_events, keyboard_events_count,