Changeset 7feeb84 in mainline for uspace/app/virtusbkbd/virtusbkbd.c

Timestamp:

2010-12-13T14:25:49Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

76daaf9f

Parents:

8f8ae1fd

Message:

usbvirt: more flexible callbacks for endpoint zero

File:

• uspace/app/virtusbkbd/virtusbkbd.c (modified) (3 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.
@@ -138 +131 @@
 }
 
+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,
+                .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,
+                .callback = stdreq_on_get_descriptor
+        },
+        USBVIRT_CONTROL_TRANSFER_HANDLER_LAST
+};
 
 /** Keyboard callbacks.
@@ -143 +155 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .on_standard_request[USB_DEVREQ_GET_DESCRIPTOR]
-            = stdreq_on_get_descriptor,
-        .on_class_device_request = on_class_request,
+        .control_transfer_handlers = endpoint_zero_handlers,
         .on_data = on_incoming_data,
         .on_data_request = on_request_for_data