Index: uspace/app/devctl/devctl.c =================================================================== --- uspace/app/devctl/devctl.c (revision 26bc0fd10fa2579b9b192f6dd165b50194fcedc4) +++ uspace/app/devctl/devctl.c (revision f18d01b62077976f96e7a6debddd5a6a217d2d37) @@ -35,4 +35,5 @@ #include #include +#include #include #include @@ -44,6 +45,7 @@ #define MAX_NAME_LENGTH 1024 -char name[MAX_NAME_LENGTH]; -char drv_name[MAX_NAME_LENGTH]; +static char name[MAX_NAME_LENGTH]; +static char drv_name[MAX_NAME_LENGTH]; +static bool verbose = false; static const char *drv_state_str(driver_state_t state) @@ -73,4 +75,5 @@ devman_handle_t *cfuns; size_t count, i; + unsigned int score; int rc; int j; @@ -94,4 +97,18 @@ else printf("%s : %s\n", name, drv_name); + + if (verbose) { + for (i = 0; true; i++) { + rc = devman_fun_get_match_id(funh, i, name, MAX_NAME_LENGTH, + &score); + if (rc != EOK) + break; + + for (j = 0; j < lvl; j++) + printf(" "); + + printf(" %u %s\n", score, name); + } + } rc = devman_fun_get_child(funh, &devh); @@ -226,4 +243,5 @@ driver_state_t state; const char *sstate; + unsigned int score; size_t ndevs; size_t i; @@ -252,4 +270,5 @@ printf("Driver: %s\n", drv_name); printf("State: %s\n", sstate); + printf("Attached devices:\n"); @@ -263,4 +282,15 @@ goto error; printf("\t%s\n", name); + } + + printf("Match IDs:\n"); + + for (i = 0; true; i++) { + rc = devman_driver_get_match_id(drvh, i, name, MAX_NAME_LENGTH, + &score); + if (rc != EOK) + break; + + printf("\t%u %s\n", score, name); } @@ -306,5 +336,14 @@ int rc; - if (argc == 1) { + if (argc == 1 || argv[1][0] == '-') { + if (argc > 1) { + if (str_cmp(argv[1], "-v") == 0) { + verbose = true; + } else { + printf(NAME ": Invalid argument '%s'\n", argv[1]); + print_syntax(); + return 1; + } + } rc = fun_tree_print(); if (rc != EOK) Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 26bc0fd10fa2579b9b192f6dd165b50194fcedc4) +++ uspace/lib/c/generic/devman.c (revision f18d01b62077976f96e7a6debddd5a6a217d2d37) @@ -1,5 +1,5 @@ /* * Copyright (c) 2007 Josef Cejka - * Copyright (c) 2011 Jiri Svoboda + * Copyright (c) 2013 Jiri Svoboda * Copyright (c) 2010 Lenka Trochtova * All rights reserved. @@ -401,6 +401,6 @@ } -static int devman_get_str_internal(sysarg_t method, sysarg_t arg1, char *buf, - size_t buf_size) +static int devman_get_str_internal(sysarg_t method, sysarg_t arg1, + sysarg_t arg2, sysarg_t *r1, char *buf, size_t buf_size) { async_exch_t *exch; @@ -412,5 +412,5 @@ ipc_call_t answer; - aid_t req = async_send_1(exch, method, arg1, &answer); + aid_t req = async_send_2(exch, method, arg1, arg2, &answer); aid_t dreq = async_data_read(exch, buf, buf_size - 1, &dreply); async_wait_for(dreq, &dretval); @@ -430,4 +430,6 @@ } + if (r1 != NULL) + *r1 = IPC_GET_ARG1(answer); act_size = IPC_GET_ARG2(dreply); assert(act_size <= buf_size - 1); @@ -439,18 +441,33 @@ int devman_fun_get_path(devman_handle_t handle, char *buf, size_t buf_size) { - return devman_get_str_internal(DEVMAN_FUN_GET_PATH, handle, buf, - buf_size); + return devman_get_str_internal(DEVMAN_FUN_GET_PATH, handle, 0, NULL, + buf, buf_size); +} + +int devman_fun_get_match_id(devman_handle_t handle, size_t index, char *buf, + size_t buf_size, unsigned int *rscore) +{ + int rc; + sysarg_t score = 0; + + rc = devman_get_str_internal(DEVMAN_FUN_GET_MATCH_ID, handle, index, + &score, buf, buf_size); + if (rc != EOK) + return rc; + + *rscore = score; + return rc; } int devman_fun_get_name(devman_handle_t handle, char *buf, size_t buf_size) { - return devman_get_str_internal(DEVMAN_FUN_GET_NAME, handle, buf, - buf_size); + return devman_get_str_internal(DEVMAN_FUN_GET_NAME, handle, 0, NULL, + buf, buf_size); } int devman_fun_get_driver_name(devman_handle_t handle, char *buf, size_t buf_size) { - return devman_get_str_internal(DEVMAN_FUN_GET_DRIVER_NAME, handle, buf, - buf_size); + return devman_get_str_internal(DEVMAN_FUN_GET_DRIVER_NAME, handle, 0, + NULL, buf, buf_size); } @@ -653,8 +670,23 @@ } +int devman_driver_get_match_id(devman_handle_t handle, size_t index, char *buf, + size_t buf_size, unsigned int *rscore) +{ + int rc; + sysarg_t score = 0; + + rc = devman_get_str_internal(DEVMAN_DRIVER_GET_MATCH_ID, handle, index, + &score, buf, buf_size); + if (rc != EOK) + return rc; + + *rscore = score; + return rc; +} + int devman_driver_get_name(devman_handle_t handle, char *buf, size_t buf_size) { - return devman_get_str_internal(DEVMAN_DRIVER_GET_NAME, handle, buf, - buf_size); + return devman_get_str_internal(DEVMAN_DRIVER_GET_NAME, handle, 0, NULL, + buf, buf_size); } Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision 26bc0fd10fa2579b9b192f6dd165b50194fcedc4) +++ uspace/lib/c/include/devman.h (revision f18d01b62077976f96e7a6debddd5a6a217d2d37) @@ -64,4 +64,6 @@ extern int devman_dev_get_functions(devman_handle_t, devman_handle_t **, size_t *); +extern int devman_fun_get_match_id(devman_handle_t, size_t, char *, size_t, + unsigned int *); extern int devman_fun_get_name(devman_handle_t, char *, size_t); extern int devman_fun_get_driver_name(devman_handle_t, char *, size_t); @@ -76,4 +78,6 @@ size_t *); extern int devman_driver_get_handle(const char *, devman_handle_t *); +extern int devman_driver_get_match_id(devman_handle_t, size_t, char *, size_t, + unsigned int *); extern int devman_driver_get_name(devman_handle_t, char *, size_t); extern int devman_driver_get_state(devman_handle_t, driver_state_t *); Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision 26bc0fd10fa2579b9b192f6dd165b50194fcedc4) +++ uspace/lib/c/include/ipc/devman.h (revision f18d01b62077976f96e7a6debddd5a6a217d2d37) @@ -171,4 +171,5 @@ DEVMAN_DEV_GET_PARENT, DEVMAN_FUN_GET_CHILD, + DEVMAN_FUN_GET_MATCH_ID, DEVMAN_FUN_GET_NAME, DEVMAN_FUN_GET_DRIVER_NAME, @@ -180,4 +181,5 @@ DEVMAN_DRIVER_GET_DEVICES, DEVMAN_DRIVER_GET_HANDLE, + DEVMAN_DRIVER_GET_MATCH_ID, DEVMAN_DRIVER_GET_NAME, DEVMAN_DRIVER_GET_STATE, Index: uspace/srv/devman/client_conn.c =================================================================== --- uspace/srv/devman/client_conn.c (revision 26bc0fd10fa2579b9b192f6dd165b50194fcedc4) +++ uspace/srv/devman/client_conn.c (revision f18d01b62077976f96e7a6debddd5a6a217d2d37) @@ -99,4 +99,67 @@ } +/** Get device match ID. */ +static void devman_fun_get_match_id(ipc_callid_t iid, ipc_call_t *icall) +{ + devman_handle_t handle = IPC_GET_ARG1(*icall); + size_t index = IPC_GET_ARG2(*icall); + void *buffer = NULL; + + fun_node_t *fun = find_fun_node(&device_tree, handle); + if (fun == NULL) { + async_answer_0(iid, ENOMEM); + return; + } + + ipc_callid_t data_callid; + size_t data_len; + if (!async_data_read_receive(&data_callid, &data_len)) { + async_answer_0(iid, EINVAL); + fun_del_ref(fun); + return; + } + + buffer = malloc(data_len); + if (buffer == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(iid, ENOMEM); + fun_del_ref(fun); + return; + } + + fibril_rwlock_read_lock(&device_tree.rwlock); + + /* Check function state */ + if (fun->state == FUN_REMOVED) + goto error; + + link_t *link = list_nth(&fun->match_ids.ids, index); + if (link == NULL) + goto error; + + match_id_t *mid = list_get_instance(link, match_id_t, link); + + size_t sent_length = str_size(mid->id); + if (sent_length > data_len) { + sent_length = data_len; + } + + async_data_read_finalize(data_callid, mid->id, sent_length); + async_answer_1(iid, EOK, mid->score); + + fibril_rwlock_read_unlock(&device_tree.rwlock); + fun_del_ref(fun); + free(buffer); + + return; +error: + fibril_rwlock_read_unlock(&device_tree.rwlock); + free(buffer); + + async_answer_0(data_callid, ENOENT); + async_answer_0(iid, ENOENT); + fun_del_ref(fun); +} + /** Get device name. */ static void devman_fun_get_name(ipc_callid_t iid, ipc_call_t *icall) @@ -539,4 +602,54 @@ } +/** Get driver match ID. */ +static void devman_driver_get_match_id(ipc_callid_t iid, ipc_call_t *icall) +{ + devman_handle_t handle = IPC_GET_ARG1(*icall); + size_t index = IPC_GET_ARG2(*icall); + + driver_t *drv = driver_find(&drivers_list, handle); + if (drv == NULL) { + async_answer_0(iid, ENOMEM); + return; + } + + ipc_callid_t data_callid; + size_t data_len; + if (!async_data_read_receive(&data_callid, &data_len)) { + async_answer_0(iid, EINVAL); + return; + } + + void *buffer = malloc(data_len); + if (buffer == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(iid, ENOMEM); + return; + } + + fibril_mutex_lock(&drv->driver_mutex); + link_t *link = list_nth(&drv->match_ids.ids, index); + if (link == NULL) { + fibril_mutex_unlock(&drv->driver_mutex); + async_answer_0(data_callid, ENOMEM); + async_answer_0(iid, ENOMEM); + return; + } + + match_id_t *mid = list_get_instance(link, match_id_t, link); + + size_t sent_length = str_size(mid->id); + if (sent_length > data_len) { + sent_length = data_len; + } + + async_data_read_finalize(data_callid, mid->id, sent_length); + async_answer_1(iid, EOK, mid->score); + + fibril_mutex_unlock(&drv->driver_mutex); + + free(buffer); +} + /** Get driver name. */ static void devman_driver_get_name(ipc_callid_t iid, ipc_call_t *icall) @@ -638,4 +751,7 @@ devman_fun_get_child(callid, &call); break; + case DEVMAN_FUN_GET_MATCH_ID: + devman_fun_get_match_id(callid, &call); + break; case DEVMAN_FUN_GET_NAME: devman_fun_get_name(callid, &call); @@ -664,4 +780,7 @@ case DEVMAN_DRIVER_GET_HANDLE: devman_driver_get_handle(callid, &call); + break; + case DEVMAN_DRIVER_GET_MATCH_ID: + devman_driver_get_match_id(callid, &call); break; case DEVMAN_DRIVER_GET_NAME: