Changes in uspace/lib/usb/src/usbdrv.c [3937bda:fe4dd14] in mainline

File:

• uspace/lib/usb/src/usbdrv.c (modified) (12 diffs)

uspace/lib/usb/src/usbdrv.c

@@ -49 +49 @@
         /** Storage for actual number of bytes transferred. */
         size_t *size_transferred;
-        /** Initial call reply data. */
+        /** Initial call replay data. */
         ipc_call_t reply;
         /** Initial call identifier. */
         aid_t request;
-        /** Reply data for data read call. */
-        ipc_call_t read_reply;
-        /** Data read call identifier. */
-        aid_t read_request;
 } transfer_info_t;
 
@@ -84 +80 @@
             IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
 
-        async_hangup(parent_phone);
+        ipc_hangup(parent_phone);
 
         if (rc != EOK) {
@@ -144 +140 @@
 
         if (rc != EOK) {
+                printf("usb_drv_get_my_address over %d failed: %s\n", phone, str_error(rc));
                 return rc;
         }
@@ -253 +250 @@
         }
 
-        transfer->read_request = 0;
         transfer->size_transferred = NULL;
         transfer->buffer = NULL;
@@ -319 +315 @@
         }
 
-        transfer->read_request = 0;
         transfer->size_transferred = actual_size;
         transfer->buffer = buffer;
@@ -332 +327 @@
             &transfer->reply);
 
-        if (buffer != NULL) {
-                transfer->read_request = async_data_read(phone, buffer, size,
-                    &transfer->read_reply);
-        }
-
         *handle = (usb_handle_t) transfer;
 
@@ -342 +332 @@
 }
 
+/** Read buffer from HCD.
+ *
+ * @param phone Opened phone to HCD.
+ * @param hash Buffer hash (obtained after completing IN transaction).
+ * @param buffer Buffer where to store data data.
+ * @param size Buffer size.
+ * @param actual_size Storage where actual number of bytes transferred will
+ *      be stored.
+ * @return Error status.
+ */
+static int read_buffer_in(int phone, sysarg_t hash,
+    void *buffer, size_t size, size_t *actual_size)
+{
+        ipc_call_t answer_data;
+        sysarg_t answer_rc;
+        aid_t req;
+        int rc;
+
+        req = async_send_2(phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_BUFFER,
+            hash,
+            &answer_data);
+
+        rc = async_data_read_start(phone, buffer, size);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return EINVAL;
+        }
+
+        async_wait_for(req, &answer_rc);
+        rc = (int)answer_rc;
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        *actual_size = IPC_GET_ARG1(answer_data);
+
+        return EOK;
+}
 
 /** Blocks caller until given USB transaction is finished.
@@ -364 +395 @@
 
         sysarg_t answer_rc;
+        async_wait_for(transfer->request, &answer_rc);
+
+        if (answer_rc != EOK) {
+                rc = (int) answer_rc;
+                goto leave;
+        }
 
         /*
@@ -369 +406 @@
          */
         if ((transfer->buffer != NULL) && (transfer->size > 0)) {
-                async_wait_for(transfer->read_request, &answer_rc);
-
-                if (answer_rc != EOK) {
-                        rc = (int) answer_rc;
+                /*
+                 * The buffer hash identifies the data on the server
+                 * side.
+                 * We will use it when actually reading-in the data.
+                 */
+                sysarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
+                if (buffer_hash == 0) {
+                        rc = ENOENT;
                         goto leave;
                 }
 
-                if (transfer->size_transferred != NULL) {
-                        *(transfer->size_transferred)
-                            = IPC_GET_ARG2(transfer->read_reply);
+                size_t actual_size;
+                rc = read_buffer_in(transfer->phone, buffer_hash,
+                    transfer->buffer, transfer->size, &actual_size);
+
+                if (rc != EOK) {
+                        goto leave;
                 }
-        }
-
-        async_wait_for(transfer->request, &answer_rc);
-
-        if (answer_rc != EOK) {
-                rc = (int) answer_rc;
-                goto leave;
+
+                if (transfer->size_transferred) {
+                        *(transfer->size_transferred) = actual_size;
+                }
         }
 
@@ -458 +499 @@
     void *setup_packet, size_t setup_packet_size,
     void *buffer, size_t buffer_size,
-    usb_handle_t *handle)
-{
-        // FIXME - check input parameters instead of asserting them
-        assert(phone > 0);
-        assert(setup_packet != NULL);
-        assert(setup_packet_size > 0);
-        assert(((buffer != NULL) && (buffer_size > 0))
-            || ((buffer == NULL) && (buffer_size == 0)));
-        assert(handle != NULL);
-
-        transfer_info_t *transfer
-            = (transfer_info_t *) malloc(sizeof(transfer_info_t));
-        if (transfer == NULL) {
-                return ENOMEM;
-        }
-
-        transfer->read_request = 0;
-        transfer->size_transferred = NULL;
-        transfer->buffer = NULL;
-        transfer->size = 0;
-        transfer->phone = phone;
-
-        int rc;
-
-        transfer->request = async_send_3(phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_CONTROL_WRITE,
-            target.address, target.endpoint,
-            &transfer->reply);
-
-        rc = async_data_write_start(phone, setup_packet, setup_packet_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;
-                }
-        }
-
-        *handle = (usb_handle_t) transfer;
-
-        return EOK;
-}
-
-/** Start control read transfer. */
-int usb_drv_async_control_read_setup(int phone, usb_target_t target,
-    void *buffer, size_t size,
-    usb_handle_t *handle)
-{
-        return async_send_buffer(phone,
-            IPC_M_USBHC_CONTROL_READ_SETUP,
-            target,
-            buffer, size,
-            handle);
-}
-
-/** Read data during control read transfer. */
-int usb_drv_async_control_read_data(int phone, usb_target_t target,
-    void *buffer, size_t size, size_t *actual_size,
-    usb_handle_t *handle)
-{
-        return async_recv_buffer(phone,
-            IPC_M_USBHC_CONTROL_READ_DATA,
-            target,
-            buffer, size, actual_size,
-            handle);
-}
-
-/** Finalize control read transfer. */
-int usb_drv_async_control_read_status(int phone, usb_target_t target,
-    usb_handle_t *handle)
-{
-        return async_send_buffer(phone,
-            IPC_M_USBHC_CONTROL_READ_STATUS,
-            target,
-            NULL, 0,
-            handle);
-}
-
-/** Issue whole control read transfer. */
-int usb_drv_async_control_read(int phone, usb_target_t target,
-    void *setup_packet, size_t setup_packet_size,
-    void *buffer, size_t buffer_size, size_t *actual_size,
     usb_handle_t *handle)
 {
@@ -562 +515 @@
         }
 
