Changes in uspace/srv/devman/devman.c [01b87dc5:96b02eb9] in mainline

File:

• uspace/srv/devman/devman.c (modified) (14 diffs)

uspace/srv/devman/devman.c

@@ -62 +62 @@
 }
 
-static int devmap_devices_class_compare(unsigned long key[], hash_count_t keys,
-    link_t *item)
-{
-        dev_class_info_t *class_info
-            = hash_table_get_instance(item, dev_class_info_t, devmap_link);
-        assert(class_info != NULL);
-
-        return (class_info->devmap_handle == (devmap_handle_t) key[0]);
-}
-
 static void devices_remove_callback(link_t *item)
 {
@@ -85 +75 @@
         .hash = devices_hash,
         .compare = devmap_devices_compare,
-        .remove_callback = devices_remove_callback
-};
-
-static hash_table_operations_t devmap_devices_class_ops = {
-        .hash = devices_hash,
-        .compare = devmap_devices_class_compare,
         .remove_callback = devices_remove_callback
 };
@@ -384 +368 @@
         printf(NAME ": create_root_node\n");
 
-        fibril_rwlock_write_lock(&tree->rwlock);
         node = create_dev_node();
         if (node != NULL) {
@@ -394 +377 @@
                 tree->root_node = node;
         }
-        fibril_rwlock_write_unlock(&tree->rwlock);
 
         return node != NULL;
@@ -457 +439 @@
 /** Start a driver
  *
+ * The driver's mutex is assumed to be locked.
+ *
  * @param drv           The driver's structure.
  * @return              True if the driver's task is successfully spawned, false
@@ -465 +449 @@
         int rc;
 
-        assert(fibril_mutex_is_locked(&drv->driver_mutex));
-        
         printf(NAME ": start_driver '%s'\n", drv->name);
         
@@ -688 +670 @@
         }
         
-        devmap_device_register_with_iface(devmap_pathname,
-            &node->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        devmap_device_register(devmap_pathname, &node->devmap_handle);
         
         tree_add_devmap_device(tree, node);
@@ -861 +842 @@
 /** Find the device node structure of the device witch has the specified handle.
  *
+ * Device tree's rwlock should be held at least for reading.
+ *
  * @param tree          The device tree where we look for the device node.
  * @param handle        The handle of the device.
@@ -868 +851 @@
 {
         unsigned long key = handle;
-        link_t *link;
-        
-        assert(fibril_rwlock_is_locked(&tree->rwlock));
-        
-        link = hash_table_find(&tree->devman_devices, &key);
+        link_t *link = hash_table_find(&tree->devman_devices, &key);
         return hash_table_get_instance(link, node_t, devman_link);
 }
@@ -928 +907 @@
 /** Insert new device into device tree.
  *
+ * The device tree's rwlock should be already held exclusively when calling this
+ * function.
+ *
  * @param tree          The device tree.
  * @param node          The newly added device node. 
@@ -942 +924 @@
         assert(tree != NULL);
         assert(dev_name != NULL);
-        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
         node->name = dev_name;
@@ -1061 +1042 @@
         
         info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t));
-        if (info != NULL) {
+        if (info != NULL)
                 memset(info, 0, sizeof(dev_class_info_t));
-                list_initialize(&info->dev_classes);
-                list_initialize(&info->devmap_link);
-                list_initialize(&info->link);
-        }
         
         return info;
@@ -1190 +1167 @@
         fibril_rwlock_initialize(&class_list->rwlock);
         hash_table_create(&class_list->devmap_devices, DEVICE_BUCKETS, 1,
-            &devmap_devices_class_ops);
+            &devmap_devices_ops);
 }
 
@@ -1238 +1215 @@
         hash_table_insert(&class_list->devmap_devices, &key, &cli->devmap_link);
         fibril_rwlock_write_unlock(&class_list->rwlock);
-
-        assert(find_devmap_class_device(class_list, cli->devmap_handle) != NULL);
 }