Changeset 79ae36dd in mainline for uspace/lib/usbvirt/src/device.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/lib/usbvirt/src/device.c (modified) (3 diffs)

uspace/lib/usbvirt/src/device.c

@@ -65 +65 @@
                 bool processed = usbvirt_ipc_handle_call(DEV, callid, &call);
                 if (!processed) {
-                        switch (IPC_GET_IMETHOD(call)) {
-                                case IPC_M_PHONE_HUNGUP:
-                                        async_answer_0(callid, EOK);
-                                        return;
-                                default:
-                                        async_answer_0(callid, EINVAL);
-                                        break;
-                        }
+                        if (!IPC_GET_IMETHOD(call)) {
+                                async_answer_0(callid, EOK);
+                                return;
+                        } else
+                                async_answer_0(callid, EINVAL);
                 }
         }
@@ -85 +82 @@
 int usbvirt_device_plug(usbvirt_device_t *dev, const char *vhc_path)
 {
-        int rc;
+        if (DEV != NULL)
+                return ELIMIT;
+        
         devman_handle_t handle;
-
-        if (DEV != NULL) {
-                return ELIMIT;
-        }
-
-        rc = devman_device_get_handle(vhc_path, &handle, 0);
-        if (rc != EOK) {
+        int rc = devman_device_get_handle(vhc_path, &handle, 0);
+        if (rc != EOK)
                 return rc;
-        }
-
-        int hcd_phone = devman_device_connect(handle, 0);
-
-        if (hcd_phone < 0) {
-                return hcd_phone;
-        }
-
+        
+        async_sess_t *hcd_sess =
+            devman_device_connect(EXCHANGE_SERIALIZE, handle, 0);
+        if (!hcd_sess)
+                return ENOMEM;
+        
         DEV = dev;
-        dev->vhc_phone = hcd_phone;
-
-        rc = async_connect_to_me(hcd_phone, 0, 0, 0, callback_connection);
-        if (rc != EOK) {
+        dev->vhc_sess = hcd_sess;
+        
+        async_exch_t *exch = async_exchange_begin(hcd_sess);
+        rc = async_connect_to_me(exch, 0, 0, 0, callback_connection);
+        async_exchange_end(exch);
+        
+        if (rc != EOK)
                 DEV = NULL;
-        }
-
+        
         return rc;
 }
@@ -120 +114 @@
 void usbvirt_device_unplug(usbvirt_device_t *dev)
 {
-        async_hangup(dev->vhc_phone);
+        async_hangup(dev->vhc_sess);
 }