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

uspace/lib/usb/src/hc.c

@@ -81 +81 @@
 
         connection->hc_handle = hc_handle;
-        connection->hc_phone = -1;
+        connection->hc_sess = NULL;
 
         return EOK;
@@ -94 +94 @@
 {
         assert(connection);
-
-        if (usb_hc_connection_is_opened(connection)) {
+        
+        if (usb_hc_connection_is_opened(connection))
                 return EBUSY;
-        }
-
-        int phone = devman_device_connect(connection->hc_handle, 0);
-        if (phone < 0) {
-                return phone;
-        }
-
-        connection->hc_phone = phone;
-
+        
+        async_sess_t *sess = devman_device_connect(EXCHANGE_SERIALIZE,
+            connection->hc_handle, 0);
+        if (!sess)
+                return ENOMEM;
+        
+        connection->hc_sess = sess;
         return EOK;
 }
@@ -117 +115 @@
 {
         assert(connection);
-
-        return (connection->hc_phone >= 0);
+        return (connection->hc_sess != NULL);
 }
 
@@ -134 +131 @@
         }
 
-        int rc = async_hangup(connection->hc_phone);
+        int rc = async_hangup(connection->hc_sess);
         if (rc != EOK) {
                 return rc;
         }
 
-        connection->hc_phone = -1;
+        connection->hc_sess = NULL;
 
         return EOK;
@@ -154 +151 @@
     usb_address_t address, devman_handle_t *handle)
 {
-        if (!usb_hc_connection_is_opened(connection)) {
+        if (!usb_hc_connection_is_opened(connection))
                 return ENOENT;
-        }
-
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        
         sysarg_t tmp;
-        int rc = async_req_2_1(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
             address, &tmp);
-        if ((rc == EOK) && (handle != NULL)) {
+        
+        async_exchange_end(exch);
+        
+        if ((rc == EOK) && (handle != NULL))
                 *handle = tmp;
-        }
-
+        
         return rc;
 }
@@ -177 +176 @@
 usb_address_t usb_hc_get_address_by_handle(devman_handle_t dev_handle)
 {
-        int parent_phone = devman_parent_device_connect(dev_handle,
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev_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 address;
-
-        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,
             dev_handle, &address);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        async_hangup(parent_phone);
-
+        
+        async_exchange_end(exch);
+        async_hangup(parent_sess);
+        
+        if (rc != EOK)
+                return rc;
+        
         return (usb_address_t) address;
 }
@@ -240 +240 @@
 int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
 {
-        int parent_phone = devman_parent_device_connect(device_handle,
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, device_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);
+        
         devman_handle_t h;
-        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, &h);
-
-        async_hangup(parent_phone);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        if (hc_handle != NULL) {
+        
+        async_exchange_end(exch);
+        async_hangup(parent_sess);
+        
+        if (rc != EOK)
+                return rc;
+        
+        if (hc_handle != NULL)
                 *hc_handle = h;
-        }
-
+        
         return EOK;
 }