Changeset a676574 in mainline for uspace/lib/c/generic/devmap.c

Timestamp:

2011-01-09T12:18:00Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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/devmap.c (modified) (1 diff)

uspace/lib/c/generic/devmap.c

@@ -279 +279 @@
         
         if (flags & IPC_FLAG_BLOCKING) {
-                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
+                phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
                     DEVMAP_CONNECT_TO_DEVICE, handle);
         } else {
-                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
+                phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
                     DEVMAP_CONNECT_TO_DEVICE, handle);
         }