Changeset b4b534ac in mainline for uspace/lib/usbvirt/src

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

Location:

uspace/lib/usbvirt/src

Files:

• ctrltransfer.c (modified) (3 diffs)
• private.h (modified) (1 diff)
• stdreq.c (modified) (5 diffs)
• transfer.c (modified) (5 diffs)
• virthub_base.c (added)
• virthub_descriptors.c (added)

uspace/lib/usbvirt/src/ctrltransfer.c

@@ -50 +50 @@
  */
 int process_control_transfer(usbvirt_device_t *dev,
-    usbvirt_control_request_handler_t *control_handlers,
-    usb_device_request_setup_packet_t *setup,
+    const usbvirt_control_request_handler_t *control_handlers,
+    const usb_device_request_setup_packet_t *setup,
     uint8_t *data, size_t *data_sent_size)
 {
@@ -60 +60 @@
                 return EFORWARD;
         }
-
-        usb_direction_t direction = setup->request_type & 128 ?
-            USB_DIRECTION_IN : USB_DIRECTION_OUT;
-        usb_request_recipient_t req_recipient = setup->request_type & 31;
-        usb_request_type_t req_type = (setup->request_type >> 5) & 3;
-
-        usbvirt_control_request_handler_t *handler = control_handlers;
-        while (handler->callback != NULL) {
-                if (handler->req_direction != direction) {
-                        goto next;
-                }
-                if (handler->req_recipient != req_recipient) {
-                        goto next;
-                }
-                if (handler->req_type != req_type) {
-                        goto next;
-                }
-                if (handler->request != setup->request) {
-                        goto next;
+        const usbvirt_control_request_handler_t *handler = control_handlers;
+        for (;handler->callback != NULL; ++handler) {
+                if (handler->request != setup->request ||
+                    handler->request_type != setup->request_type) {
+                        continue;
                 }
 
@@ -84 +70 @@
                     usb_debug_str_buffer((uint8_t*) setup, sizeof(*setup), 0));
                 int rc = handler->callback(dev, setup, data, data_sent_size);
-                if (rc == EFORWARD) {
-                        goto next;
+                if (rc != EFORWARD) {
+                        return rc;
                 }
 
-                return rc;
-
-next:
-                handler++;
         }
 

uspace/lib/usbvirt/src/private.h

@@ -39 +39 @@
 
 int process_control_transfer(usbvirt_device_t *,
-    usbvirt_control_request_handler_t *,
-    usb_device_request_setup_packet_t *,
+    const usbvirt_control_request_handler_t *,
+    const usb_device_request_setup_packet_t *,
     uint8_t *, size_t *);
 

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,
-    void *actual_data, size_t actual_data_size)
+    const 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;
 }
 
@@ -98 +106 @@
                 }
                 /* Copy the data. */
-                usbvirt_device_configuration_t *config = &device->descriptors
-                    ->configuration[index];
+                const usbvirt_device_configuration_t *config =
+                    &device->descriptors->configuration[index];
                 uint8_t *all_data = malloc(config->descriptor->total_length);
                 if (all_data == NULL) {
@@ -110 +118 @@
                 size_t i;
                 for (i = 0; i < config->extra_count; i++) {
-                        usbvirt_device_configuration_extras_t *extra
+                        const usbvirt_device_configuration_extras_t *extra
                             = &config->extra[i];
                         memcpy(ptr, extra->data, extra->length);
@@ -189 +197 @@
 }
 
+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[] = {
         {
-                .req_direction = USB_DIRECTION_OUT,
-                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
-                .req_type = USB_REQUEST_TYPE_STANDARD,
-                .request = USB_DEVREQ_SET_ADDRESS,
+                STD_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_SET_ADDRESS),
                 .name = "SetAddress",
                 .callback = req_set_address
         },
         {
-                .req_direction = USB_DIRECTION_IN,
-                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
-                .req_type = USB_REQUEST_TYPE_STANDARD,
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
-                .name = "GetDescriptor",
+                STD_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
+                .name = "GetStdDescriptor",
                 .callback = req_get_descriptor
         },
         {
-                .req_direction = USB_DIRECTION_OUT,
-                .req_recipient = USB_REQUEST_RECIPIENT_DEVICE,
-                .req_type = USB_REQUEST_TYPE_STANDARD,
-                .request = USB_DEVREQ_SET_CONFIGURATION,
+                STD_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, 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 }
 };

uspace/lib/usbvirt/src/transfer.c

@@ -51 +51 @@
  */
 static int usbvirt_control_transfer(usbvirt_device_t *dev,
-    void *setup, size_t setup_size,
+    const void *setup, size_t setup_size,
     void *data, size_t data_size, size_t *data_size_sent)
 {
@@ -60 +60 @@
                 return ESTALL;
         }
-        usb_device_request_setup_packet_t *setup_packet = setup;
+        const usb_device_request_setup_packet_t *setup_packet = setup;
         if (data_size != setup_packet->length) {
                 return ESTALL;
@@ -100 +100 @@
  * @return Error code.
  */
-int usbvirt_control_write(usbvirt_device_t *dev, void *setup, size_t setup_size,
-    void *data, size_t data_size)
+int usbvirt_control_write(usbvirt_device_t *dev, const void *setup,
+    size_t setup_size, void *data, size_t data_size)
 {
         return usbvirt_control_transfer(dev, setup, setup_size,
@@ -119 +119 @@
  * @return Error code.
  */
-int usbvirt_control_read(usbvirt_device_t *dev, void *setup, size_t setup_size,
+int usbvirt_control_read(usbvirt_device_t *dev, const void *setup, size_t setup_size,
     void *data, size_t data_size, size_t *data_size_sent)
 {
@@ -136 +136 @@
  */
 int usbvirt_data_out(usbvirt_device_t *dev, usb_transfer_type_t transf_type,
-    usb_endpoint_t endpoint, void *data, size_t data_size)
+    usb_endpoint_t endpoint, const void *data, size_t data_size)
 {
         if ((endpoint <= 0) || (endpoint >= USBVIRT_ENDPOINT_MAX)) {