Changes in uspace/lib/usbvirt/src/stdreq.c [d2e66bf:9d58539] in mainline

File:

• uspace/lib/usbvirt/src/stdreq.c (modified) (5 diffs)

uspace/lib/usbvirt/src/stdreq.c

@@ -51 +51 @@
 void usbvirt_control_reply_helper(const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size,
-    const void *actual_data, size_t actual_data_size)
+    void *actual_data, size_t actual_data_size)
 {
         size_t expected_size = setup_packet->length;
@@ -63 +63 @@
                 *act_size = actual_data_size;
         }
-}
-
-/** NOP handler */
-int req_nop(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size)
-{
-        return EOK;
 }
 
@@ -106 +98 @@
                 }
                 /* Copy the data. */
-                const usbvirt_device_configuration_t *config =
-                    &device->descriptors->configuration[index];
+                usbvirt_device_configuration_t *config = &device->descriptors
+                    ->configuration[index];
                 uint8_t *all_data = malloc(config->descriptor->total_length);
                 if (all_data == NULL) {
@@ -118 +110 @@
                 size_t i;
                 for (i = 0; i < config->extra_count; i++) {
-                        const usbvirt_device_configuration_extras_t *extra
+                        usbvirt_device_configuration_extras_t *extra
                             = &config->extra[i];
                         memcpy(ptr, extra->data, extra->length);
@@ -197 +189 @@
 }
 
-static int req_get_dev_status(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size)
-{
-        if (setup_packet->length != 2)
-                return ESTALL;
-        data[0] = (device->self_powered ? 1 : 0) | (device->remote_wakeup ? 2 : 0);
-        data[1] = 0;
-        *act_size = 2;
-        return EOK;
-}
-static int req_get_iface_ep_status(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size)
-{
-        if (setup_packet->length != 2)
-                return ESTALL;
-        data[0] = 0;
-        data[1] = 0;
-        *act_size = 2;
-        return EOK;
-}
-
 /** Standard request handlers. */
 usbvirt_control_request_handler_t library_handlers[] = {
         {
-                STD_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_SET_ADDRESS),
+                .req_direction = USB_DIRECTION_OUT,
+                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
+                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .request = USB_DEVREQ_SET_ADDRESS,
                 .name = "SetAddress",
                 .callback = req_set_address
         },
         {
-                STD_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
-                .name = "GetStdDescriptor",
+                .req_direction = USB_DIRECTION_IN,
+                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
+                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .name = "GetDescriptor",
                 .callback = req_get_descriptor
         },
         {
-                STD_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_SET_CONFIGURATION),
+                .req_direction = USB_DIRECTION_OUT,
+                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
+                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .request = USB_DEVREQ_SET_CONFIGURATION,
                 .name = "SetConfiguration",
                 .callback = req_set_configuration
         },
-        {
-                STD_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_STATUS),
-                .name = "GetDeviceStatus",
-                .callback = req_get_dev_status,
-        },
-        {
-                STD_REQ_IN(USB_REQUEST_RECIPIENT_INTERFACE, USB_DEVREQ_GET_STATUS),
-                .name = "GetInterfaceStatus",
-                .callback = req_get_iface_ep_status,
-        },
-        {
-                /* virtual EPs by default cannot be stalled */
-                STD_REQ_IN(USB_REQUEST_RECIPIENT_ENDPOINT, USB_DEVREQ_GET_STATUS),
-                .name = "GetEndpointStatus",
-                .callback = req_get_iface_ep_status,
-        },
+
         { .callback = NULL }
 };