Changeset 54d71e1 in mainline for uspace/app/virtusbkbd/stdreq.c

Timestamp:

2011-04-29T07:05:30Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

361fcec

Parents:

9014dcd (diff), cd4ae1e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with development

File:

• uspace/app/virtusbkbd/stdreq.c (modified) (1 diff)

uspace/app/virtusbkbd/stdreq.c

@@ -39 +39 @@
 #include "kbdconfig.h"
 
-int stdreq_on_get_descriptor(struct usbvirt_device *dev,
-    usb_device_request_setup_packet_t *request, uint8_t *data)
+int req_get_descriptor(usbvirt_device_t *device,
+    const usb_device_request_setup_packet_t *setup_packet,
+    uint8_t *data, size_t *act_size)
 {
-        if (request->value_high == USB_DESCTYPE_HID_REPORT) {
+        if (setup_packet->value_high == USB_DESCTYPE_HID_REPORT) {
                 /*
                  * For simplicity, always return the same
                  * report descriptor.
                  */
-                int rc = dev->control_transfer_reply(dev, 0,
+                usbvirt_control_reply_helper(setup_packet,
+                    data, act_size,
                     report_descriptor, report_descriptor_size);
-                
-                return rc;
+
+                return EOK;
         }