Changeset 3937bda in mainline

Timestamp:

2011-02-12T21:08:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

dc04868

Parents:

6b1931b

Message:

Allow control write transfers with no data stage

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (5 diffs)
• usb/src/usbdrv.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -540 +540 @@
                 .endpoint = DEV_IPC_GET_ARG2(*call)
         };
+        size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
 
         int rc;
@@ -546 +547 @@
         void *data_buffer = NULL;
         size_t setup_packet_len = 0;
-        size_t data_buffer_len = 0;
 
         rc = async_data_write_accept(&setup_packet, false,
@@ -554 +554 @@
                 return;
         }
-        rc = async_data_write_accept(&data_buffer, false,
-            1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                free(setup_packet);
-                return;
+
+        if (data_buffer_len > 0) {
+                rc = async_data_write_accept(&data_buffer, false,
+                    1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len);
+                if (rc != EOK) {
+                        async_answer_0(callid, rc);
+                        free(setup_packet);
+                        return;
+                }
         }
 
@@ -596 +599 @@
         }
 
-        size_t data_len = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -606 +608 @@
         void *setup_packet = NULL;
         size_t setup_packet_len = 0;
+        size_t data_len = 0;
 
         rc = async_data_write_accept(&setup_packet, false,

uspace/lib/usb/src/usbdrv.c

@@ -464 +464 @@
         assert(setup_packet != NULL);
         assert(setup_packet_size > 0);
-        assert(buffer != NULL);
-        assert(buffer_size > 0);
+        assert(((buffer != NULL) && (buffer_size > 0))
+            || ((buffer == NULL) && (buffer_size == 0)));
         assert(handle != NULL);
 
@@ -494 +494 @@
         }
 
-        rc = async_data_write_start(phone, buffer, buffer_size);
-        if (rc != EOK) {
-                async_wait_for(transfer->request, NULL);
-                return rc;
+        if (buffer_size > 0) {
+                rc = async_data_write_start(phone, buffer, buffer_size);
+                if (rc != EOK) {
+                        async_wait_for(transfer->request, NULL);
+                        return rc;
+                }
         }