Changeset 15f3c3f in mainline for uspace/srv/devman/devman.c
- Timestamp:
- 2011-06-22T22:00:52Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 86ffa27f
- Parents:
- ef09a7a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/devman/devman.c
ref09a7a r15f3c3f 37 37 #include <ipc/driver.h> 38 38 #include <ipc/devman.h> 39 #include < devmap.h>39 #include <loc.h> 40 40 #include <str_error.h> 41 41 #include <stdio.h> … … 66 66 } 67 67 68 static int devmap_functions_compare(unsigned long key[], hash_count_t keys,68 static int loc_functions_compare(unsigned long key[], hash_count_t keys, 69 69 link_t *item) 70 70 { 71 fun_node_t *fun = hash_table_get_instance(item, fun_node_t, devmap_fun);72 return (fun-> devmap_handle == (devmap_handle_t) key[0]);73 } 74 75 static int devmap_devices_class_compare(unsigned long key[], hash_count_t keys,71 fun_node_t *fun = hash_table_get_instance(item, fun_node_t, loc_fun); 72 return (fun->service_id == (service_id_t) key[0]); 73 } 74 75 static int loc_devices_class_compare(unsigned long key[], hash_count_t keys, 76 76 link_t *item) 77 77 { 78 78 dev_class_info_t *class_info 79 = hash_table_get_instance(item, dev_class_info_t, devmap_link);79 = hash_table_get_instance(item, dev_class_info_t, loc_link); 80 80 assert(class_info != NULL); 81 81 82 return (class_info-> devmap_handle == (devmap_handle_t) key[0]);82 return (class_info->service_id == (service_id_t) key[0]); 83 83 } 84 84 … … 99 99 }; 100 100 101 static hash_table_operations_t devmap_devices_ops = {101 static hash_table_operations_t loc_devices_ops = { 102 102 .hash = devices_hash, 103 .compare = devmap_functions_compare,103 .compare = loc_functions_compare, 104 104 .remove_callback = devices_remove_callback 105 105 }; 106 106 107 static hash_table_operations_t devmap_devices_class_ops = {107 static hash_table_operations_t loc_devices_class_ops = { 108 108 .hash = devices_hash, 109 .compare = devmap_devices_class_compare,109 .compare = loc_devices_class_compare, 110 110 .remove_callback = devices_remove_callback 111 111 }; … … 700 700 } 701 701 702 /** Create devmappath and name for the function. */703 void devmap_register_tree_function(fun_node_t *fun, dev_tree_t *tree)704 { 705 char * devmap_pathname = NULL;706 char * devmap_name = NULL;707 708 asprintf(& devmap_name, "%s", fun->pathname);709 if ( devmap_name == NULL)702 /** Create loc path and name for the function. */ 703 void loc_register_tree_function(fun_node_t *fun, dev_tree_t *tree) 704 { 705 char *loc_pathname = NULL; 706 char *loc_name = NULL; 707 708 asprintf(&loc_name, "%s", fun->pathname); 709 if (loc_name == NULL) 710 710 return; 711 711 712 replace_char( devmap_name, '/', DEVMAP_SEPARATOR);713 714 asprintf(& devmap_pathname, "%s/%s", DEVMAP_DEVICE_NAMESPACE,715 devmap_name);716 if ( devmap_pathname == NULL) {717 free( devmap_name);712 replace_char(loc_name, '/', LOC_SEPARATOR); 713 714 asprintf(&loc_pathname, "%s/%s", LOC_DEVICE_NAMESPACE, 715 loc_name); 716 if (loc_pathname == NULL) { 717 free(loc_name); 718 718 return; 719 719 } 720 720 721 devmap_device_register_with_iface(devmap_pathname,722 &fun-> devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);723 724 tree_add_ devmap_function(tree, fun);725 726 free( devmap_name);727 free( devmap_pathname);721 loc_service_register_with_iface(loc_pathname, 722 &fun->service_id, DEVMAN_CONNECT_FROM_LOC); 723 724 tree_add_loc_function(tree, fun); 725 726 free(loc_name); 727 free(loc_pathname); 728 728 } 729 729 … … 855 855 hash_table_create(&tree->devman_functions, DEVICE_BUCKETS, 1, 856 856 &devman_functions_ops); 857 hash_table_create(&tree-> devmap_functions, DEVICE_BUCKETS, 1,858 & devmap_devices_ops);857 hash_table_create(&tree->loc_functions, DEVICE_BUCKETS, 1, 858 &loc_devices_ops); 859 859 860 860 fibril_rwlock_initialize(&tree->rwlock); … … 951 951 list_initialize(&res->classes); 952 952 link_initialize(&res->devman_fun); 953 link_initialize(&res-> devmap_fun);953 link_initialize(&res->loc_fun); 954 954 } 955 955 … … 1267 1267 memset(info, 0, sizeof(dev_class_info_t)); 1268 1268 link_initialize(&info->dev_classes); 1269 link_initialize(&info-> devmap_link);1269 link_initialize(&info->loc_link); 1270 1270 link_initialize(&info->link); 1271 1271 } … … 1413 1413 list_initialize(&class_list->classes); 1414 1414 fibril_rwlock_initialize(&class_list->rwlock); 1415 hash_table_create(&class_list-> devmap_functions, DEVICE_BUCKETS, 1,1416 & devmap_devices_class_ops);1417 } 1418 1419 1420 /* Devmapdevices */1421 1422 fun_node_t *find_ devmap_tree_function(dev_tree_t *tree, devmap_handle_t devmap_handle)1415 hash_table_create(&class_list->loc_functions, DEVICE_BUCKETS, 1, 1416 &loc_devices_class_ops); 1417 } 1418 1419 1420 /* loc devices */ 1421 1422 fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id) 1423 1423 { 1424 1424 fun_node_t *fun = NULL; 1425 1425 link_t *link; 1426 unsigned long key = (unsigned long) devmap_handle;1426 unsigned long key = (unsigned long) service_id; 1427 1427 1428 1428 fibril_rwlock_read_lock(&tree->rwlock); 1429 link = hash_table_find(&tree-> devmap_functions, &key);1429 link = hash_table_find(&tree->loc_functions, &key); 1430 1430 if (link != NULL) 1431 fun = hash_table_get_instance(link, fun_node_t, devmap_fun);1431 fun = hash_table_get_instance(link, fun_node_t, loc_fun); 1432 1432 fibril_rwlock_read_unlock(&tree->rwlock); 1433 1433 … … 1435 1435 } 1436 1436 1437 fun_node_t *find_ devmap_class_function(class_list_t *classes,1438 devmap_handle_t devmap_handle)1437 fun_node_t *find_loc_class_function(class_list_t *classes, 1438 service_id_t service_id) 1439 1439 { 1440 1440 fun_node_t *fun = NULL; 1441 1441 dev_class_info_t *cli; 1442 1442 link_t *link; 1443 unsigned long key = (unsigned long) devmap_handle;1443 unsigned long key = (unsigned long)service_id; 1444 1444 1445 1445 fibril_rwlock_read_lock(&classes->rwlock); 1446 link = hash_table_find(&classes-> devmap_functions, &key);1446 link = hash_table_find(&classes->loc_functions, &key); 1447 1447 if (link != NULL) { 1448 1448 cli = hash_table_get_instance(link, dev_class_info_t, 1449 devmap_link);1449 loc_link); 1450 1450 fun = cli->fun; 1451 1451 } … … 1455 1455 } 1456 1456 1457 void class_add_ devmap_function(class_list_t *class_list, dev_class_info_t *cli)1458 { 1459 unsigned long key = (unsigned long) cli-> devmap_handle;1457 void class_add_loc_function(class_list_t *class_list, dev_class_info_t *cli) 1458 { 1459 unsigned long key = (unsigned long) cli->service_id; 1460 1460 1461 1461 fibril_rwlock_write_lock(&class_list->rwlock); 1462 hash_table_insert(&class_list-> devmap_functions, &key, &cli->devmap_link);1462 hash_table_insert(&class_list->loc_functions, &key, &cli->loc_link); 1463 1463 fibril_rwlock_write_unlock(&class_list->rwlock); 1464 1464 1465 assert(find_ devmap_class_function(class_list, cli->devmap_handle) != NULL);1466 } 1467 1468 void tree_add_ devmap_function(dev_tree_t *tree, fun_node_t *fun)1469 { 1470 unsigned long key = (unsigned long) fun-> devmap_handle;1465 assert(find_loc_class_function(class_list, cli->service_id) != NULL); 1466 } 1467 1468 void tree_add_loc_function(dev_tree_t *tree, fun_node_t *fun) 1469 { 1470 unsigned long key = (unsigned long) fun->service_id; 1471 1471 fibril_rwlock_write_lock(&tree->rwlock); 1472 hash_table_insert(&tree-> devmap_functions, &key, &fun->devmap_fun);1472 hash_table_insert(&tree->loc_functions, &key, &fun->loc_fun); 1473 1473 fibril_rwlock_write_unlock(&tree->rwlock); 1474 1474 }
Note:
See TracChangeset
for help on using the changeset viewer.