Index: uspace/app/devctl/Makefile =================================================================== --- uspace/app/devctl/Makefile (revision 649f087beaa2630ebac933e718dbb78eccdb7e10) +++ uspace/app/devctl/Makefile (revision 649f087beaa2630ebac933e718dbb78eccdb7e10) @@ -0,0 +1,35 @@ +# +# Copyright (c) 2011 Jiri Svoboda +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +BINARY = devctl + +SOURCES = \ + devctl.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/devctl/devctl.c =================================================================== --- uspace/app/devctl/devctl.c (revision 649f087beaa2630ebac933e718dbb78eccdb7e10) +++ uspace/app/devctl/devctl.c (revision 649f087beaa2630ebac933e718dbb78eccdb7e10) @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup devctl + * @{ + */ +/** @file Control device framework (devman server). + */ + +#include +#include +#include +#include +#include + +#define NAME "devctl" + +#define MAX_NAME_LENGTH 1024 + +static int fun_tree_print(devman_handle_t funh, int lvl) +{ + char name[MAX_NAME_LENGTH]; + devman_handle_t devh; + devman_handle_t *cfuns; + size_t count, i; + int rc; + int j; + + for (j = 0; j < lvl; j++) + printf(" "); + + rc = devman_fun_get_name(funh, name, MAX_NAME_LENGTH); + if (rc != EOK) { + str_cpy(name, MAX_NAME_LENGTH, "unknown"); + return ENOMEM; + } + + if (name[0] == '\0') + str_cpy(name, MAX_NAME_LENGTH, "/"); + + printf("%s (%" PRIun ")\n", name, funh); + + rc = devman_fun_get_child(funh, &devh); + if (rc == ENOENT) + return EOK; + + if (rc != EOK) { + printf(NAME ": Failed getting child device for function " + "%s.\n", "xxx"); + return rc; + } + + rc = devman_dev_get_functions(devh, &cfuns, &count); + if (rc != EOK) { + printf(NAME ": Failed getting list of functions for " + "device %s.\n", "xxx"); + return rc; + } + + for (i = 0; i < count; i++) + fun_tree_print(cfuns[i], lvl + 1); + + free(cfuns); + return EOK; +} + +int main(int argc, char *argv[]) +{ + devman_handle_t root_fun; + int rc; + + rc = devman_fun_get_handle("/", &root_fun, 0); + if (rc != EOK) { + printf(NAME ": Error resolving root function.\n"); + return 1; + } + + rc = fun_tree_print(root_fun, 0); + if (rc != EOK) + return 1; + + return 0; +} + +/** @} + */ Index: uspace/app/lsusb/main.c =================================================================== --- uspace/app/lsusb/main.c (revision 42a619b240617c4f0e4dd04ddf2366f3c5a0709a) +++ uspace/app/lsusb/main.c (revision 649f087beaa2630ebac933e718dbb78eccdb7e10) @@ -81,5 +81,5 @@ } char path[MAX_PATH_LENGTH]; - rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH); + rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH); if (rc != EOK) { continue; @@ -120,5 +120,5 @@ } char path[MAX_PATH_LENGTH]; - rc = devman_get_device_path(hc_handle, path, MAX_PATH_LENGTH); + rc = devman_fun_get_path(hc_handle, path, MAX_PATH_LENGTH); if (rc != EOK) { printf(NAME ": Error resolving path of HC with SID %" Index: uspace/app/mkbd/main.c =================================================================== --- uspace/app/mkbd/main.c (revision 42a619b240617c4f0e4dd04ddf2366f3c5a0709a) +++ uspace/app/mkbd/main.c (revision 649f087beaa2630ebac933e718dbb78eccdb7e10) @@ -240,5 +240,5 @@ char path[MAX_PATH_LENGTH]; - rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH); + rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH); if (rc != EOK) { return ENOMEM; Index: uspace/app/tester/hw/serial/serial1.c =================================================================== --- uspace/app/tester/hw/serial/serial1.c (revision 42a619b240617c4f0e4dd04ddf2366f3c5a0709a) +++ uspace/app/tester/hw/serial/serial1.c (revision 649f087beaa2630ebac933e718dbb78eccdb7e10) @@ -72,5 +72,5 @@ devman_handle_t handle; - int res = devman_device_get_handle("/hw/pci0/00:01.0/com1/a", &handle, + int res = devman_fun_get_handle("/hw/pci0/00:01.0/com1/a", &handle, IPC_FLAG_BLOCKING); if (res != EOK)