Changes in uspace/drv/vhc/transfer.c [79ae36dd:e913cc9] in mainline

File:

• uspace/drv/vhc/transfer.c (modified) (7 diffs)

uspace/drv/vhc/transfer.c

@@ -1 @@
-/*
- * Copyright (c) 2011 Vojtech Horky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 #include <errno.h>
 #include <str_error.h>
@@ -32 +4 @@
 #include <usbvirt/ipc.h>
 #include "vhcd.h"
+
+#define list_foreach(pos, head) \
+        for (pos = (head)->next; pos != (head); \
+                pos = pos->next)
 
 vhc_transfer_t *vhc_transfer_create(usb_address_t address, usb_endpoint_t ep,
@@ -91 +67 @@
         fibril_mutex_lock(&vhc->guard);
 
+        link_t *pos;
         bool target_found = false;
-        list_foreach(vhc->devices, pos) {
+        list_foreach(pos, &vhc->devices) {
                 vhc_virtdev_t *dev = list_get_instance(pos, vhc_virtdev_t, link);
                 fibril_mutex_lock(&dev->guard);
@@ -151 +128 @@
 
 static int process_transfer_remote(vhc_transfer_t *transfer,
-    async_sess_t *sess, size_t *actual_data_size)
+    int phone, size_t *actual_data_size)
 {
         int rc;
@@ -157 +134 @@
         if (transfer->transfer_type == USB_TRANSFER_CONTROL) {
                 if (transfer->direction == USB_DIRECTION_IN) {
-                        rc = usbvirt_ipc_send_control_read(sess,
-                            transfer->setup_buffer, transfer->setup_buffer_size,
-                            transfer->data_buffer, transfer->data_buffer_size,
-                            actual_data_size);
-                } else {
-                        assert(transfer->direction == USB_DIRECTION_OUT);
-                        rc = usbvirt_ipc_send_control_write(sess,
-                            transfer->setup_buffer, transfer->setup_buffer_size,
-                            transfer->data_buffer, transfer->data_buffer_size);
-                }
-        } else {
-                if (transfer->direction == USB_DIRECTION_IN) {
-                        rc = usbvirt_ipc_send_data_in(sess, transfer->endpoint,
+                        rc = usbvirt_ipc_send_control_read(phone,
+                            transfer->setup_buffer, transfer->setup_buffer_size,
+                            transfer->data_buffer, transfer->data_buffer_size,
+                            actual_data_size);
+                } else {
+                        assert(transfer->direction == USB_DIRECTION_OUT);
+                        rc = usbvirt_ipc_send_control_write(phone,
+                            transfer->setup_buffer, transfer->setup_buffer_size,
+                            transfer->data_buffer, transfer->data_buffer_size);
+                }
+        } else {
+                if (transfer->direction == USB_DIRECTION_IN) {
+                        rc = usbvirt_ipc_send_data_in(phone, transfer->endpoint,
                             transfer->transfer_type,
                             transfer->data_buffer, transfer->data_buffer_size,
@@ -175 +152 @@
                 } else {
                         assert(transfer->direction == USB_DIRECTION_OUT);
-                        rc = usbvirt_ipc_send_data_out(sess, transfer->endpoint,
+                        rc = usbvirt_ipc_send_data_out(phone, transfer->endpoint,
                             transfer->transfer_type,
                             transfer->data_buffer, transfer->data_buffer_size);
@@ -234 +211 @@
                 int rc = EOK;
                 size_t data_transfer_size = 0;
-                if (dev->dev_sess) {
-                        rc = process_transfer_remote(transfer, dev->dev_sess,
+                if (dev->dev_phone > 0) {
+                        rc = process_transfer_remote(transfer, dev->dev_phone,
                             &data_transfer_size);
                 } else if (dev->dev_local != NULL) {