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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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) (7 diffs)

uspace/lib/c/generic/devmap.c

@@ -29 +29 @@
 
 #include <str.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <ipc/devmap.h>
 #include <devmap.h>
@@ -50 +50 @@
                 
                 if (flags & IPC_FLAG_BLOCKING)
-                        devmap_phone_driver = ipc_connect_me_to_blocking(PHONE_NS,
-                            SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
+                        devmap_phone_driver = service_connect_blocking(SERVICE_DEVMAP,
+                            DEVMAP_DRIVER, 0);
                 else
-                        devmap_phone_driver = ipc_connect_me_to(PHONE_NS,
-                            SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
+                        devmap_phone_driver = service_connect(SERVICE_DEVMAP,
+                            DEVMAP_DRIVER, 0);
                 
                 return devmap_phone_driver;
@@ -62 +62 @@
                 
                 if (flags & IPC_FLAG_BLOCKING)
-                        devmap_phone_client = ipc_connect_me_to_blocking(PHONE_NS,
-                            SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+                        devmap_phone_client = service_connect_blocking(SERVICE_DEVMAP,
+                            DEVMAP_CLIENT, 0);
                 else
-                        devmap_phone_client = ipc_connect_me_to(PHONE_NS,
-                            SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+                        devmap_phone_client = service_connect(SERVICE_DEVMAP,
+                            DEVMAP_CLIENT, 0);
                 
                 return devmap_phone_client;
@@ -79 +79 @@
         case DEVMAP_DRIVER:
                 if (devmap_phone_driver >= 0) {
-                        ipc_hangup(devmap_phone_driver);
+                        async_hangup(devmap_phone_driver);
                         devmap_phone_driver = -1;
                 }
@@ -85 +85 @@
         case DEVMAP_CLIENT:
                 if (devmap_phone_client >= 0) {
-                        ipc_hangup(devmap_phone_client);
+                        async_hangup(devmap_phone_client);
                         devmap_phone_client = -1;
                 }
@@ -116 +116 @@
         async_set_client_connection(conn);
         
-        sysarg_t callback_phonehash;
-        ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
+        async_connect_to_me(phone, 0, 0, 0, NULL);
         async_wait_for(req, &retval);
         
@@ -279 +278 @@
         
         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);
         }