Changeset 79ae36dd in mainline for uspace/drv/vhc/transfer.c

Timestamp:

2011-06-08T19:01:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

File:

• uspace/drv/vhc/transfer.c (modified) (5 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>
@@ -123 +151 @@
 
 static int process_transfer_remote(vhc_transfer_t *transfer,
-    int phone, size_t *actual_data_size)
+    async_sess_t *sess, size_t *actual_data_size)
 {
         int rc;
@@ -129 +157 @@
         if (transfer->transfer_type == USB_TRANSFER_CONTROL) {
                 if (transfer->direction == USB_DIRECTION_IN) {
-                        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,
+                        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,
                             transfer->transfer_type,
                             transfer->data_buffer, transfer->data_buffer_size,
@@ -147 +175 @@
                 } else {
                         assert(transfer->direction == USB_DIRECTION_OUT);
-                        rc = usbvirt_ipc_send_data_out(phone, transfer->endpoint,
+                        rc = usbvirt_ipc_send_data_out(sess, transfer->endpoint,
                             transfer->transfer_type,
                             transfer->data_buffer, transfer->data_buffer_size);
@@ -206 +234 @@
                 int rc = EOK;
                 size_t data_transfer_size = 0;
-                if (dev->dev_phone > 0) {
-                        rc = process_transfer_remote(transfer, dev->dev_phone,
+                if (dev->dev_sess) {
+                        rc = process_transfer_remote(transfer, dev->dev_sess,
                             &data_transfer_size);
                 } else if (dev->dev_local != NULL) {