Changeset 92574f4 in mainline for uspace/lib/c/generic/async_sess.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/c/generic/async_sess.c (modified) (6 diffs)

uspace/lib/c/generic/async_sess.c

@@ -99 +99 @@
 
 #include <async_sess.h>
-#include <ipc/ipc.h>
 #include <fibril_synch.h>
 #include <adt/list.h>
@@ -106 +105 @@
 #include <errno.h>
 #include <assert.h>
+#include "private/async_sess.h"
 
 /** An inactive open connection. */
@@ -138 +138 @@
  *
  * Needs to be called prior to any other interface in this file.
- */
-void _async_sess_init(void)
+ *
+ */
+void __async_sess_init(void)
 {
         fibril_mutex_initialize(&async_sess_mutex);
@@ -200 +201 @@
                 list_remove(&conn->global_link);
                 
-                ipc_hangup(conn->data_phone);
+                async_hangup(conn->data_phone);
                 free(conn);
         }
@@ -260 +261 @@
                         data_phone = conn->data_phone;
                         free(conn);
-                        ipc_hangup(data_phone);
+                        async_hangup(data_phone);
                         goto retry;
                 } else {
@@ -292 +293 @@
                  * means that we simply hang up.
                  */
-                ipc_hangup(data_phone);
+                async_hangup(data_phone);
                 fibril_mutex_unlock(&async_sess_mutex);
                 return;