Changes in uspace/lib/c/generic/devman.c [622dea8:96b02eb9] in mainline

File:

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

uspace/lib/c/generic/devman.c

@@ -42 +42 @@
 #include <devman.h>
 #include <async.h>
-#include <fibril_synch.h>
 #include <errno.h>
 #include <malloc.h>
@@ -51 +50 @@
 static int devman_phone_client = -1;
 
-static FIBRIL_MUTEX_INITIALIZE(devman_phone_mutex);
-
 int devman_get_phone(devman_interface_t iface, unsigned int flags)
 {
         switch (iface) {
         case DEVMAN_DRIVER:
-                fibril_mutex_lock(&devman_phone_mutex);
-                if (devman_phone_driver >= 0) {
-                        fibril_mutex_unlock(&devman_phone_mutex);
+                if (devman_phone_driver >= 0)
                         return devman_phone_driver;
-                }
                 
                 if (flags & IPC_FLAG_BLOCKING)
-                        devman_phone_driver = async_connect_me_to_blocking(
-                            PHONE_NS, SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
+                        devman_phone_driver = ipc_connect_me_to_blocking(PHONE_NS,
+                            SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
                 else
-                        devman_phone_driver = async_connect_me_to(PHONE_NS,
+                        devman_phone_driver = ipc_connect_me_to(PHONE_NS,
                             SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
                 
-                fibril_mutex_unlock(&devman_phone_mutex);
                 return devman_phone_driver;
         case DEVMAN_CLIENT:
-                fibril_mutex_lock(&devman_phone_mutex);
-                if (devman_phone_client >= 0) {
-                        fibril_mutex_unlock(&devman_phone_mutex);
+                if (devman_phone_client >= 0)
                         return devman_phone_client;
-                }
                 
                 if (flags & IPC_FLAG_BLOCKING)
-                        devman_phone_client = async_connect_me_to_blocking(
-                            PHONE_NS, SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
+                        devman_phone_client = ipc_connect_me_to_blocking(PHONE_NS,
+                            SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
                 else
-                        devman_phone_client = async_connect_me_to(PHONE_NS,
+                        devman_phone_client = ipc_connect_me_to(PHONE_NS,
                             SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
-                        fibril_mutex_unlock(&devman_phone_mutex);
-                
-                fibril_mutex_unlock(&devman_phone_mutex);
+                
                 return devman_phone_client;
         default:
@@ -242 +230 @@
         
         if (flags & IPC_FLAG_BLOCKING) {
-                phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
+                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_DEVICE, handle);
         } else {
-                phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
+                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_DEVICE, handle);
         }
@@ -257 +245 @@
         
         if (flags & IPC_FLAG_BLOCKING) {
-                phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
+                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
         } else {
-                phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
+                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
         }