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

Timestamp:

2011-08-16T12:37:58Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

16dc887

Parents:

86ffa27f

Message:

Basic category support in location service. Devman adds device services
to categories. Switch over input server device discovery from using
/dev/class to loc categories.

File:

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

uspace/srv/devman/main.c

@@ -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) {
@@ -383 +385 @@
         /* 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'.",
@@ -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;