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

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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/devman/main.c (modified) (4 diffs)

uspace/srv/devman/main.c

@@ -634 +634 @@
                                 fibril_rwlock_read_unlock(&device_tree.rwlock);
                                 dev_del_ref(dev);
+                                if (gone_rc == EOK)
+                                        gone_rc = ENOTSUP;
+                                async_answer_0(callid, gone_rc);
                                 return;
                         }
@@ -1306 +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;
@@ -1322 +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;
         }
@@ -1335 +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) {