Changeset fe1776c2 in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2011-02-11T12:41:11Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 from usb/development

File:

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

uspace/lib/c/generic/devman.c

@@ -28 +28 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
- /** @addtogroup libc
+
+/** @addtogroup libc
  * @{
  */
@@ -37 +37 @@
 #include <str.h>
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/devman.h>
@@ -116 +115 @@
         async_set_client_connection(conn);
         
-        ipc_connect_to_me(phone, 0, 0, 0, NULL, NULL);
+        async_connect_to_me(phone, 0, 0, 0, NULL);
         async_wait_for(req, &retval);
         
@@ -221 +220 @@
         case DEVMAN_DRIVER:
                 if (devman_phone_driver >= 0) {
-                        ipc_hangup(devman_phone_driver);
+                        async_hangup(devman_phone_driver);
                         devman_phone_driver = -1;
                 }
@@ -227 +226 @@
         case DEVMAN_CLIENT:
                 if (devman_phone_client >= 0) {
-                        ipc_hangup(devman_phone_client);
+                        async_hangup(devman_phone_client);
                         devman_phone_client = -1;
                 }