+        transfer->size_transferred = NULL;
+        transfer->buffer = NULL;
+        transfer->size = 0;
+        transfer->phone = phone;
+
+        int rc;
+
+        transfer->request = async_send_3(phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_CONTROL_WRITE,
+            target.address, target.endpoint,
+            &transfer->reply);
+
+        rc = async_data_write_start(phone, setup_packet, setup_packet_size);
+        if (rc != EOK) {
+                async_wait_for(transfer->request, NULL);
+                return rc;
+        }
+
+        rc = async_data_write_start(phone, buffer, buffer_size);
+        if (rc != EOK) {
+                async_wait_for(transfer->request, NULL);
+                return rc;
+        }
+
+        *handle = (usb_handle_t) transfer;
+
+        return EOK;
+}
+
+/** Start control read transfer. */
+int usb_drv_async_control_read_setup(int phone, usb_target_t target,
+    void *buffer, size_t size,
+    usb_handle_t *handle)
+{
+        return async_send_buffer(phone,
+            IPC_M_USBHC_CONTROL_READ_SETUP,
+            target,
+            buffer, size,
+            handle);
+}
+
+/** Read data during control read transfer. */
+int usb_drv_async_control_read_data(int phone, usb_target_t target,
+    void *buffer, size_t size, size_t *actual_size,
+    usb_handle_t *handle)
+{
+        return async_recv_buffer(phone,
+            IPC_M_USBHC_CONTROL_READ_DATA,
+            target,
+            buffer, size, actual_size,
+            handle);
+}
+
+/** Finalize control read transfer. */
+int usb_drv_async_control_read_status(int phone, usb_target_t target,
+    usb_handle_t *handle)
+{
+        return async_send_buffer(phone,
+            IPC_M_USBHC_CONTROL_READ_STATUS,
+            target,
+            NULL, 0,
+            handle);
+}
+
+/** Issue whole control read transfer. */
+int usb_drv_async_control_read(int phone, usb_target_t target,
+    void *setup_packet, size_t setup_packet_size,
+    void *buffer, size_t buffer_size, size_t *actual_size,
+    usb_handle_t *handle)
+{
+        // FIXME - check input parameters instead of asserting them
+        assert(phone > 0);
+        assert(setup_packet != NULL);
+        assert(setup_packet_size > 0);
+        assert(buffer != NULL);
+        assert(buffer_size > 0);
+        assert(handle != NULL);
+
+        transfer_info_t *transfer
+            = (transfer_info_t *) malloc(sizeof(transfer_info_t));
+        if (transfer == NULL) {
+                return ENOMEM;
+        }
+
         transfer->size_transferred = actual_size;
         transfer->buffer = buffer;
@@ -582 +620 @@
         }
 
-        transfer->read_request = async_data_read(phone, buffer, buffer_size,
-            &transfer->read_reply);
-
         *handle = (usb_handle_t) transfer;