Changeset 80cd7cd in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2011-01-13T20:58:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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/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>
@@ -50 +51 @@
 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:
-                if (devman_phone_driver >= 0)
+                fibril_mutex_lock(&devman_phone_mutex);
+                if (devman_phone_driver >= 0) {
+                        fibril_mutex_unlock(&devman_phone_mutex);
                         return devman_phone_driver;
+                }
                 
                 if (flags & IPC_FLAG_BLOCKING)
-                        devman_phone_driver = ipc_connect_me_to_blocking(PHONE_NS,
+                        devman_phone_driver = async_connect_me_to_blocking(
+                            PHONE_NS, SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
+                else
+                        devman_phone_driver = async_connect_me_to(PHONE_NS,
                             SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
-                else
-                        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:
-                if (devman_phone_client >= 0)
+                fibril_mutex_lock(&devman_phone_mutex);
+                if (devman_phone_client >= 0) {
+                        fibril_mutex_unlock(&devman_phone_mutex);
                         return devman_phone_client;
-                
-                if (flags & IPC_FLAG_BLOCKING)
-                        devman_phone_client = ipc_connect_me_to_blocking(PHONE_NS,
+                }
+                
+                if (flags & IPC_FLAG_BLOCKING) {
+                        devman_phone_client = async_connect_me_to_blocking(
+                            PHONE_NS, SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
+                } else {
+                        devman_phone_client = async_connect_me_to(PHONE_NS,
                             SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
-                else
-                        devman_phone_client = ipc_connect_me_to(PHONE_NS,
-                            SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
-                
+                }
+                
+                fibril_mutex_unlock(&devman_phone_mutex);
                 return devman_phone_client;
         default:
@@ -230 +242 @@
         
         if (flags & IPC_FLAG_BLOCKING) {
-                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
+                phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_DEVICE, handle);
         } else {
-                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
+                phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_DEVICE, handle);
         }
@@ -245 +257 @@
         
         if (flags & IPC_FLAG_BLOCKING) {
-                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
+                phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
         } else {
-                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
+                phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
                     DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
         }