Changeset ff381a7 in mainline for uspace/srv/loader/main.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/loader/main.c (modified) (3 diffs)

uspace/srv/loader/main.c

@@ -249 +249 @@
                 }
                 async_state_change_finalize(callid, vfs_exch);
-                fd = fd_wait();
+                fd = vfs_fd_wait();
                 assert(fd == (int) filc);
         }
@@ -443 +443 @@
 int main(int argc, char *argv[])
 {
-        /* Set a handler of incomming connections. */
-        async_set_client_connection(ldr_connection);
+        async_set_fallback_port_handler(ldr_connection, NULL);
         
         /* Introduce this task to the NS (give it our task ID). */
@@ -452 +451 @@
                 return rc;
         
-        /* Register at naming service. */
-        rc = service_register(SERVICE_LOAD);
+        /* Create port */
+        port_id_t port;
+        rc = async_create_port(INTERFACE_LOADER, ldr_connection, NULL, &port);
         if (rc != EOK)
                 return rc;
         
+        /* Register at naming service. */
+        rc = service_register(SERVICE_LOADER);
+        if (rc != EOK)
+                return rc;
+        
         async_manager();