Changes in uspace/srv/devman/devman.c [3ca3430:96b02eb9] in mainline

File:

• uspace/srv/devman/devman.c (modified) (6 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
 };
@@ -686 +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);
@@ -1059 +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;
@@ -1188 +1167 @@
         fibril_rwlock_initialize(&class_list->rwlock);
         hash_table_create(&class_list->devmap_devices, DEVICE_BUCKETS, 1,
-            &devmap_devices_class_ops);
+            &devmap_devices_ops);
 }
 
@@ -1236 +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);
 }