Changeset bc9da2a in mainline for uspace/srv/net/modules.c

Timestamp:

2010-02-18T16:42:00Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

228666c

Parents:

f74392f

Message:

Avoid duplicating wrappers for low level IPC in connect_to_service_timeout().
Connect to services in blocking mode.

File:

• uspace/srv/net/modules.c (modified) (1 diff)

uspace/srv/net/modules.c

@@ -55 +55 @@
 
 int connect_to_service_timeout( services_t need, suseconds_t timeout ){
-        ipcarg_t phone;
-        int res;
+        if (timeout <= 0)
+                return async_connect_me_to_blocking( PHONE_NS, need, 0, 0);
+        
+        while( true ){
+                int phone;
 
-        while( true ){
-                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, & phone );
-                if( res >= 0 ){
+                phone = async_connect_me_to( PHONE_NS, need, 0, 0);
+                if( (phone >= 0) || (phone != ENOENT) )
                         return phone;
-                }
-                if( timeout > 0 ){
-                        timeout -= MODULE_WAIT_TIME;
-                        if( timeout <= 0 ) return ETIMEOUT;
-                }
+        
+                timeout -= MODULE_WAIT_TIME;
+                if( timeout <= 0 ) return ETIMEOUT;
+
                 usleep( MODULE_WAIT_TIME );
         }