Changeset 97c7682 in mainline for uspace/srv/devman/main.c

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/devman/main.c (modified) (15 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
@@ -288 +289 @@
                 }
                 fibril_add_ready(assign_fibril);
-        } else {
+        } else
                 loc_register_tree_function(fun, &device_tree);
-        }
         
         fibril_rwlock_write_unlock(&device_tree.rwlock);
@@ -419 +419 @@
         
         /* Check that function with same name is not there already. */
-        if (find_fun_node_in_device(tree, pdev, fun_name) != NULL) {
+        fun_node_t *tfun = find_fun_node_in_device(tree, pdev, fun_name);
+        if (tfun) {
+                fun_del_ref(tfun);      /* drop the new unwanted reference */
                 fibril_rwlock_write_unlock(&tree->rwlock);
                 dev_del_ref(pdev);
@@ -855 +857 @@
 }
 
+/** 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. */
@@ -1083 +1149 @@
                         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);
@@ -1149 +1218 @@
                 if (dev->pfun->dev != NULL)
                         driver = dev->pfun->dev->drv;
+                
                 fwd_h = dev->pfun->handle;
         } else if (dev->state == DEVICE_USABLE) {
@@ -1154 +1224 @@
                 driver = dev->drv;
                 assert(driver != NULL);
-
+                
                 fwd_h = handle;
         }
@@ -1181 +1251 @@
 
         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);
@@ -1193 +1263 @@
         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);
@@ -1299 +1370 @@
                 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)) {
@@ -1307 +1378 @@
                 return false;
         }
-
+        
         /*
          * Caution: As the device manager is not a real loc
@@ -1322 +1393 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS Device Manager\n");
-
-        if (log_init(NAME, LVL_WARN) != EOK) {
-                printf(NAME ": Error initializing logging subsystem.\n");
-                return -1;
+        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;
         }
         
@@ -1333 +1405 @@
         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.");
                 return -1;
         }
-
+        
         /* Register device manager at naming service. */
-        if (service_register(SERVICE_DEVMAN) != EOK) {
+        rc = service_register(SERVICE_DEVMAN);
+        if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering as a service.");
-                return -1;
-        }
-
-        printf(NAME ": Accepting connections.\n");
+                return rc;
+        }
+        
+        printf("%s: Accepting connections.\n", NAME);
         task_retval(0);
         async_manager();
-
+        
         /* Never reached. */
         return 0;