Changeset 1d2a1a9 in mainline for uspace/srv/devman/main.c

Timestamp:

2011-08-17T20:44:32Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

0cc32f2

Parents:

bb285b4 (diff), c53a705 (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) (10 diffs)

uspace/srv/devman/main.c

@@ -56 +56 @@
 #include <ipc/driver.h>
 #include <thread.h>
-#include <devmap.h>
+#include <loc.h>
 
 #include "devman.h"
@@ -326 +326 @@
                 }
         } else {
-                devmap_register_tree_function(fun, tree);
+                loc_register_tree_function(fun, tree);
         }
         
@@ -333 +333 @@
 }
 
-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)
+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 by the device mapper and remember its devmap
-         * handle.
+         * Register the device with location service and remember its
+         * service ID.
          */
-        devmap_device_register_with_iface(devmap_pathname,
-            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        loc_service_register_with_iface(loc_pathname,
+            &cli->service_id, DEVMAN_CONNECT_FROM_LOC);
         
         /*
-         * Add device to the hash map of class devices registered by device
-         * mapper.
+         * Add device to the hash map of class devices registered with
+         * location service.
          */
-        class_add_devmap_function(&class_list, cli);
-        
-        free(devmap_pathname);
+        class_add_loc_function(&class_list, cli);
+        
+        free(loc_pathname);
 }
 
@@ -362 +362 @@
 {
         devman_handle_t handle = IPC_GET_ARG1(*call);
+        category_id_t cat_id;
+        int rc;
         
         /* Get class name. */
         char *class_name;
-        int rc = async_data_write_accept((void **) &class_name, true,
+        rc = async_data_write_accept((void **) &class_name, true,
             0, 0, 0, 0);
         if (rc != EOK) {
@@ -381 +383 @@
         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);
+        /* 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);
+        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'.",
@@ -659 +669 @@
 }
 
-/** 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);
+        fun = find_loc_tree_function(&device_tree, service_id);
         if (fun == NULL)
-                fun = find_devmap_class_function(&class_list, devmap_handle);
+                fun = find_loc_class_function(&class_list, service_id);
         
         if (fun == NULL || fun->dev->drv == NULL) {
@@ -689 +699 @@
         
         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 +718 @@
                 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:
@@ -746 +756 @@
         
         /*
-         * !!! 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 +770 @@
         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;