Changeset 8ff0bd2 in mainline for uspace/lib/c/generic/async_obsolete.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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 mainline changes

File:

• uspace/lib/c/generic/async_obsolete.c (modified) (5 diffs)

uspace/lib/c/generic/async_obsolete.c

@@ -38 +38 @@
 #include <async.h>
 #include <async_obsolete.h>
+#include "private/async.h"
 #undef LIBC_ASYNC_C_
 #undef LIBC_ASYNC_OBSOLETE_C_
@@ -44 +45 @@
 #include <malloc.h>
 #include <errno.h>
-#include "private/async.h"
 
 /** Send message and return id of the sent message.
@@ -166 +166 @@
 }
 
-void async_obsolete_serialize_start(void)
-{
-        fibril_inc_sercount();
-}
-
-void async_obsolete_serialize_end(void)
-{
-        fibril_dec_sercount();
-}
-
 /** Wrapper for IPC_M_DATA_WRITE calls using the async framework.
  *
@@ -240 +230 @@
  */
 int async_obsolete_connect_to_me(int phone, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, async_client_conn_t client_receiver)
+    sysarg_t arg3, async_client_conn_t client_receiver, void *carg)
 {
         sysarg_t task_hash;
@@ -251 +241 @@
         if (client_receiver != NULL)
                 async_new_connection(task_hash, phone_hash, 0, NULL,
-                    client_receiver);
+                    client_receiver, carg);
         
         return EOK;