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

uspace/lib/usb/src/ddfiface.c

@@ -78 +78 @@
 {
         assert(fun != NULL);
-
-        int parent_phone = devman_parent_device_connect(fun->handle,
+        
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle,
             IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
+        if (!parent_sess)
+                return ENOMEM;
+        
+        async_exch_t *exch = async_exchange_begin(parent_sess);
+        
         sysarg_t hc_handle;
-        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &hc_handle);
-
-        async_hangup(parent_phone);
-
-        if (rc != EOK) {
+        
+        async_exchange_end(exch);
+        async_hangup(parent_sess);
+        
+        if (rc != EOK)
                 return rc;
-        }
-
+        
         *handle = hc_handle;
-
         return EOK;
 }
@@ -128 +129 @@
 {
         assert(fun);
-        int parent_phone = devman_parent_device_connect(fun->handle,
+        
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle,
             IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
+        if (!parent_sess)
+                return ENOMEM;
+        
+        async_exch_t *exch = async_exchange_begin(parent_sess);
+        
         sysarg_t addr;
-        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_ADDRESS, handle, &addr);
-
-        async_hangup(parent_phone);
-
-        if (rc != EOK) {
+        
+        async_exchange_end(exch);
+        async_hangup(parent_sess);
+        
+        if (rc != EOK)
                 return rc;
-        }
-
-        if (address != NULL) {
+        
+        if (address != NULL)
                 *address = (usb_address_t) addr;
-        }
-
+        
         return EOK;
 }