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

uspace/lib/usbdev/src/hub.c

@@ -42 +42 @@
 #include <usb/debug.h>
 #include <time.h>
+#include <async.h>
 
 /** How much time to wait between attempts to register endpoint 0:0.
@@ -71 +72 @@
 {
         CHECK_CONNECTION(connection);
-
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        
         sysarg_t address;
-        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_REQUEST_ADDRESS, speed,
             &address);
-        if (rc != EOK) {
+        
+        async_exchange_end(exch);
+        
+        if (rc != EOK)
                 return (usb_address_t) rc;
-        } else {
-                return (usb_address_t) address;
-        }
+        
+        return (usb_address_t) address;
 }
 
@@ -94 +98 @@
 {
         CHECK_CONNECTION(connection);
-        if (attached_device == NULL) {
+        
+        if (attached_device == NULL)
                 return EBADMEM;
-        }
-
-        return async_req_3_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        int rc = async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_BIND_ADDRESS,
             attached_device->address, attached_device->handle);
+        async_exchange_end(exch);
+        
+        return rc;
 }
 
@@ -114 +121 @@
 {
         CHECK_CONNECTION(connection);
-
-        return async_req_2_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        int rc = async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_RELEASE_ADDRESS, address);
+        async_exchange_end(exch);
+        
+        return rc;
 }
 
@@ -192 +202 @@
         usb_hc_connection_t hc_conn = {
                 .hc_handle = connection->hc_handle,
-                .hc_phone = -1
+                .hc_sess = NULL
         };