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

Timestamp:

2011-08-18T18:45:42Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

1f44b056

Parents:

ee24574 (diff), f55b12b (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 libposix changes.

File:

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

uspace/srv/devman/main.c

@@ -64 +64 @@
 static driver_list_t drivers_list;
 static dev_tree_t device_tree;
-static class_list_t class_list;
 
 /** Register running driver. */
@@ -333 +332 @@
 }
 
-static void loc_register_class_dev(dev_class_info_t *cli)
-{
-        /* Create loc path and name for the service. */
-        char *loc_pathname = NULL;
-
-        asprintf(&loc_pathname, "%s/%s%c%s", LOC_CLASS_NAMESPACE,
-            cli->dev_class->name, LOC_SEPARATOR, cli->dev_name);
-        if (loc_pathname == NULL)
-                return;
-        
-        /*
-         * Register the device with location service and remember its
-         * service ID.
-         */
-        loc_service_register_with_iface(loc_pathname,
-            &cli->service_id, DEVMAN_CONNECT_FROM_LOC);
-        
-        /*
-         * Add device to the hash map of class devices registered with
-         * location service.
-         */
-        class_add_loc_function(&class_list, cli);
-        
-        free(loc_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);
@@ -365 +338 @@
         int rc;
         
-        /* Get class name. */
-        char *class_name;
-        rc = async_data_write_accept((void **) &class_name, true,
+        /* Get category name. */
+        char *cat_name;
+        rc = async_data_write_accept((void **) &cat_name, true,
             0, 0, 0, 0);
         if (rc != EOK) {
@@ -380 +353 @@
         }
         
-        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 with location service. */
-        loc_register_class_dev(class_info);
-        
-        rc = loc_category_get_id(class_name, &cat_id, IPC_FLAG_BLOCKING);
+        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, class_name);
-        }
-        
-        log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.",
-            fun->pathname, class_name, class_info->dev_name);
+                    "`%s'.", fun->pathname, cat_name);
+        }
+        
+        log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
+            fun->pathname, cat_name);
 
         async_answer_0(callid, EOK);
@@ -449 +416 @@
                         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;
                 default:
@@ -483 +450 @@
 }
 
-/** 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) {
-                async_answer_0(iid, ENOENT);
-                return;
-        }
-
-        async_answer_1(iid, EOK, fun->handle);
-}
-
 /** Find device path by its handle. */
 static void devman_get_device_path_by_handle(ipc_callid_t iid,
@@ -554 +487 @@
 }
 
+/** 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. */
@@ -572 +519 @@
                         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:
@@ -678 +625 @@
 
         fun = find_loc_tree_function(&device_tree, service_id);
-        if (fun == NULL)
-                fun = find_loc_class_function(&class_list, 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;
@@ -687 +634 @@
         
         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);
@@ -753 +695 @@
         }
 
-        init_class_list(&class_list);
-        
         /*
          * !!! devman_connection ... as the device manager is not a real loc