Changeset e64df9a in mainline for uspace/lib/c/generic

Timestamp:

2011-08-20T15:32:44Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1a5b252, c22531fc

Parents:

4e6577c (diff), 422722e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge devman-driver and driver-devman parallel exchange support.

Location:

uspace/lib/c/generic

Files:

• async.c (modified) (1 diff)
• devman.c (modified) (2 diffs)
• ns.c (modified) (2 diffs)

uspace/lib/c/generic/async.c

@@ -1656 +1656 @@
         
         return sess;
+}
+
+/** Set arguments for new connections.
+ *
+ * FIXME This is an ugly hack to work around the problem that parallel
+ * exchanges are implemented using parallel connections. When we create
+ * a callback session, the framework does not know arguments for the new
+ * connections.
+ *
+ * The proper solution seems to be to implement parallel exchanges using
+ * tagging.
+ */
+void async_sess_args_set(async_sess_t *sess, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3)
+{
+        sess->arg1 = arg1;
+        sess->arg2 = arg2;
+        sess->arg3 = arg3;
 }
 

uspace/lib/c/generic/devman.c

@@ -89 +89 @@
                         if (devman_driver_block_sess == NULL)
                                 devman_driver_block_sess =
-                                    service_connect_blocking(EXCHANGE_SERIALIZE,
+                                    service_connect_blocking(EXCHANGE_PARALLEL,
                                     SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
                 }
@@ -138 +138 @@
                 if (devman_driver_sess == NULL)
                         devman_driver_sess =
-                            service_connect(EXCHANGE_SERIALIZE, SERVICE_DEVMAN,
+                            service_connect(EXCHANGE_PARALLEL, SERVICE_DEVMAN,
                             DEVMAN_DRIVER, 0);
                 

uspace/lib/c/generic/ns.c

@@ -56 +56 @@
         async_exchange_end(exch);
         
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
+        
         return sess;
 }
@@ -66 +73 @@
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+        
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
         
         return sess;