Changes in uspace/srv/devman/main.c [3f57fb7:655cc56] in mainline

File:

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

uspace/srv/devman/main.c

@@ -245 +245 @@
         
         fibril_rwlock_write_lock(&device_tree.rwlock);
-        
+
         if (fun->state == FUN_ON_LINE) {
                 fibril_rwlock_write_unlock(&device_tree.rwlock);
@@ -259 +259 @@
                         return ENOMEM;
                 }
-                
+
                 insert_dev_node(&device_tree, dev, fun);
                 dev_add_ref(dev);
@@ -272 +272 @@
                 /* Give one reference over to assign_driver_fibril(). */
                 dev_add_ref(dev);
-                
                 /*
                  * Try to find a suitable driver and assign it to the device.  We do
@@ -289 +288 @@
                 }
                 fibril_add_ready(assign_fibril);
-        } else
+        } else {
                 loc_register_tree_function(fun, &device_tree);
+        }
         
         fibril_rwlock_write_unlock(&device_tree.rwlock);
@@ -855 +855 @@
 }
 
-/** Get function driver name. */
-static void devman_fun_get_driver_name(ipc_callid_t iid, ipc_call_t *icall)
-{
-        devman_handle_t handle = IPC_GET_ARG1(*icall);
-
-        fun_node_t *fun = find_fun_node(&device_tree, handle);
-        if (fun == NULL) {
-                async_answer_0(iid, ENOMEM);
-                return;
-        }
-
-        ipc_callid_t data_callid;
-        size_t data_len;
-        if (!async_data_read_receive(&data_callid, &data_len)) {
-                async_answer_0(iid, EINVAL);
-                fun_del_ref(fun);
-                return;
-        }
-
-        void *buffer = malloc(data_len);
-        if (buffer == NULL) {
-                async_answer_0(data_callid, ENOMEM);
-                async_answer_0(iid, ENOMEM);
-                fun_del_ref(fun);
-                return;
-        }
-
-        fibril_rwlock_read_lock(&device_tree.rwlock);
-
-        /* Check function state */
-        if (fun->state == FUN_REMOVED) {
-                fibril_rwlock_read_unlock(&device_tree.rwlock);
-                free(buffer);
-
-                async_answer_0(data_callid, ENOENT);
-                async_answer_0(iid, ENOENT);
-                fun_del_ref(fun);
-                return;
-        }
-
-        /* Check whether function has a driver */
-        if (fun->child == NULL || fun->child->drv == NULL) {
-                fibril_rwlock_read_unlock(&device_tree.rwlock);
-                free(buffer);
-
-                async_answer_0(data_callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                fun_del_ref(fun);
-                return;
-        }
-
-        size_t sent_length = str_size(fun->child->drv->name);
-        if (sent_length > data_len) {
-                sent_length = data_len;
-        }
-
-        async_data_read_finalize(data_callid, fun->child->drv->name,
-            sent_length);
-        async_answer_0(iid, EOK);
-
-        fibril_rwlock_read_unlock(&device_tree.rwlock);
-        fun_del_ref(fun);
-        free(buffer);
-}
 
 /** Get device path. */
@@ -1147 +1083 @@
                         devman_fun_get_name(callid, &call);
                         break;
-                case DEVMAN_FUN_GET_DRIVER_NAME:
-                        devman_fun_get_driver_name(callid, &call);
-                        break;
                 case DEVMAN_FUN_GET_PATH:
                         devman_fun_get_path(callid, &call);
@@ -1216 +1149 @@
                 if (dev->pfun->dev != NULL)
                         driver = dev->pfun->dev->drv;
-                
                 fwd_h = dev->pfun->handle;
         } else if (dev->state == DEVICE_USABLE) {
@@ -1222 +1154 @@
                 driver = dev->drv;
                 assert(driver != NULL);
-                
+
                 fwd_h = handle;
         }
@@ -1249 +1181 @@
 
         if (fun != NULL) {
-                log_msg(LVL_DEBUG,
+                log_msg(LVL_DEBUG, 
                     "Forwarding request for `%s' function to driver `%s'.",
                     fun->pathname, driver->name);
         } else {
-                log_msg(LVL_DEBUG,
+                log_msg(LVL_DEBUG, 
                     "Forwarding request for `%s' device to driver `%s'.",
                     dev->pfun->pathname, driver->name);
@@ -1261 +1193 @@
         async_forward_fast(iid, exch, method, fwd_h, 0, IPC_FF_NONE);
         async_exchange_end(exch);
-        
+
 cleanup:
         if (dev != NULL)
                 dev_del_ref(dev);
-        
         if (fun != NULL)
                 fun_del_ref(fun);
@@ -1368 +1299 @@
                 return false;
         }
-        
+
         log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized.");
-        
+
         /* Create root device node. */
         if (!init_device_tree(&device_tree, &drivers_list)) {
@@ -1376 +1307 @@
                 return false;
         }
-        
+
         /*
-         * 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.
+         * !!! 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.
          */
-        loc_server_register(NAME);
+        loc_server_register(NAME, devman_connection);
         
         return true;
@@ -1391 +1321 @@
 int main(int argc, char *argv[])
 {
-        printf("%s: HelenOS Device Manager\n", NAME);
-        
-        int rc = log_init(NAME, LVL_WARN);
-        if (rc != EOK) {
-                printf("%s: Error initializing logging subsystem.\n", NAME);
-                return rc;
+        printf(NAME ": HelenOS Device Manager\n");
+
+        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;
         }
         
@@ -1403 +1337 @@
         async_set_client_data_destructor(devman_client_data_destroy);
         async_set_client_connection(devman_connection);
-        
-        if (!devman_init()) {
-                log_msg(LVL_ERROR, "Error while initializing service.");
+
+        /* Register device manager at naming service. */
+        if (service_register(SERVICE_DEVMAN) != EOK) {
+                log_msg(LVL_ERROR, "Failed registering as a service.");
                 return -1;
         }
-        
-        /* Register device manager at naming service. */
-        rc = service_register(SERVICE_DEVMAN);
-        if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed registering as a service.");
-                return rc;
-        }
-        
-        printf("%s: Accepting connections.\n", NAME);
+
+        printf(NAME ": Accepting connections.\n");
         task_retval(0);
         async_manager();
-        
+
         /* Never reached. */
         return 0;