Changeset 0876062 in mainline

Timestamp:

2011-03-30T13:19:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3fddb55

Parents:

4265fd4

Message:

devman refuse to register same function twice

Location:

uspace/srv/devman

Files:

• devman.c (modified) (2 diffs)
• devman.h (modified) (1 diff)
• main.c (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -1165 +1165 @@
 }
 
+/** Find function with a specified name belonging to given device.
+ *
+ * Device tree rwlock should be held at least for reading.
+ *
+ * @param dev Device the function belongs to.
+ * @param name Function name (not path).
+ * @return Function node.
+ * @retval NULL No function with given name.
+ */
+fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name)
+{
+        assert(dev != NULL);
+        assert(name != NULL);
+
+        fun_node_t *fun;
+        link_t *link;
+
+        for (link = dev->functions.next;
+            link != &dev->functions;
+            link = link->next) {
+                fun = list_get_instance(link, fun_node_t, dev_functions);
+
+                if (str_cmp(name, fun->name) == 0)
+                        return fun;
+        }
+
+        return NULL;
+}
+
 /** Find child function node with a specified name.
  *
@@ -1175 +1204 @@
 fun_node_t *find_node_child(fun_node_t *pfun, const char *name)
 {
-        fun_node_t *fun;
-        link_t *link;
-        
-        link = pfun->child->functions.next;
-        
-        while (link != &pfun->child->functions) {
-                fun = list_get_instance(link, fun_node_t, dev_functions);
-                
-                if (str_cmp(name, fun->name) == 0)
-                        return fun;
-                
-                link = link->next;
-        }
-        
-        return NULL;
+        return find_fun_node_in_device(pfun->child, name);
 }
 

uspace/srv/devman/devman.h

@@ -338 +338 @@
 extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle);
 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 *);
 
 /* Device tree */

uspace/srv/devman/main.c

@@ -243 +243 @@
         }
         
+        /* Check that function with same name is not there already. */
+        if (find_fun_node_in_device(pdev, fun_name) != NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                async_answer_0(callid, EEXISTS);
+                printf(NAME ": Warning, driver tried to register `%s' twice.\n",
+                    fun_name);
+                free(fun_name);
+                return;
+        }
+
         fun_node_t *fun = create_fun_node();
         if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {