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

Timestamp:

2011-06-08T19:01:55Z (13 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/conndev.c (modified) (4 diffs)

uspace/drv/vhc/conndev.c

@@ -38 +38 @@
 #include <ddf/driver.h>
 #include <usbvirt/ipc.h>
+#include <async.h>
 #include "conn.h"
 
@@ -44 +45 @@
 static fibril_local char plugged_device_name[PLUGGED_DEVICE_NAME_MAXLEN + 1] = "<unknown>";
 
+#if 0
 /** Receive device name.
  *
  * @warning Errors are silently ignored.
  *
- * @param phone Phone to the virtual device.
+ * @param sess Session to the virtual device.
+ *
  */
-static void receive_device_name(int phone)
+static void receive_device_name(async_sess_t *sess)
 {
-        aid_t opening_request = async_send_0(phone, IPC_M_USBVIRT_GET_NAME, NULL);
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        aid_t opening_request = async_send_0(exch, IPC_M_USBVIRT_GET_NAME, NULL);
         if (opening_request == 0) {
+                async_exchange_end(exch);
                 return;
         }
-
-
+        
         ipc_call_t data_request_call;
-        aid_t data_request = async_data_read(phone,
-             plugged_device_name, PLUGGED_DEVICE_NAME_MAXLEN,
-             &data_request_call);
-
+        aid_t data_request = async_data_read(exch, plugged_device_name,
+             PLUGGED_DEVICE_NAME_MAXLEN, &data_request_call);
+        
+        async_exchange_end(exch);
+        
         if (data_request == 0) {
                 async_wait_for(opening_request, NULL);
                 return;
         }
-
+        
         sysarg_t data_request_rc;
         sysarg_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
-
-        if ((data_request_rc != EOK) || (opening_request_rc != EOK)) {
+        
+        if ((data_request_rc != EOK) || (opening_request_rc != EOK))
                 return;
-        }
-
+        
         size_t len = IPC_GET_ARG2(data_request_call);
         plugged_device_name[len] = 0;
 }
+#endif
 
 /** Default handler for IPC methods not handled by DDF.
@@ -90 +96 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
+// FIXME:
+// This code needs to be refactored since the async
+// framework does not support automatic callback connections
+// yet.
+
+#if 0
         vhc_data_t *vhc = fun->dev->driver_data;
         sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -112 +124 @@
                 return;
         }
+#endif
 
         async_answer_0(icallid, EINVAL);