Changeset 903bac0a in mainline for uspace/srv/devman/main.c

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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) (16 diffs)

uspace/srv/devman/main.c

@@ -56 +56 @@
 #include <ipc/driver.h>
 #include <thread.h>
-#include <devmap.h>
+#include <loc.h>
 
 #include "devman.h"
@@ -64 +64 @@
 static driver_list_t drivers_list;
 static dev_tree_t device_tree;
-static class_list_t class_list;
 
 /** Register running driver. */
@@ -279 +278 @@
                 return;
         }
-
+        
         fun_node_t *fun = create_fun_node();
+        fun->ftype = ftype;
+        
         if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
@@ -326 +327 @@
                 }
         } else {
-                devmap_register_tree_function(fun, tree);
+                loc_register_tree_function(fun, tree);
         }
         
@@ -333 +334 @@
 }
 
-static void devmap_register_class_dev(dev_class_info_t *cli)
-{
-        /* Create devmap path and name for the device. */
-        char *devmap_pathname = NULL;
-
-        asprintf(&devmap_pathname, "%s/%s%c%s", DEVMAP_CLASS_NAMESPACE,
-            cli->dev_class->name, DEVMAP_SEPARATOR, cli->dev_name);
-        if (devmap_pathname == NULL)
-                return;
-        
-        /*
-         * Register the device by the device mapper and remember its devmap
-         * handle.
-         */
-        devmap_device_register_with_iface(devmap_pathname,
-            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
-        
-        /*
-         * Add device to the hash map of class devices registered by device
-         * mapper.
-         */
-        class_add_devmap_function(&class_list, cli);
-        
-        free(devmap_pathname);
-}
-
-static void devman_add_function_to_class(ipc_callid_t callid, ipc_call_t *call)
+static void devman_add_function_to_cat(ipc_callid_t callid, ipc_call_t *call)
 {
         devman_handle_t handle = IPC_GET_ARG1(*call);
-        
-        /* Get class name. */
-        char *class_name;
-        int rc = async_data_write_accept((void **) &class_name, true,
+        category_id_t cat_id;
+        int rc;
+        
+        /* Get category name. */
+        char *cat_name;
+        rc = async_data_write_accept((void **) &cat_name, true,
             0, 0, 0, 0);
         if (rc != EOK) {
@@ -378 +355 @@
         }
         
-        dev_class_t *cl = get_dev_class(&class_list, class_name);
-        dev_class_info_t *class_info = add_function_to_class(fun, cl, NULL);
-        
-        /* Register the device's class alias by devmapper. */
-        devmap_register_class_dev(class_info);
-        
-        log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.",
-            fun->pathname, class_name, class_info->dev_name);
-
+        rc = loc_category_get_id(cat_name, &cat_id, IPC_FLAG_BLOCKING);
+        if (rc == EOK) {
+                loc_service_add_to_cat(fun->service_id, cat_id);
+        } else {
+                log_msg(LVL_ERROR, "Failed adding function `%s' to category "
+                    "`%s'.", fun->pathname, cat_name);
+        }
+        
+        log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
+            fun->pathname, cat_name);
+
+        async_answer_0(callid, EOK);
+}
+
+/** Remove function. */
+static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call)
+{
+        devman_handle_t fun_handle = IPC_GET_ARG1(*call);
+        dev_tree_t *tree = &device_tree;
+        int rc;
+        
+        fibril_rwlock_write_lock(&tree->rwlock);
+        
+        fun_node_t *fun = find_fun_node_no_lock(&device_tree, fun_handle);
+        if (fun == NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        log_msg(LVL_DEBUG, "devman_remove_function(fun='%s')", fun->pathname);
+        
+        if (fun->ftype == fun_inner) {
+                /* Handle possible descendants */
+                /* TODO */
+                log_msg(LVL_WARN, "devman_remove_function(): not handling "
+                    "descendants\n");
+        } else {
+                /* Unregister from location service */
+                rc = loc_service_unregister(fun->service_id);
+                if (rc != EOK) {
+                        log_msg(LVL_ERROR, "Failed unregistering tree service.");
+                        fibril_rwlock_write_unlock(&tree->rwlock);
+                        async_answer_0(callid, EIO);
+                        return;
+                }
+        }
+        
+        remove_fun_node(&device_tree, fun);
+        fibril_rwlock_write_unlock(&tree->rwlock);
+        delete_fun_node(fun);
+        
+        log_msg(LVL_DEBUG, "devman_remove_function() succeeded.");
         async_answer_0(callid, EOK);
 }
@@ -439 +460 @@
                         devman_add_function(callid, &call);
                         break;
-                case DEVMAN_ADD_DEVICE_TO_CLASS:
-                        devman_add_function_to_class(callid, &call);
+                case DEVMAN_ADD_DEVICE_TO_CATEGORY:
+                        devman_add_function_to_cat(callid, &call);
+                        break;
+                case DEVMAN_REMOVE_FUNCTION:
+                        devman_remove_function(callid, &call);
                         break;
                 default:
@@ -464 +488 @@
         
         free(pathname);
-
-        if (fun == NULL) {
-                async_answer_0(iid, ENOENT);
-                return;
-        }
-
-        async_answer_1(iid, EOK, fun->handle);
-}
-
-/** Find handle for the device instance identified by device class name. */
-static void devman_function_get_handle_by_class(ipc_callid_t iid,
-    ipc_call_t *icall)
-{
-        char *classname;
-        char *devname;
-
-        int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-        rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0);
-        if (rc != EOK) {
-                free(classname);
-                async_answer_0(iid, rc);
-                return;
-        }
-
-
-        fun_node_t *fun = find_fun_node_by_class(&class_list,
-            classname, devname);
-
-        free(classname);
-        free(devname);
 
         if (fun == NULL) {
@@ -544 +534 @@
 }
 
