Changeset f302586 in mainline for uspace/srv/devman/main.c

Timestamp:

2012-01-14T23:31:26Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3ea725e, 8989f2a7, a1347a7

Parents:

6d8455d

Message:

make sure the client_connection is explicitly set at most once
it is not a mutable variable, it is a weak symbol

File:

• uspace/srv/devman/main.c (modified) (3 diffs)

uspace/srv/devman/main.c

@@ -1309 +1309 @@
 
         /*
-         * !!! devman_connection ... as the device manager is not a real loc
-         * driver (it uses a completely different ipc protocol than an ordinary
-         * loc driver) forwarding a connection from client to the devman by
-         * location service would not work.
+         * Caution: As the device manager is not a real loc
+         * driver (it uses a completely different IPC protocol
+         * than an ordinary loc driver), forwarding a connection
+         * from client to the devman by location service will
+         * not work.
          */
-        loc_server_register(NAME, devman_connection);
+        loc_server_register(NAME);
         
         return true;
@@ -1325 +1326 @@
         if (log_init(NAME, LVL_WARN) != EOK) {
                 printf(NAME ": Error initializing logging subsystem.\n");
-                return -1;
-        }
-
-        if (!devman_init()) {
-                log_msg(LVL_ERROR, "Error while initializing service.");
                 return -1;
         }
@@ -1338 +1334 @@
         async_set_client_connection(devman_connection);
 
+        if (!devman_init()) {
+                log_msg(LVL_ERROR, "Error while initializing service.");
+                return -1;
+        }
+
         /* Register device manager at naming service. */
         if (service_register(SERVICE_DEVMAN) != EOK) {