Changeset 96ef672 in mainline
- Timestamp:
- 2016-08-05T16:13:38Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c7840e9
- Parents:
- f527f58
- Location:
- uspace/srv/devman
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/devman/drv_conn.c
rf527f58 r96ef672 544 544 if (fun->service_id != 0) { 545 545 /* Unregister from location service */ 546 rc = loc_ service_unregister(fun->service_id);546 rc = loc_unregister_tree_function(fun, &device_tree); 547 547 if (rc != EOK) { 548 548 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed unregistering tree " -
uspace/srv/devman/fun.c
rf527f58 r96ef672 413 413 } else { 414 414 /* Unregister from location service */ 415 rc = loc_ service_unregister(fun->service_id);415 rc = loc_unregister_tree_function(fun, &device_tree); 416 416 if (rc != EOK) { 417 417 fibril_rwlock_write_unlock(&device_tree.rwlock); -
uspace/srv/devman/loc.c
rf527f58 r96ef672 67 67 } 68 68 69 int loc_unregister_tree_function(fun_node_t *fun, dev_tree_t *tree) 70 { 71 int rc = loc_service_unregister(fun->service_id); 72 tree_rem_loc_function(tree, fun); 73 return rc; 74 } 75 69 76 fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id) 70 77 { … … 89 96 } 90 97 98 void tree_rem_loc_function(dev_tree_t *tree, fun_node_t *fun) 99 { 100 assert(fibril_rwlock_is_write_locked(&tree->rwlock)); 101 102 hash_table_remove(&tree->loc_functions, &fun->service_id); 103 } 104 91 105 /** @} 92 106 */ -
uspace/srv/devman/loc.h
rf527f58 r96ef672 39 39 40 40 extern void loc_register_tree_function(fun_node_t *, dev_tree_t *); 41 extern int loc_unregister_tree_function(fun_node_t *, dev_tree_t *); 41 42 extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t); 42 43 extern void tree_add_loc_function(dev_tree_t *, fun_node_t *); 44 extern void tree_rem_loc_function(dev_tree_t *, fun_node_t *); 43 45 44 46 #endif
Note:
See TracChangeset
for help on using the changeset viewer.