Changes in uspace/lib/c/generic/devman.c [0b5a4131:64d2b10] in mainline

File:

• uspace/lib/c/generic/devman.c (modified) (13 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>
 #include <devman.h>
 #include <async.h>
+#include <fibril_synch.h>
 #include <errno.h>
 #include <malloc.h>
@@ -50 +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:
-                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:
@@ -95 +106 @@
         aid_t req = async_send_2(phone, DEVMAN_DRIVER_REGISTER, 0, 0, &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -104 +115 @@
         async_set_client_connection(conn);
         
-        ipcarg_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);
         
@@ -116 +126 @@
 {
         ipc_call_t answer;
-        async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
+        aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
         int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id));
-        return retval;  
+        async_wait_for(req, NULL);
+        return retval;
 }
 
@@ -154 +165 @@
         aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer);
 
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -191 +202 @@
         aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
+        sysarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -209 +220 @@
         case DEVMAN_DRIVER:
                 if (devman_phone_driver >= 0) {
-                        ipc_hangup(devman_phone_driver);
+                        async_hangup(devman_phone_driver);
                         devman_phone_driver = -1;
                 }
@@ -215 +226 @@
         case DEVMAN_CLIENT:
                 if (devman_phone_client >= 0) {
-                        ipc_hangup(devman_phone_client);
+                        async_hangup(devman_phone_client);
                         devman_phone_client = -1;
                 }
@@ -229 +240 @@
         
         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);
         }
@@ -244 +255 @@
         
         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);
         }
@@ -267 +278 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
+        sysarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
         if (retval != EOK) {
                 async_wait_for(req, NULL);