Changeset 1d2a1a9 in mainline for uspace/srv/devman/devman.c
- Timestamp:
- 2011-08-17T20:44:32Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0cc32f2
- Parents:
- bb285b4 (diff), c53a705 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/devman/devman.c
rbb285b4 r1d2a1a9 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 }; … … 701 701 } 702 702 703 /** Create devmappath and name for the function. */704 void devmap_register_tree_function(fun_node_t *fun, dev_tree_t *tree)705 { 706 char * devmap_pathname = NULL;707 char * devmap_name = NULL;708 709 asprintf(& devmap_name, "%s", fun->pathname);710 if ( devmap_name == NULL)703 /** Create loc path and name for the function. */ 704 void loc_register_tree_function(fun_node_t *fun, dev_tree_t *tree) 705 { 706 char *loc_pathname = NULL; 707 char *loc_name = NULL; 708 709 asprintf(&loc_name, "%s", fun->pathname); 710 if (loc_name == NULL) 711 711 return; 712 712 713 replace_char( devmap_name, '/', DEVMAP_SEPARATOR);714 715 asprintf(& devmap_pathname, "%s/%s", DEVMAP_DEVICE_NAMESPACE,716 devmap_name);717 if ( devmap_pathname == NULL) {718 free( devmap_name);713 replace_char(loc_name, '/', LOC_SEPARATOR); 714 715 asprintf(&loc_pathname, "%s/%s", LOC_DEVICE_NAMESPACE, 716 loc_name); 717 if (loc_pathname == NULL) { 718 free(loc_name); 719 719 return; 720 720 } 721 721 722 devmap_device_register_with_iface(devmap_pathname,723 &fun-> devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);724 725 tree_add_ devmap_function(tree, fun);726 727 free( devmap_name);728 free( devmap_pathname);722 loc_service_register_with_iface(loc_pathname, 723 &fun->service_id, DEVMAN_CONNECT_FROM_LOC); 724 725 tree_add_loc_function(tree, fun); 726 727 free(loc_name); 728 free(loc_pathname); 729 729 } 730 730 … … 856 856 hash_table_create(&tree->devman_functions, DEVICE_BUCKETS, 1, 857 857 &devman_functions_ops); 858 hash_table_create(&tree-> devmap_functions, DEVICE_BUCKETS, 1,859 & devmap_devices_ops);858 hash_table_create(&tree->loc_functions, DEVICE_BUCKETS, 1, 859 &loc_devices_ops); 860 860 861 861 fibril_rwlock_initialize(&tree->rwlock); … … 952 952 list_initialize(&res->classes); 953 953 link_initialize(&res->devman_fun); 954 link_initialize(&res-> devmap_fun);954 link_initialize(&res->loc_fun); 955 955 } 956 956 … … 1268 1268 memset(info, 0, sizeof(dev_class_info_t)); 1269 1269 link_initialize(&info->dev_classes); 1270 link_initialize(&info-> devmap_link);1270 link_initialize(&info->loc_link); 1271 1271 link_initialize(&info->link); 1272 1272 } … … 1414 1414 list_initialize(&class_list->classes); 1415 1415 fibril_rwlock_initialize(&class_list->rwlock); 1416 hash_table_create(&class_list-> devmap_functions, DEVICE_BUCKETS, 1,1417 & devmap_devices_class_ops);1418 } 1419 1420 1421 /* Devmapdevices */1422 1423 fun_node_t *find_ devmap_tree_function(dev_tree_t *tree, devmap_handle_t devmap_handle)1416 hash_table_create(&class_list->loc_functions, DEVICE_BUCKETS, 1, 1417 &loc_devices_class_ops); 1418 } 1419 1420 1421 /* loc devices */ 1422 1423 fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id) 1424 1424 { 1425 1425 fun_node_t *fun = NULL; 1426 1426 link_t *link; 1427 unsigned long key = (unsigned long) devmap_handle;1427 unsigned long key = (unsigned long) service_id; 1428 1428 1429 1429 fibril_rwlock_read_lock(&tree->rwlock); 1430 link = hash_table_find(&tree-> devmap_functions, &key);1430 link = hash_table_find(&tree->loc_functions, &key); 1431 1431 if (link != NULL) 1432 fun = hash_table_get_instance(link, fun_node_t, devmap_fun);1432 fun = hash_table_get_instance(link, fun_node_t, loc_fun); 1433 1433 fibril_rwlock_read_unlock(&tree->rwlock); 1434 1434 … … 1436 1436 } 1437 1437 1438 fun_node_t *find_ devmap_class_function(class_list_t *classes,1439 devmap_handle_t devmap_handle)1438 fun_node_t *find_loc_class_function(class_list_t *classes, 1439 service_id_t service_id) 1440 1440 { 1441 1441 fun_node_t *fun = NULL; 1442 1442 dev_class_info_t *cli; 1443 1443 link_t *link; 1444 unsigned long key = (unsigned long) devmap_handle;1444 unsigned long key = (unsigned long)service_id; 1445 1445 1446 1446 fibril_rwlock_read_lock(&classes->rwlock); 1447 link = hash_table_find(&classes-> devmap_functions, &key);1447 link = hash_table_find(&classes->loc_functions, &key); 1448 1448 if (link != NULL) { 1449 1449 cli = hash_table_get_instance(link, dev_class_info_t, 1450 devmap_link);1450 loc_link); 1451 1451 fun = cli->fun; 1452 1452 } … … 1456 1456 } 1457 1457 1458 void class_add_ devmap_function(class_list_t *class_list, dev_class_info_t *cli)1459 { 1460 unsigned long key = (unsigned long) cli-> devmap_handle;1458 void class_add_loc_function(class_list_t *class_list, dev_class_info_t *cli) 1459 { 1460 unsigned long key = (unsigned long) cli->service_id; 1461 1461 1462 1462 fibril_rwlock_write_lock(&class_list->rwlock); 1463 hash_table_insert(&class_list-> devmap_functions, &key, &cli->devmap_link);1463 hash_table_insert(&class_list->loc_functions, &key, &cli->loc_link); 1464 1464 fibril_rwlock_write_unlock(&class_list->rwlock); 1465 1465 1466 assert(find_ devmap_class_function(class_list, cli->devmap_handle) != NULL);1467 } 1468 1469 void tree_add_ devmap_function(dev_tree_t *tree, fun_node_t *fun)1470 { 1471 unsigned long key = (unsigned long) fun-> devmap_handle;1466 assert(find_loc_class_function(class_list, cli->service_id) != NULL); 1467 } 1468 1469 void tree_add_loc_function(dev_tree_t *tree, fun_node_t *fun) 1470 { 1471 unsigned long key = (unsigned long) fun->service_id; 1472 1472 fibril_rwlock_write_lock(&tree->rwlock); 1473 hash_table_insert(&tree-> devmap_functions, &key, &fun->devmap_fun);1473 hash_table_insert(&tree->loc_functions, &key, &fun->loc_fun); 1474 1474 fibril_rwlock_write_unlock(&tree->rwlock); 1475 1475 }
Note:
See TracChangeset
for help on using the changeset viewer.