Changeset fc8c2b6 in mainline

Timestamp:

2011-03-30T14:26:13Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e72fb34

Parents:

3fddb55

Message:

devman can tell device handle by its class path

Location:

uspace

Files:

• lib/c/include/ipc/devman.h (modified) (1 diff)
• srv/devman/devman.c (modified) (2 diffs)
• srv/devman/devman.h (modified) (2 diffs)
• srv/devman/main.c (modified) (2 diffs)

uspace/lib/c/include/ipc/devman.h

@@ -148 +148 @@
 
 typedef enum {
-        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD
+        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
+        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS
 } client_to_devman_t;
 

uspace/srv/devman/devman.c

@@ -1194 +1194 @@
 }
 
+/** Find function node by its class name and index. */
+fun_node_t *find_fun_node_by_class(class_list_t *class_list,
+    const char *class_name, const char *dev_name)
+{
+        assert(class_list != NULL);
+        assert(class_name != NULL);
+        assert(dev_name != NULL);
+
+        fibril_rwlock_read_lock(&class_list->rwlock);
+
+        dev_class_t *cl = find_dev_class_no_lock(class_list, class_name);
+        if (cl == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        dev_class_info_t *dev = find_dev_in_class(cl, dev_name);
+        if (dev == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        fun_node_t *fun = dev->fun;
+
+        fibril_rwlock_read_unlock(&class_list->rwlock);
+
+        return fun;
+}
+
+
 /** Find child function node with a specified name.
  *
@@ -1366 +1396 @@
 }
 
+dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name)
+{
+        assert(dev_class != NULL);
+        assert(dev_name != NULL);
+
+        link_t *link;
+        for (link = dev_class->devices.next;
+            link != &dev_class->devices;
+            link = link->next) {
+                dev_class_info_t *dev = list_get_instance(link,
+                    dev_class_info_t, link);
+
+                if (str_cmp(dev->dev_name, dev_name) == 0) {
+                        return dev;
+                }
+        }
+
+        return NULL;
+}
+
 void init_class_list(class_list_t *class_list)
 {

uspace/srv/devman/devman.h

@@ -339 +339 @@
 extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
 extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *);
+extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *);
 
 /* Device tree */
@@ -360 +361 @@
 extern dev_class_t *get_dev_class(class_list_t *, char *);
 extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *);
+extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *);
 extern void add_dev_class_no_lock(class_list_t *, dev_class_t *);
 

uspace/srv/devman/main.c

@@ -448 +448 @@
 }
 
+/** 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);
+}
+
 
 /** Function for handling connections from a client to the device manager. */
@@ -466 +500 @@
                 case DEVMAN_DEVICE_GET_HANDLE:
                         devman_function_get_handle(callid, &call);
+                        break;
+                case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
+                        devman_function_get_handle_by_class(callid, &call);
                         break;
                 default: