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

Timestamp:

2010-02-17T19:19:08Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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/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 ){
-        int     phone;
-        int     res;
+        ipcarg_t phone;
+        int res;
 
         while( true ){
-                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, ( ipcarg_t * ) & phone );
-                if(( res >= 0 ) && ( phone >= 0 )){
+                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, & phone );
+                if( res >= 0 ){
                         return phone;
                 }