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

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• uspace/srv/net/modules.c (modified) (2 diffs)

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 );
         }
@@ -84 +85 @@
         if( phone >= 0 ){
                 if( ERROR_OCCURRED( ipc_connect_to_me( phone, arg1, arg2, arg3, & phonehash ))){
-                        async_msg_0( phone, IPC_M_PHONE_HUNGUP );
+                        ipc_hangup( phone );
                         return ERROR_CODE;
                 }