Changes in uspace/srv/devman/main.c [a35b458:5a6cc679] in mainline

File:

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

uspace/srv/devman/main.c

@@ -71 +71 @@
         devman_handle_t handle = IPC_GET_ARG2(*icall);
         dev_node_t *dev = NULL;
-
+        
         fun_node_t *fun = find_fun_node(&device_tree, handle);
         if (fun == NULL) {
@@ -77 +77 @@
         } else {
                 fibril_rwlock_read_lock(&device_tree.rwlock);
-
+                
                 dev = fun->dev;
                 if (dev != NULL)
                         dev_add_ref(dev);
-
+                
                 fibril_rwlock_read_unlock(&device_tree.rwlock);
         }
-
+        
         /*
          * For a valid function to connect to we need a device. The root
@@ -97 +97 @@
                 goto cleanup;
         }
-
+        
         if (fun == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, NAME ": devman_forward error - cannot "
@@ -105 +105 @@
                 goto cleanup;
         }
-
+        
         fibril_rwlock_read_lock(&device_tree.rwlock);
-
+        
         /* Connect to the specified function */
         driver_t *driver = dev->drv;
-
+        
         fibril_rwlock_read_unlock(&device_tree.rwlock);
-
+        
         if (driver == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "IPC forwarding refused - " \
@@ -119 +119 @@
                 goto cleanup;
         }
-
+        
         if (!driver->sess) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -126 +126 @@
                 goto cleanup;
         }
-
+        
         if (fun != NULL) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG,
@@ -136 +136 @@
                     dev->pfun->pathname, driver->name);
         }
-
+        
         async_exch_t *exch = async_exchange_begin(driver->sess);
         async_forward_fast(iid, exch, INTERFACE_DDF_CLIENT, handle, 0, IPC_FF_NONE);
         async_exchange_end(exch);
-
+        
 cleanup:
         if (dev != NULL)
                 dev_del_ref(dev);
-
+        
         if (fun != NULL)
                 fun_del_ref(fun);
@@ -154 +154 @@
         devman_handle_t handle = IPC_GET_ARG2(*icall);
         dev_node_t *dev = NULL;
-
+        
         fun_node_t *fun = find_fun_node(&device_tree, handle);
         if (fun == NULL) {
@@ -160 +160 @@
         } else {
                 fibril_rwlock_read_lock(&device_tree.rwlock);
-
+                
                 dev = fun->dev;
                 if (dev != NULL)
                         dev_add_ref(dev);
-
+                
                 fibril_rwlock_read_unlock(&device_tree.rwlock);
         }
-
+        
         /*
          * For a valid function to connect to we need a device. The root
@@ -180 +180 @@
                 goto cleanup;
         }
-
+        
         driver_t *driver = NULL;
-
+        
         fibril_rwlock_read_lock(&device_tree.rwlock);
-
+        
         /* Connect to parent function of a device (or device function). */
         if (dev->pfun->dev != NULL)
                 driver = dev->pfun->dev->drv;
-
+        
         devman_handle_t fun_handle = dev->pfun->handle;
-
+        
         fibril_rwlock_read_unlock(&device_tree.rwlock);
-
+        
         if (driver == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "IPC forwarding refused - " \
@@ -199 +199 @@
                 goto cleanup;
         }
-
+        
         if (!driver->sess) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -206 +206 @@
                 goto cleanup;
         }
-
+        
         if (fun != NULL) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG,
@@ -216 +216 @@
                     dev->pfun->pathname, driver->name);
         }
-
+        
         async_exch_t *exch = async_exchange_begin(driver->sess);
         async_forward_fast(iid, exch, INTERFACE_DDF_DRIVER, fun_handle, 0, IPC_FF_NONE);
         async_exchange_end(exch);
-
+        
 cleanup:
         if (dev != NULL)
                 dev_del_ref(dev);
-
+        
         if (fun != NULL)
                 fun_del_ref(fun);
@@ -233 +233 @@
         iface_t iface = IPC_GET_ARG1(*icall);
         service_id_t service_id = IPC_GET_ARG2(*icall);
-
+        
         fun_node_t *fun = find_loc_tree_function(&device_tree, service_id);
-
+        
         fibril_rwlock_read_lock(&device_tree.rwlock);
-
+        
         if ((fun == NULL) || (fun->dev == NULL) || (fun->dev->drv == NULL)) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "devman_forward(): function "
@@ -245 +245 @@
                 return;
         }
-
+        
         dev_node_t *dev = fun->dev;
         driver_t *driver = dev->drv;
         devman_handle_t handle = fun->handle;
-
+        
         fibril_rwlock_read_unlock(&device_tree.rwlock);
-
+        
         async_exch_t *exch = async_exchange_begin(driver->sess);
         async_forward_fast(iid, exch, iface, handle, 0, IPC_FF_NONE);
         async_exchange_end(exch);
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG,
             "Forwarding service request for `%s' function to driver `%s'.",
             fun->pathname, driver->name);
-
+        
         fun_del_ref(fun);
 }
@@ -266 +266 @@
 {
         client_t *client;
-
+        
         client = calloc(1, sizeof(client_t));
         if (client == NULL)
                 return NULL;
-
+        
         fibril_mutex_initialize(&client->mutex);
         return client;
@@ -284 +284 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_init - looking for available drivers.");
-
+        
         /* Initialize list of available drivers. */
         init_driver_list(&drivers_list);
@@ -292 +292 @@
                 return false;
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_init - list of drivers has been initialized.");
-
+        
         /* Create root device node. */
         if (!init_device_tree(&device_tree, &drivers_list)) {
@@ -300 +300 @@
                 return false;
         }
-
+        
         /*
          * Caution: As the device manager is not a real loc
@@ -309 +309 @@
          */
         loc_server_register(NAME);
-
+        
         return true;
 }
@@ -316 +316 @@
 {
         printf("%s: HelenOS Device Manager\n", NAME);
-
+        
         errno_t rc = log_init(NAME);
         if (rc != EOK) {
@@ -322 +322 @@
                 return rc;
         }
-
+        
         /* Set handlers for incoming connections. */
         async_set_client_data_constructor(devman_client_data_create);
         async_set_client_data_destructor(devman_client_data_destroy);
-
+        
         port_id_t port;
         rc = async_create_port(INTERFACE_DDF_DRIVER,
@@ -334 +334 @@
                 return rc;
         }
-
+        
         rc = async_create_port(INTERFACE_DDF_CLIENT,
             devman_connection_client, NULL, &port);
@@ -341 +341 @@
                 return rc;
         }
-
+        
         rc = async_create_port(INTERFACE_DEVMAN_DEVICE,
             devman_connection_device, NULL, &port);
@@ -348 +348 @@
                 return rc;
         }
-
+        
         rc = async_create_port(INTERFACE_DEVMAN_PARENT,
             devman_connection_parent, NULL, &port);
@@ -355 +355 @@
                 return rc;
         }
-
+        
         async_set_fallback_port_handler(devman_forward, NULL);
-
+        
         if (!devman_init()) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error while initializing service.");
                 return -1;
         }
-
+        
         /* Register device manager at naming service. */
         rc = service_register(SERVICE_DEVMAN);
@@ -369 +369 @@
                 return rc;
         }
-
+        
         printf("%s: Accepting connections.\n", NAME);
         task_retval(0);
         async_manager();
-
+        
         /* Never reached. */
         return 0;