+/** Find handle for the function instance identified by its service ID. */
+static void devman_fun_sid_to_handle(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fun_node_t *fun;
+
+        fun = find_loc_tree_function(&device_tree, IPC_GET_ARG1(*icall));
+        
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        async_answer_1(iid, EOK, fun->handle);
+}
 
 /** Function for handling connections from a client to the device manager. */
@@ -562 +566 @@
                         devman_function_get_handle(callid, &call);
                         break;
-                case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
-                        devman_function_get_handle_by_class(callid, &call);
-                        break;
                 case DEVMAN_DEVICE_GET_DEVICE_PATH:
                         devman_get_device_path_by_handle(callid, &call);
+                        break;
+                case DEVMAN_FUN_SID_TO_HANDLE:
+                        devman_fun_sid_to_handle(callid, &call);
                         break;
                 default:
@@ -659 +663 @@
 }
 
-/** Function for handling connections from a client forwarded by the device
- * mapper to the device manager. */
-static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
-{
-        devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
+/** Function for handling connections from a client forwarded by the location
+ * service to the device manager. */
+static void devman_connection_loc(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t service_id = IPC_GET_ARG2(*icall);
         fun_node_t *fun;
         dev_node_t *dev;
 
-        fun = find_devmap_tree_function(&device_tree, devmap_handle);
-        if (fun == NULL)
-                fun = find_devmap_class_function(&class_list, devmap_handle);
+        fun = find_loc_tree_function(&device_tree, service_id);
         
         if (fun == NULL || fun->dev->drv == NULL) {
+                log_msg(LVL_WARN, "devman_connection_loc(): function "
+                    "not found.\n");
                 async_answer_0(iid, ENOENT);
                 return;
@@ -677 +681 @@
         
         dev = fun->dev;
-        
-        if ((dev->state != DEVICE_USABLE) || (!dev->drv->sess)) {
-                async_answer_0(iid, EINVAL);
-                return;
-        }
         
         async_exch_t *exch = async_exchange_begin(dev->drv->sess);
@@ -689 +688 @@
         
         log_msg(LVL_DEBUG,
-            "Forwarding devmapper request for `%s' function to driver `%s'.",
+            "Forwarding loc service request for `%s' function to driver `%s'.",
             fun->pathname, dev->drv->name);
 }
@@ -708 +707 @@
                 devman_forward(iid, icall, false);
                 break;
-        case DEVMAN_CONNECT_FROM_DEVMAP:
-                /* Someone connected through devmap node. */
-                devman_connection_devmapper(iid, icall);
+        case DEVMAN_CONNECT_FROM_LOC:
+                /* Someone connected through loc node. */
+                devman_connection_loc(iid, icall);
                 break;
         case DEVMAN_CONNECT_TO_PARENTS_DEVICE:
@@ -743 +742 @@
         }
 
-        init_class_list(&class_list);
-        
         /*
-         * !!! devman_connection ... as the device manager is not a real devmap
+         * !!! devman_connection ... as the device manager is not a real loc
          * driver (it uses a completely different ipc protocol than an ordinary
-         * devmap driver) forwarding a connection from client to the devman by
-         * devmapper would not work.
+         * loc driver) forwarding a connection from client to the devman by
+         * location service would not work.
          */
-        devmap_driver_register(NAME, devman_connection);
+        loc_server_register(NAME, devman_connection);
         
         return true;
@@ -760 +757 @@
         printf(NAME ": HelenOS Device Manager\n");
 
-        if (log_init(NAME, LVL_ERROR) != EOK) {
+        if (log_init(NAME, LVL_WARN) != EOK) {
                 printf(NAME ": Error initializing logging subsystem.\n");
                 return -1;