Index: HelenOS.config =================================================================== --- HelenOS.config (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ HelenOS.config (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -528,4 +528,10 @@ ! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y) +% Run devman on startup +! CONFIG_START_DEVMAN (y) + +% Launch (devman) test drivers +! [CONFIG_START_DEVMAN=y&CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (y/n) + % Load disk drivers on startup ! CONFIG_START_BD (n/y) @@ -549,7 +555,4 @@ ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y) -% Launch (devman) test drivers -! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y) - % Start virtual USB host controller ! CONFIG_RUN_VIRTUAL_USB_HC (n/y) @@ -560,3 +563,2 @@ % Run devman in kconsole (not recommended) ! CONFIG_DEVMAN_EARLY_LAUNCH (n/y) - Index: uspace/app/bdsh/cmds/modules/ls/ls.c =================================================================== --- uspace/app/bdsh/cmds/modules/ls/ls.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/app/bdsh/cmds/modules/ls/ls.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -38,7 +38,9 @@ #include #include +#include #include #include #include +#include #include "errors.h" @@ -46,64 +48,160 @@ #include "util.h" #include "entry.h" -#include "ls.h" #include "cmds.h" +/* Various values that can be returned by ls_scope() */ +#define LS_BOGUS 0 +#define LS_FILE 1 +#define LS_DIR 2 + +/** Structure to represent a directory entry. + * + * Useful to keep together important information + * for sorting directory entries. + */ +struct dir_elem_t { + char *name; + struct stat s; +}; + static const char *cmdname = "ls"; -static void ls_scan_dir(const char *d, DIR *dirp) -{ +static struct option const long_options[] = { + { "help", no_argument, 0, 'h' }, + { "unsort", no_argument, 0, 'u' }, + { 0, 0, 0, 0 } +}; + +/** Print an entry. + * + * ls_print currently does nothing more than print the entry. + * In the future, we will likely pass the absolute path, and + * some sort of ls_options structure that controls how each + * entry is printed and what is printed about it. + * + * Now we just print basic DOS style lists. + * + * @param de Directory element. + */ +static void ls_print(struct dir_elem_t *de) +{ + if (de->s.is_file) + printf("%-40s\t%llu\n", de->name, (long long) de->s.size); + else if (de->s.is_directory) + printf("%-40s\t\n", de->name); + else + printf("%-40s\n", de->name); +} + + +/** Compare 2 directory elements. + * + * It compares 2 elements of a directory : a file is considered + * as bigger than a directory, and if they have the same type, + * they are compared alphabetically. + * + * @param a Pointer to the structure of the first element. + * @param b Pointer to the structure of the second element. + * @param arg Pointer for an other and optionnal argument. + * + * @return -1 if a < b, 1 otherwise. + */ +static int ls_cmp(void *a, void *b, void *arg) +{ + struct dir_elem_t *da = a; + struct dir_elem_t *db = b; + + if ((da->s.is_directory && db->s.is_file) || + ((da->s.is_directory == db->s.is_directory) && + str_cmp(da->name, db->name) < 0)) + return -1; + else + return 1; +} + +/** Scan a directory. + * + * Scan the content of a directory and print it. + * + * @param d Name of the directory. + * @param dirp Directory stream. + * @param sort 1 if the output must be sorted, + * 0 otherwise. + */ +static void ls_scan_dir(const char *d, DIR *dirp, int sort) +{ + int alloc_blocks = 20; + int i; + int nbdirs = 0; + int rc; + int len; + char *buff; + struct dir_elem_t *tmp; + struct dir_elem_t *tosort; struct dirent *dp; - char *buff; - - if (! dirp) + + if (!dirp) return; - buff = (char *)malloc(PATH_MAX); - if (NULL == buff) { + buff = (char *) malloc(PATH_MAX); + if (!buff) { cli_error(CL_ENOMEM, "ls: failed to scan %s", d); return; } - + + tosort = (struct dir_elem_t *) malloc(alloc_blocks * sizeof(*tosort)); + if (!tosort) { + cli_error(CL_ENOMEM, "ls: failed to scan %s", d); + free(buff); + return; + } + while ((dp = readdir(dirp))) { - memset(buff, 0, sizeof(buff)); - /* Don't worry if inserting a double slash, this will be fixed by - * absolutize() later with subsequent calls to open() or readdir() */ - snprintf(buff, PATH_MAX - 1, "%s/%s", d, dp->d_name); - ls_print(dp->d_name, buff); - } - + if (nbdirs + 1 > alloc_blocks) { + alloc_blocks += alloc_blocks; + + tmp = (struct dir_elem_t *) realloc(tosort, + alloc_blocks * sizeof(struct dir_elem_t)); + if (!tmp) { + cli_error(CL_ENOMEM, "ls: failed to scan %s", d); + goto out; + } + tosort = tmp; + } + + /* fill the name field */ + tosort[nbdirs].name = (char *) malloc(str_length(dp->d_name) + 1); + if (!tosort[nbdirs].name) { + cli_error(CL_ENOMEM, "ls: failed to scan %s", d); + goto out; + } + + str_cpy(tosort[nbdirs].name, str_length(dp->d_name) + 1, dp->d_name); + len = snprintf(buff, PATH_MAX - 1, "%s/%s", d, tosort[nbdirs].name); + buff[len] = '\0'; + + rc = stat(buff, &tosort[nbdirs++].s); + if (rc != 0) { + printf("ls: skipping bogus node %s\n", buff); + printf("rc=%d\n", rc); + goto out; + } + } + + if (sort) { + if (!qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t), + ls_cmp, NULL)) { + printf("Sorting error.\n"); + } + } + + for (i = 0; i < nbdirs; i++) + ls_print(&tosort[i]); + +out: + for(i = 0; i < nbdirs; i++) + free(tosort[i].name); + free(tosort); free(buff); - - return; -} - -/* ls_print currently does nothing more than print the entry. - * in the future, we will likely pass the absolute path, and - * some sort of ls_options structure that controls how each - * entry is printed and what is printed about it. - * - * Now we just print basic DOS style lists */ - -static void ls_print(const char *name, const char *pathname) -{ - struct stat s; - int rc; - - rc = stat(pathname, &s); - if (rc != 0) { - /* Odd chance it was deleted from the time readdir() found it */ - printf("ls: skipping bogus node %s\n", pathname); - printf("rc=%d\n", rc); - return; - } - - if (s.is_file) - printf("%-40s\t%llu\n", name, (long long) s.size); - else if (s.is_directory) - printf("%-40s\t\n", name); - else - printf("%-40s\n", name); - - return; } @@ -114,6 +212,11 @@ } else { help_cmd_ls(HELP_SHORT); - printf(" `%s' [path], if no path is given the current " - "working directory is used.\n", cmdname); + printf( + "Usage: %s [options] [path]\n" + "If not path is given, the current working directory is used.\n" + "Options:\n" + " -h, --help A short option summary\n" + " -u, --unsort Do not sort directory entries\n", + cmdname); } @@ -124,43 +227,58 @@ { unsigned int argc; - struct stat s; - char *buff; + struct dir_elem_t de; DIR *dirp; + int c, opt_ind; + int sort = 1; argc = cli_count_args(argv); - - buff = (char *) malloc(PATH_MAX); - if (NULL == buff) { + + for (c = 0, optind = 0, opt_ind = 0; c != -1;) { + c = getopt_long(argc, argv, "hu", long_options, &opt_ind); + switch (c) { + case 'h': + help_cmd_ls(HELP_LONG); + return CMD_SUCCESS; + case 'u': + sort = 0; + break; + } + } + + argc -= optind; + + de.name = (char *) malloc(PATH_MAX); + if (!de.name) { cli_error(CL_ENOMEM, "%s: ", cmdname); return CMD_FAILURE; } - memset(buff, 0, sizeof(buff)); - - if (argc == 1) - getcwd(buff, PATH_MAX); + memset(de.name, 0, sizeof(PATH_MAX)); + + if (argc == 0) + getcwd(de.name, PATH_MAX); else - str_cpy(buff, PATH_MAX, argv[1]); - - if (stat(buff, &s)) { - cli_error(CL_ENOENT, buff); - free(buff); + str_cpy(de.name, PATH_MAX, argv[optind]); + + if (stat(de.name, &de.s)) { + cli_error(CL_ENOENT, de.name); + free(de.name); return CMD_FAILURE; } - if (s.is_file) { - ls_print(buff, buff); + if (de.s.is_file) { + ls_print(&de); } else { - dirp = opendir(buff); + dirp = opendir(de.name); if (!dirp) { /* May have been deleted between scoping it and opening it */ - cli_error(CL_EFAIL, "Could not stat %s", buff); - free(buff); + cli_error(CL_EFAIL, "Could not stat %s", de.name); + free(de.name); return CMD_FAILURE; } - ls_scan_dir(buff, dirp); + ls_scan_dir(de.name, dirp, sort); closedir(dirp); } - free(buff); + free(de.name); return CMD_SUCCESS; Index: pace/app/bdsh/cmds/modules/ls/ls.h =================================================================== --- uspace/app/bdsh/cmds/modules/ls/ls.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ (revision ) @@ -1,13 +1,0 @@ -#ifndef LS_H -#define LS_H - -/* Various values that can be returned by ls_scope() */ -#define LS_BOGUS 0 -#define LS_FILE 1 -#define LS_DIR 2 - -static void ls_scan_dir(const char *, DIR *); -static void ls_print(const char *, const char *); - -#endif /* LS_H */ - Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/app/init/init.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -314,4 +314,6 @@ getterm("term/vc6", "/app/klog", false); +#ifdef CONFIG_START_DEVMAN + #ifdef CONFIG_DEVMAN_EARLY_LAUNCH spawn("/srv/devman"); @@ -320,4 +322,6 @@ #endif +#endif + return 0; } Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/app/tester/Makefile (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -54,4 +54,5 @@ mm/malloc1.c \ mm/mapping1.c \ + devs/devman1.c \ hw/misc/virtchar1.c \ hw/serial/serial1.c Index: uspace/app/tester/devs/devman1.c =================================================================== --- uspace/app/tester/devs/devman1.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) +++ uspace/app/tester/devs/devman1.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 tester + * @brief Test devman service. + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../tester.h" + +#define DEVICE_PATH_NORMAL "/virt/null/a" +#define DEVICE_CLASS "virt-null" +#define DEVICE_CLASS_NAME "1" +#define DEVICE_PATH_CLASSES DEVICE_CLASS "/" DEVICE_CLASS_NAME + +const char *test_devman1(void) +{ + devman_handle_t handle_primary; + devman_handle_t handle_class; + + int rc; + + TPRINTF("Asking for handle of `%s'...\n", DEVICE_PATH_NORMAL); + rc = devman_device_get_handle(DEVICE_PATH_NORMAL, &handle_primary, 0); + if (rc != EOK) { + TPRINTF(" ...failed: %s.\n", str_error(rc)); + if (rc == ENOENT) { + TPRINTF("Have you compiled the test drivers?\n"); + } + return "Failed getting device handle"; + } + + TPRINTF("Asking for handle of `%s' by class..\n", DEVICE_PATH_CLASSES); + rc = devman_device_get_handle_by_class(DEVICE_CLASS, DEVICE_CLASS_NAME, + &handle_class, 0); + if (rc != EOK) { + TPRINTF(" ...failed: %s.\n", str_error(rc)); + return "Failed getting device class handle"; + } + + TPRINTF("Received handles %" PRIun " and %" PRIun ".\n", + handle_primary, handle_class); + if (handle_primary != handle_class) { + return "Retrieved different handles for the same device"; + } + + return NULL; +} + +/** @} + */ Index: uspace/app/tester/devs/devman1.def =================================================================== --- uspace/app/tester/devs/devman1.def (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) +++ uspace/app/tester/devs/devman1.def (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -0,0 +1,6 @@ +{ + "devman1", + "devman test", + &test_devman1, + false +}, Index: uspace/app/tester/tester.c =================================================================== --- uspace/app/tester/tester.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/app/tester/tester.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -66,4 +66,5 @@ #include "adt/usbaddrkeep.def" #include "hw/misc/virtchar1.def" +#include "devs/devman1.def" {NULL, NULL, NULL, false} }; Index: uspace/app/tester/tester.h =================================================================== --- uspace/app/tester/tester.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/app/tester/tester.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -82,4 +82,5 @@ extern const char *test_usbaddrkeep(void); extern const char *test_virtchar1(void); +extern const char *test_devman1(void); extern test_t tests[]; Index: uspace/drv/isa/isa.c =================================================================== --- uspace/drv/isa/isa.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/isa/isa.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -53,4 +53,5 @@ #include +#include #include @@ -134,5 +135,5 @@ fd = open(conf_path, O_RDONLY); if (fd < 0) { - printf(NAME ": unable to open %s\n", conf_path); + ddf_msg(LVL_ERROR, "Unable to open %s", conf_path); goto cleanup; } @@ -141,8 +142,8 @@ len = lseek(fd, 0, SEEK_END); - lseek(fd, 0, SEEK_SET); + lseek(fd, 0, SEEK_SET); if (len == 0) { - printf(NAME ": fun_conf_read error: configuration file '%s' " - "is empty.\n", conf_path); + ddf_msg(LVL_ERROR, "Configuration file '%s' is empty.", + conf_path); goto cleanup; } @@ -150,11 +151,10 @@ buf = malloc(len + 1); if (buf == NULL) { - printf(NAME ": fun_conf_read error: memory allocation failed.\n"); + ddf_msg(LVL_ERROR, "Memory allocation failed."); goto cleanup; } if (0 >= read(fd, buf, len)) { - printf(NAME ": fun_conf_read error: unable to read file '%s'.\n", - conf_path); + ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path); goto cleanup; } @@ -252,5 +252,5 @@ fun->hw_resources.count++; - printf(NAME ": added irq 0x%x to function %s\n", irq, + ddf_msg(LVL_NOTE, "Added irq 0x%x to function %s", irq, fun->fnode->name); } @@ -270,6 +270,6 @@ fun->hw_resources.count++; - printf(NAME ": added io range (addr=0x%x, size=0x%x) to " - "function %s\n", (unsigned int) addr, (unsigned int) len, + ddf_msg(LVL_NOTE, "Added io range (addr=0x%x, size=0x%x) to " + "function %s", (unsigned int) addr, (unsigned int) len, fun->fnode->name); } @@ -331,6 +331,6 @@ score = (int)strtol(val, &end, 10); if (val == end) { - printf(NAME " : error - could not read match score for " - "function %s.\n", fun->fnode->name); + ddf_msg(LVL_ERROR, "Cannot read match score for function " + "%s.", fun->fnode->name); return; } @@ -339,15 +339,17 @@ get_match_id(&id, val); if (id == NULL) { - printf(NAME " : error - could not read match id for " - "function %s.\n", fun->fnode->name); + ddf_msg(LVL_ERROR, "Cannot read match ID for function %s.", + fun->fnode->name); return; } - printf(NAME ": adding match id '%s' with score %d to function %s\n", id, - score, fun->fnode->name); + ddf_msg(LVL_DEBUG, "Adding match id '%s' with score %d to " + "function %s", id, score, fun->fnode->name); rc = ddf_fun_add_match_id(fun->fnode, id, score); - if (rc != EOK) - printf(NAME ": error adding match ID: %s\n", str_error(rc)); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Failed adding match ID: %s", + str_error(rc)); + } } @@ -375,8 +377,8 @@ if (!prop_parse(fun, line, "io_range", &fun_parse_io_range) && !prop_parse(fun, line, "irq", &fun_parse_irq) && - !prop_parse(fun, line, "match", &fun_parse_match_id)) - { - printf(NAME " error undefined device property at line '%s'\n", - line); + !prop_parse(fun, line, "match", &fun_parse_match_id)) { + + ddf_msg(LVL_ERROR, "Undefined device property at line '%s'", + line); } } @@ -439,5 +441,5 @@ fun->fnode->ops = &isa_fun_ops; - printf(NAME ": Binding function %s.\n", fun->fnode->name); + ddf_msg(LVL_DEBUG, "Binding function %s.", fun->fnode->name); /* XXX Handle error */ @@ -467,18 +469,18 @@ static int isa_add_device(ddf_dev_t *dev) { - printf(NAME ": isa_add_device, device handle = %d\n", + ddf_msg(LVL_DEBUG, "isa_add_device, device handle = %d", (int) dev->handle); /* Make the bus device more visible. Does not do anything. */ - printf(NAME ": adding a 'ctl' function\n"); + ddf_msg(LVL_DEBUG, "Adding a 'ctl' function"); ddf_fun_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl"); if (ctl == NULL) { - printf(NAME ": Error creating control function.\n"); + ddf_msg(LVL_ERROR, "Failed creating control function."); return EXDEV; } if (ddf_fun_bind(ctl) != EOK) { - printf(NAME ": Error binding control function.\n"); + ddf_msg(LVL_ERROR, "Failed binding control function."); return EXDEV; } @@ -486,5 +488,5 @@ /* Add functions as specified in the configuration file. */ isa_functions_add(dev); - printf(NAME ": finished the enumeration of legacy functions\n"); + ddf_msg(LVL_NOTE, "Finished enumerating legacy functions"); return EOK; @@ -493,4 +495,5 @@ static void isa_init() { + ddf_log_init(NAME, LVL_ERROR); isa_fun_ops.interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops; } Index: uspace/drv/ns8250/ns8250.c =================================================================== --- uspace/drv/ns8250/ns8250.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/ns8250/ns8250.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -55,4 +55,5 @@ #include #include +#include #include @@ -275,11 +276,11 @@ static bool ns8250_pio_enable(ns8250_t *ns) { - printf(NAME ": ns8250_pio_enable %s\n", ns->dev->name); + ddf_msg(LVL_DEBUG, "ns8250_pio_enable %s", ns->dev->name); /* Gain control over port's registers. */ if (pio_enable((void *)(uintptr_t) ns->io_addr, REG_COUNT, (void **) &ns->port)) { - printf(NAME ": error - cannot gain the port %#" PRIx32 " for device " - "%s.\n", ns->io_addr, ns->dev->name); + ddf_msg(LVL_ERROR, "Cannot map the port %#" PRIx32 + " for device %s.", ns->io_addr, ns->dev->name); return false; } @@ -295,5 +296,5 @@ static bool ns8250_dev_probe(ns8250_t *ns) { - printf(NAME ": ns8250_dev_probe %s\n", ns->dev->name); + ddf_msg(LVL_DEBUG, "ns8250_dev_probe %s", ns->dev->name); ioport8_t *port_addr = ns->port; @@ -313,6 +314,8 @@ pio_write_8(port_addr + 4, olddata); - if (!res) - printf(NAME ": device %s is not present.\n", ns->dev->name); + if (!res) { + ddf_msg(LVL_DEBUG, "Device %s is not present.", + ns->dev->name); + } return res; @@ -326,5 +329,5 @@ static int ns8250_dev_initialize(ns8250_t *ns) { - printf(NAME ": ns8250_dev_initialize %s\n", ns->dev->name); + ddf_msg(LVL_DEBUG, "ns8250_dev_initialize %s", ns->dev->name); int ret = EOK; @@ -337,6 +340,6 @@ IPC_FLAG_BLOCKING); if (ns->dev->parent_phone < 0) { - printf(NAME ": failed to connect to the parent driver of the " - "device %s.\n", ns->dev->name); + ddf_msg(LVL_ERROR, "Failed to connect to parent driver of " + "device %s.", ns->dev->name); ret = ns->dev->parent_phone; goto failed; @@ -346,6 +349,6 @@ ret = hw_res_get_resource_list(ns->dev->parent_phone, &hw_resources); if (ret != EOK) { - printf(NAME ": failed to get hw resources for the device " - "%s.\n", ns->dev->name); + ddf_msg(LVL_ERROR, "Failed to get HW resources for device " + "%s.", ns->dev->name); goto failed; } @@ -362,5 +365,5 @@ ns->irq = res->res.interrupt.irq; irq = true; - printf(NAME ": the %s device was asigned irq = 0x%x.\n", + ddf_msg(LVL_NOTE, "Device %s was asigned irq = 0x%x.", ns->dev->name, ns->irq); break; @@ -369,13 +372,13 @@ ns->io_addr = res->res.io_range.address; if (res->res.io_range.size < REG_COUNT) { - printf(NAME ": i/o range assigned to the device " - "%s is too small.\n", ns->dev->name); + ddf_msg(LVL_ERROR, "I/O range assigned to " + "device %s is too small.", ns->dev->name); ret = ELIMIT; goto failed; } ioport = true; - printf(NAME ": the %s device was asigned i/o address = " - "0x%x.\n", ns->dev->name, ns->io_addr); - break; + ddf_msg(LVL_NOTE, "Device %s was asigned I/O address = " + "0x%x.", ns->dev->name, ns->io_addr); + break; default: @@ -385,5 +388,5 @@ if (!irq || !ioport) { - printf(NAME ": missing hw resource(s) for the device %s.\n", + ddf_msg(LVL_ERROR, "Missing HW resource(s) for device %s.", ns->dev->name); ret = ENOENT; @@ -470,6 +473,6 @@ if (baud_rate < 50 || MAX_BAUD_RATE % baud_rate != 0) { - printf(NAME ": error - somebody tried to set invalid baud rate " - "%d\n", baud_rate); + ddf_msg(LVL_ERROR, "Invalid baud rate %d requested.", + baud_rate); return EINVAL; } @@ -654,9 +657,9 @@ if (ns->client_connected) { if (!buf_push_back(&ns->input_buffer, val)) { - printf(NAME ": buffer overflow on " - "%s.\n", ns->dev->name); + ddf_msg(LVL_WARN, "Buffer overflow on " + "%s.", ns->dev->name); } else { - printf(NAME ": the character %c saved " - "to the buffer of %s.\n", + ddf_msg(LVL_DEBUG2, "Character %c saved " + "to the buffer of %s.", val, ns->dev->name); } @@ -714,5 +717,5 @@ int rc; - printf(NAME ": ns8250_add_device %s (handle = %d)\n", + ddf_msg(LVL_DEBUG, "ns8250_add_device %s (handle = %d)", dev->name, (int) dev->handle); @@ -749,5 +752,5 @@ /* Register interrupt handler. */ if (ns8250_register_interrupt_handler(ns) != EOK) { - printf(NAME ": failed to register interrupt handler.\n"); + ddf_msg(LVL_ERROR, "Failed to register interrupt handler."); rc = EADDRNOTAVAIL; goto fail; @@ -757,6 +760,6 @@ rc = ns8250_interrupt_enable(ns); if (rc != EOK) { - printf(NAME ": failed to enable the interrupt. Error code = " - "%d.\n", rc); + ddf_msg(LVL_ERROR, "Failed to enable the interrupt. Error code = " + "%d.", rc); goto fail; } @@ -764,5 +767,5 @@ fun = ddf_fun_create(dev, fun_exposed, "a"); if (fun == NULL) { - printf(NAME ": error creating function.\n"); + ddf_msg(LVL_ERROR, "Failed creating function."); goto fail; } @@ -772,5 +775,5 @@ rc = ddf_fun_bind(fun); if (rc != EOK) { - printf(NAME ": error binding function.\n"); + ddf_msg(LVL_ERROR, "Failed binding function."); goto fail; } @@ -780,5 +783,5 @@ ddf_fun_add_to_class(fun, "serial"); - printf(NAME ": the %s device has been successfully initialized.\n", + ddf_msg(LVL_NOTE, "Device %s successfully initialized.", dev->name); @@ -862,6 +865,6 @@ fibril_mutex_unlock(&data->mutex); - printf(NAME ": ns8250_get_props: baud rate %d, parity 0x%x, word " - "length %d, stop bits %d\n", *baud_rate, *parity, *word_length, + ddf_msg(LVL_DEBUG, "ns8250_get_props: baud rate %d, parity 0x%x, word " + "length %d, stop bits %d", *baud_rate, *parity, *word_length, *stop_bits); } @@ -879,6 +882,6 @@ unsigned int parity, unsigned int word_length, unsigned int stop_bits) { - printf(NAME ": ns8250_set_props: baud rate %d, parity 0x%x, word " - "length %d, stop bits %d\n", baud_rate, parity, word_length, + ddf_msg(LVL_DEBUG, "ns8250_set_props: baud rate %d, parity 0x%x, word " + "length %d, stop bits %d", baud_rate, parity, word_length, stop_bits); @@ -940,4 +943,6 @@ static void ns8250_init(void) { + ddf_log_init(NAME, LVL_ERROR); + ns8250_dev_ops.open = &ns8250_open; ns8250_dev_ops.close = &ns8250_close; Index: uspace/drv/ohci/root_hub.c =================================================================== --- uspace/drv/ohci/root_hub.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/ohci/root_hub.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -40,4 +40,5 @@ #include "root_hub.h" #include "usb/classes/classes.h" +#include "usb/devdrv.h" #include #include @@ -61,5 +62,5 @@ /// \TODO these values migt be different .str_serial_number = 0, - .usb_spec_version = 0, + .usb_spec_version = 0x110, }; @@ -110,67 +111,7 @@ }; -/** Root hub initialization - * @return Error code. - */ -int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs) -{ - assert(instance); - instance->address = -1; - instance->registers = regs; - instance->device = dev; - - - usb_log_info("OHCI root hub with %d ports.\n", regs->rh_desc_a & 0xff); - - //start generic usb hub driver - - /* TODO: implement */ - return EOK; -} -/*----------------------------------------------------------------------------*/ - -/** - * create answer to port status_request - * - * Copy content of corresponding port status register to answer buffer. - * - * @param instance root hub instance - * @param port port number, counted from 1 - * @param request structure containing both request and response information - * @return error code - */ -static int process_get_port_status_request(rh_t *instance, uint16_t port, - usb_transfer_batch_t * request){ - if(port<1 || port>instance->port_count) - return EINVAL; - uint32_t * uint32_buffer = (uint32_t*)request->buffer; - request->transfered_size = 4; - uint32_buffer[0] = instance->registers->rh_port_status[port -1]; - return EOK; -} - -/** - * create answer to port status_request - * - * Copy content of hub status register to answer buffer. - * - * @param instance root hub instance - * @param request structure containing both request and response information - * @return error code - */ -static int process_get_hub_status_request(rh_t *instance, - usb_transfer_batch_t * request){ - uint32_t * uint32_buffer = (uint32_t*)request->buffer; - //bits, 0,1,16,17 - request->transfered_size = 4; - uint32_t mask = 1 & (1<<1) & (1<<16) & (1<<17); - uint32_buffer[0] = mask & instance->registers->rh_status; - return EOK; - -} - /** * Create hub descriptor used in hub-driver <-> hub communication - * + * * This means creating byt array from data in root hub registers. For more * info see usb hub specification. @@ -197,5 +138,5 @@ result[2] = instance->port_count; uint32_t hub_desc_reg = instance->registers->rh_desc_a; - result[3] = + result[3] = ((hub_desc_reg >> 8) %2) + (((hub_desc_reg >> 9) %2) << 1) + @@ -219,4 +160,108 @@ (*out_size) = size; } + + +/** initialize hub descriptors + * + * Initialized are device and full configuration descriptor. These need to + * be initialized only once per hub. + * @instance root hub instance + */ +static void rh_init_descriptors(rh_t *instance){ + memcpy(&instance->descriptors.device, &ohci_rh_device_descriptor, + sizeof(ohci_rh_device_descriptor) + ); + usb_standard_configuration_descriptor_t descriptor; + memcpy(&descriptor,&ohci_rh_conf_descriptor, + sizeof(ohci_rh_conf_descriptor)); + uint8_t * hub_descriptor; + size_t hub_desc_size; + usb_create_serialized_hub_descriptor(instance, &hub_descriptor, + &hub_desc_size); + + descriptor.total_length = + sizeof(usb_standard_configuration_descriptor_t)+ + sizeof(usb_standard_endpoint_descriptor_t)+ + sizeof(usb_standard_interface_descriptor_t)+ + hub_desc_size; + + uint8_t * full_config_descriptor = + (uint8_t*) malloc(descriptor.total_length); + memcpy(full_config_descriptor, &descriptor, sizeof(descriptor)); + memcpy(full_config_descriptor + sizeof(descriptor), + &ohci_rh_iface_descriptor, sizeof(ohci_rh_iface_descriptor)); + memcpy(full_config_descriptor + sizeof(descriptor) + + sizeof(ohci_rh_iface_descriptor), + &ohci_rh_ep_descriptor, sizeof(ohci_rh_ep_descriptor)); + memcpy(full_config_descriptor + sizeof(descriptor) + + sizeof(ohci_rh_iface_descriptor) + + sizeof(ohci_rh_ep_descriptor), + hub_descriptor, hub_desc_size); + + instance->descriptors.configuration = full_config_descriptor; + instance->descriptors.configuration_size = descriptor.total_length; +} + +/** Root hub initialization + * @return Error code. + */ +int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs) +{ + assert(instance); + instance->address = -1; + instance->registers = regs; + instance->device = dev; + rh_init_descriptors(instance); + + + usb_log_info("OHCI root hub with %d ports.\n", regs->rh_desc_a & 0xff); + + //start generic usb hub driver + + /* TODO: implement */ + return EOK; +} +/*----------------------------------------------------------------------------*/ + +/** + * create answer to port status_request + * + * Copy content of corresponding port status register to answer buffer. + * + * @param instance root hub instance + * @param port port number, counted from 1 + * @param request structure containing both request and response information + * @return error code + */ +static int process_get_port_status_request(rh_t *instance, uint16_t port, + usb_transfer_batch_t * request){ + if(port<1 || port>instance->port_count) + return EINVAL; + uint32_t * uint32_buffer = (uint32_t*)request->buffer; + request->transfered_size = 4; + uint32_buffer[0] = instance->registers->rh_port_status[port -1]; + return EOK; +} + +/** + * create answer to port status_request + * + * Copy content of hub status register to answer buffer. + * + * @param instance root hub instance + * @param request structure containing both request and response information + * @return error code + */ +static int process_get_hub_status_request(rh_t *instance, + usb_transfer_batch_t * request){ + uint32_t * uint32_buffer = (uint32_t*)request->buffer; + //bits, 0,1,16,17 + request->transfered_size = 4; + uint32_t mask = 1 & (1<<1) & (1<<16) & (1<<17); + uint32_buffer[0] = mask & instance->registers->rh_status; + return EOK; + +} + @@ -284,28 +329,5 @@ } } - -/** - * create standart configuration descriptor for the root hub instance - * @param instance root hub instance - * @return newly allocated descriptor - */ -static usb_standard_configuration_descriptor_t * -usb_ohci_rh_create_standart_configuration_descriptor(rh_t *instance){ - usb_standard_configuration_descriptor_t * descriptor = - malloc(sizeof(usb_standard_configuration_descriptor_t)); - memcpy(descriptor, &ohci_rh_conf_descriptor, - sizeof(usb_standard_configuration_descriptor_t)); - /// \TODO should this include device descriptor? - const size_t hub_descriptor_size = 7 + - 2* (instance->port_count / 8 + - ((instance->port_count % 8 > 0) ? 1 : 0)); - descriptor->total_length = - sizeof(usb_standard_configuration_descriptor_t)+ - sizeof(usb_standard_endpoint_descriptor_t)+ - sizeof(usb_standard_interface_descriptor_t)+ - hub_descriptor_size; - return descriptor; -} - + /** * create answer to a descriptor request @@ -344,10 +366,6 @@ case USB_DESCTYPE_CONFIGURATION: { usb_log_debug("USB_DESCTYPE_CONFIGURATION\n"); - usb_standard_configuration_descriptor_t * descriptor = - usb_ohci_rh_create_standart_configuration_descriptor( - instance); - result_descriptor = descriptor; - size = sizeof(usb_standard_configuration_descriptor_t); - del = true; + result_descriptor = instance->descriptors.configuration; + size = instance->descriptors.configuration_size; break; } @@ -380,5 +398,7 @@ } request->transfered_size = size; - memcpy(request->buffer,result_descriptor,size); + memcpy(request->transport_buffer,result_descriptor,size); + usb_log_debug("sent desctiptor: %s\n", + usb_debug_str_buffer((uint8_t*)request->transport_buffer,size,size)); if (del) free(result_descriptor); Index: uspace/drv/ohci/root_hub.h =================================================================== --- uspace/drv/ohci/root_hub.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/ohci/root_hub.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -37,4 +37,5 @@ #include +#include #include "ohci_regs.h" @@ -53,4 +54,6 @@ /** hub port count */ int port_count; + /** hubs descriptors */ + usb_device_descriptors_t descriptors; } rh_t; Index: uspace/drv/pciintel/pci.c =================================================================== --- uspace/drv/pciintel/pci.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/pciintel/pci.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -48,4 +48,5 @@ #include +#include #include #include @@ -325,5 +326,5 @@ if (match_id_str == NULL) { - printf(NAME ": out of memory creating match ID.\n"); + ddf_msg(LVL_ERROR, "Out of memory creating match ID."); return; } @@ -331,5 +332,5 @@ rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 90); if (rc != EOK) { - printf(NAME ": error adding match ID: %s\n", + ddf_msg(LVL_ERROR, "Failed adding match ID: %s", str_error(rc)); } @@ -428,7 +429,7 @@ if (range_addr != 0) { - printf(NAME ": function %s : ", fun->fnode->name); - printf("address = %" PRIx64, range_addr); - printf(", size = %x\n", (unsigned int) range_size); + ddf_msg(LVL_DEBUG, "Function %s : address = %" PRIx64 + ", size = %x", fun->fnode->name, range_addr, + (unsigned int) range_size); } @@ -455,5 +456,5 @@ hw_res_list->count++; - printf(NAME ": function %s uses irq %x.\n", fun->fnode->name, irq); + ddf_msg(LVL_NOTE, "Function %s uses irq %x.", fun->fnode->name, irq); } @@ -511,5 +512,5 @@ char *fun_name = pci_fun_create_name(fun); if (fun_name == NULL) { - printf(NAME ": out of memory.\n"); + ddf_msg(LVL_ERROR, "Out of memory."); return; } @@ -517,5 +518,5 @@ fnode = ddf_fun_create(bus->dnode, fun_inner, fun_name); if (fnode == NULL) { - printf(NAME ": error creating function.\n"); + ddf_msg(LVL_ERROR, "Failed creating function."); return; } @@ -531,5 +532,5 @@ fnode->driver_data = fun; - printf(NAME ": adding new function %s.\n", + ddf_msg(LVL_DEBUG, "Adding new function %s.", fnode->name); @@ -548,6 +549,7 @@ child_bus = pci_conf_read_8(fun, PCI_BRIDGE_SEC_BUS_NUM); - printf(NAME ": device is pci-to-pci bridge, " - "secondary bus number = %d.\n", bus_num); + ddf_msg(LVL_DEBUG, "Device is pci-to-pci " + "bridge, secondary bus number = %d.", + bus_num); if (child_bus > bus_num) pci_bus_scan(bus, child_bus); @@ -571,10 +573,10 @@ int rc; - printf(NAME ": pci_add_device\n"); + ddf_msg(LVL_DEBUG, "pci_add_device"); dnode->parent_phone = -1; bus = pci_bus_new(); if (bus == NULL) { - printf(NAME ": pci_add_device allocation failed.\n"); + ddf_msg(LVL_ERROR, "pci_add_device allocation failed."); rc = ENOMEM; goto fail; @@ -586,6 +588,6 @@ IPC_FLAG_BLOCKING); if (dnode->parent_phone < 0) { - printf(NAME ": pci_add_device failed to connect to the " - "parent's driver.\n"); + ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the " + "parent's driver."); rc = dnode->parent_phone; goto fail; @@ -596,11 +598,11 @@ rc = hw_res_get_resource_list(dnode->parent_phone, &hw_resources); if (rc != EOK) { - printf(NAME ": pci_add_device failed to get hw resources for " - "the device.\n"); + ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources " + "for the device."); goto fail; } got_res = true; - printf(NAME ": conf_addr = %" PRIx64 ".\n", + ddf_msg(LVL_DEBUG, "conf_addr = %" PRIx64 ".", hw_resources.resources[0].res.io_range.address); @@ -614,5 +616,5 @@ if (pio_enable((void *)(uintptr_t)bus->conf_io_addr, 8, &bus->conf_addr_port)) { - printf(NAME ": failed to enable configuration ports.\n"); + ddf_msg(LVL_ERROR, "Failed to enable configuration ports."); rc = EADDRNOTAVAIL; goto fail; @@ -621,9 +623,9 @@ /* Make the bus device more visible. It has no use yet. */ - printf(NAME ": adding a 'ctl' function\n"); + ddf_msg(LVL_DEBUG, "Adding a 'ctl' function"); ctl = ddf_fun_create(bus->dnode, fun_exposed, "ctl"); if (ctl == NULL) { - printf(NAME ": error creating control function.\n"); + ddf_msg(LVL_ERROR, "Failed creating control function."); rc = ENOMEM; goto fail; @@ -632,10 +634,10 @@ rc = ddf_fun_bind(ctl); if (rc != EOK) { - printf(NAME ": error binding control function.\n"); + ddf_msg(LVL_ERROR, "Failed binding control function."); goto fail; } /* Enumerate functions. */ - printf(NAME ": scanning the bus\n"); + ddf_msg(LVL_DEBUG, "Scanning the bus"); pci_bus_scan(bus, 0); @@ -659,4 +661,5 @@ static void pciintel_init(void) { + ddf_log_init(NAME, LVL_ERROR); pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops; pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops; @@ -738,5 +741,5 @@ int main(int argc, char *argv[]) { - printf(NAME ": HelenOS pci bus driver (intel method 1).\n"); + printf(NAME ": HelenOS PCI bus driver (Intel method 1).\n"); pciintel_init(); return ddf_driver_main(&pci_driver); Index: uspace/drv/root/root.c =================================================================== --- uspace/drv/root/root.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/root/root.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -52,4 +52,5 @@ #include +#include #include #include @@ -89,11 +90,11 @@ int rc; - printf(NAME ": adding new function for virtual devices.\n"); - printf(NAME ": function node is `%s' (%d %s)\n", name, + ddf_msg(LVL_DEBUG, "Adding new function for virtual devices. " + "Function node is `%s' (%d %s)", name, VIRTUAL_FUN_MATCH_SCORE, VIRTUAL_FUN_MATCH_ID); fun = ddf_fun_create(dev, fun_inner, name); if (fun == NULL) { - printf(NAME ": error creating function %s\n", name); + ddf_msg(LVL_ERROR, "Failed creating function %s", name); return ENOMEM; } @@ -102,5 +103,6 @@ VIRTUAL_FUN_MATCH_SCORE); if (rc != EOK) { - printf(NAME ": error adding match IDs to function %s\n", name); + ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s", + name); ddf_fun_destroy(fun); return rc; @@ -109,5 +111,5 @@ rc = ddf_fun_bind(fun); if (rc != EOK) { - printf(NAME ": error binding function %s: %s\n", name, + ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name, str_error(rc)); ddf_fun_destroy(fun); @@ -136,5 +138,5 @@ platform = sysinfo_get_data("platform", &platform_size); if (platform == NULL) { - printf(NAME ": Failed to obtain platform name.\n"); + ddf_msg(LVL_ERROR, "Failed to obtain platform name."); return ENOENT; } @@ -143,5 +145,5 @@ platform = realloc(platform, platform_size + 1); if (platform == NULL) { - printf(NAME ": Memory allocation failed.\n"); + ddf_msg(LVL_ERROR, "Memory allocation failed."); return ENOMEM; } @@ -151,16 +153,16 @@ /* Construct match ID. */ if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) { - printf(NAME ": Memory allocation failed.\n"); + ddf_msg(LVL_ERROR, "Memory allocation failed."); return ENOMEM; } /* Add function. */ - printf(NAME ": adding platform function\n"); - printf(NAME ": function node is `%s' (%d %s)\n", PLATFORM_FUN_NAME, - PLATFORM_FUN_MATCH_SCORE, match_id); + ddf_msg(LVL_DEBUG, "Adding platform function. Function node is `%s' " + " (%d %s)", PLATFORM_FUN_NAME, PLATFORM_FUN_MATCH_SCORE, + match_id); fun = ddf_fun_create(dev, fun_inner, name); if (fun == NULL) { - printf(NAME ": error creating function %s\n", name); + ddf_msg(LVL_ERROR, "Error creating function %s", name); return ENOMEM; } @@ -168,5 +170,6 @@ rc = ddf_fun_add_match_id(fun, match_id, PLATFORM_FUN_MATCH_SCORE); if (rc != EOK) { - printf(NAME ": error adding match IDs to function %s\n", name); + ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s", + name); ddf_fun_destroy(fun); return rc; @@ -175,5 +178,5 @@ rc = ddf_fun_bind(fun); if (rc != EOK) { - printf(NAME ": error binding function %s: %s\n", name, + ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name, str_error(rc)); ddf_fun_destroy(fun); @@ -191,5 +194,5 @@ static int root_add_device(ddf_dev_t *dev) { - printf(NAME ": root_add_device, device handle=%" PRIun "\n", + ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun, dev->handle); @@ -204,5 +207,5 @@ int res = add_platform_fun(dev); if (EOK != res) - printf(NAME ": failed to add child device for platform.\n"); + ddf_msg(LVL_ERROR, "Failed adding child device for platform."); return res; @@ -212,4 +215,6 @@ { printf(NAME ": HelenOS root device driver\n"); + + ddf_log_init(NAME, LVL_ERROR); return ddf_driver_main(&root_driver); } Index: uspace/drv/rootpc/rootpc.c =================================================================== --- uspace/drv/rootpc/rootpc.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/rootpc/rootpc.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -47,4 +47,5 @@ #include +#include #include #include @@ -119,5 +120,5 @@ rootpc_fun_t *fun) { - printf(NAME ": adding new function '%s'.\n", name); + ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); ddf_fun_t *fnode = NULL; @@ -145,5 +146,5 @@ /* Register function. */ if (ddf_fun_bind(fnode) != EOK) { - printf(NAME ": error binding function %s.\n", name); + ddf_msg(LVL_ERROR, "Failed binding function %s.", name); goto failure; } @@ -158,5 +159,5 @@ ddf_fun_destroy(fnode); - printf(NAME ": failed to add function '%s'.\n", name); + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); return false; @@ -176,10 +177,10 @@ static int rootpc_add_device(ddf_dev_t *dev) { - printf(NAME ": rootpc_add_device, device handle = %d\n", + ddf_msg(LVL_DEBUG, "rootpc_add_device, device handle = %d", (int)dev->handle); /* Register functions. */ if (!rootpc_add_functions(dev)) { - printf(NAME ": failed to add functions for PC platform.\n"); + ddf_msg(LVL_ERROR, "Failed to add functions for PC platform."); } @@ -189,4 +190,5 @@ static void root_pc_init(void) { + ddf_log_init(NAME, LVL_ERROR); rootpc_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops; } Index: uspace/drv/rootvirt/rootvirt.c =================================================================== --- uspace/drv/rootvirt/rootvirt.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/rootvirt/rootvirt.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -40,4 +40,5 @@ #include #include +#include #define NAME "rootvirt" @@ -83,10 +84,10 @@ int rc; - printf(NAME ": registering function `%s' (match \"%s\")\n", + ddf_msg(LVL_DEBUG, "Registering function `%s' (match \"%s\")", vfun->name, vfun->match_id); fun = ddf_fun_create(vdev, fun_inner, vfun->name); if (fun == NULL) { - printf(NAME ": error creating function %s\n", vfun->name); + ddf_msg(LVL_ERROR, "Failed creating function %s", vfun->name); return ENOMEM; } @@ -94,5 +95,5 @@ rc = ddf_fun_add_match_id(fun, vfun->match_id, 10); if (rc != EOK) { - printf(NAME ": error adding match IDs to function %s\n", + ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s", vfun->name); ddf_fun_destroy(fun); @@ -102,11 +103,11 @@ rc = ddf_fun_bind(fun); if (rc != EOK) { - printf(NAME ": error binding function %s: %s\n", vfun->name, - str_error(rc)); + ddf_msg(LVL_ERROR, "Failed binding function %s: %s", + vfun->name, str_error(rc)); ddf_fun_destroy(fun); return rc; } - printf(NAME ": registered child device `%s'\n", vfun->name); + ddf_msg(LVL_NOTE, "Registered child device `%s'", vfun->name); return EOK; } @@ -124,5 +125,5 @@ } - printf(NAME ": add_device(handle=%d)\n", (int)dev->handle); + ddf_msg(LVL_DEBUG, "add_device(handle=%d)", (int)dev->handle); /* @@ -142,4 +143,6 @@ { printf(NAME ": HelenOS virtual devices root driver\n"); + + ddf_log_init(NAME, LVL_ERROR); return ddf_driver_main(&rootvirt_driver); } Index: uspace/drv/test1/test1.c =================================================================== --- uspace/drv/test1/test1.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/test1/test1.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -35,4 +35,5 @@ #include #include +#include #include "test1.h" @@ -58,34 +59,49 @@ */ static int register_fun_verbose(ddf_dev_t *parent, const char *message, - const char *name, const char *match_id, int match_score) + const char *name, const char *match_id, int match_score, + int expected_rc) { - ddf_fun_t *fun; + ddf_fun_t *fun = NULL; int rc; - printf(NAME ": registering function `%s': %s.\n", name, message); + ddf_msg(LVL_DEBUG, "Registering function `%s': %s.", name, message); fun = ddf_fun_create(parent, fun_inner, name); if (fun == NULL) { - printf(NAME ": error creating function %s\n", name); - return ENOMEM; + ddf_msg(LVL_ERROR, "Failed creating function %s", name); + rc = ENOMEM; + goto leave; } - rc = ddf_fun_add_match_id(fun, match_id, match_score); + rc = ddf_fun_add_match_id(fun, str_dup(match_id), match_score); if (rc != EOK) { - printf(NAME ": error adding match IDs to function %s\n", name); - ddf_fun_destroy(fun); - return rc; + ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s", + name); + goto leave; } rc = ddf_fun_bind(fun); if (rc != EOK) { - printf(NAME ": error binding function %s: %s\n", name, + ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name, str_error(rc)); - ddf_fun_destroy(fun); - return rc; + goto leave; } - printf(NAME ": registered child device `%s'\n", name); - return EOK; + ddf_msg(LVL_NOTE, "Registered child device `%s'", name); + rc = EOK; + +leave: + if (rc != expected_rc) { + fprintf(stderr, + NAME ": Unexpected error registering function `%s'.\n" + NAME ": Expected \"%s\" but got \"%s\".\n", + name, str_error(expected_rc), str_error(rc)); + } + + if ((rc != EOK) && (fun != NULL)) { + ddf_fun_destroy(fun); + } + + return rc; } @@ -112,10 +128,10 @@ int rc; - printf(NAME ": add_device(name=\"%s\", handle=%d)\n", + ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)", dev->name, (int) dev->handle); fun_a = ddf_fun_create(dev, fun_exposed, "a"); if (fun_a == NULL) { - printf(NAME ": error creating function 'a'.\n"); + ddf_msg(LVL_ERROR, "Failed creating function 'a'."); return ENOMEM; } @@ -123,5 +139,5 @@ rc = ddf_fun_bind(fun_a); if (rc != EOK) { - printf(NAME ": error binding function 'a'.\n"); + ddf_msg(LVL_ERROR, "Failed binding function 'a'."); return rc; } @@ -133,12 +149,17 @@ ddf_fun_add_to_class(fun_a, "virt-null"); } else if (str_cmp(dev->name, "test1") == 0) { - (void) register_fun_verbose(dev, "cloning myself ;-)", "clone", - "virtual&test1", 10); + (void) register_fun_verbose(dev, + "cloning myself ;-)", "clone", + "virtual&test1", 10, EOK); + (void) register_fun_verbose(dev, + "cloning myself twice ;-)", "clone", + "virtual&test1", 10, EEXISTS); } else if (str_cmp(dev->name, "clone") == 0) { - (void) register_fun_verbose(dev, "run by the same task", "child", - "virtual&test1&child", 10); + (void) register_fun_verbose(dev, + "run by the same task", "child", + "virtual&test1&child", 10, EOK); } - printf(NAME ": device `%s' accepted.\n", dev->name); + ddf_msg(LVL_DEBUG, "Device `%s' accepted.", dev->name); return EOK; @@ -148,4 +169,5 @@ { printf(NAME ": HelenOS test1 virtual device driver\n"); + ddf_log_init(NAME, LVL_ERROR); return ddf_driver_main(&test1_driver); } Index: uspace/drv/test2/test2.c =================================================================== --- uspace/drv/test2/test2.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/test2/test2.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -36,4 +36,5 @@ #include #include +#include #define NAME "test2" @@ -64,9 +65,9 @@ int rc; - printf(NAME ": registering function `%s': %s.\n", name, message); + ddf_msg(LVL_DEBUG, "Registering function `%s': %s.", name, message); fun = ddf_fun_create(parent, fun_inner, name); if (fun == NULL) { - printf(NAME ": error creating function %s\n", name); + ddf_msg(LVL_ERROR, "Failed creating function %s", name); return ENOMEM; } @@ -74,5 +75,6 @@ rc = ddf_fun_add_match_id(fun, match_id, match_score); if (rc != EOK) { - printf(NAME ": error adding match IDs to function %s\n", name); + ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s", + name); ddf_fun_destroy(fun); return rc; @@ -81,5 +83,5 @@ rc = ddf_fun_bind(fun); if (rc != EOK) { - printf(NAME ": error binding function %s: %s\n", name, + ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name, str_error(rc)); ddf_fun_destroy(fun); @@ -87,5 +89,5 @@ } - printf(NAME ": registered child device `%s'\n", name); + ddf_msg(LVL_NOTE, "Registered child device `%s'", name); return EOK; } @@ -111,5 +113,5 @@ fun_a = ddf_fun_create(dev, fun_exposed, "a"); if (fun_a == NULL) { - printf(NAME ": error creating function 'a'.\n"); + ddf_msg(LVL_ERROR, "Failed creating function 'a'."); return ENOMEM; } @@ -117,5 +119,5 @@ rc = ddf_fun_bind(fun_a); if (rc != EOK) { - printf(NAME ": error binding function 'a'.\n"); + ddf_msg(LVL_ERROR, "Failed binding function 'a'."); return rc; } @@ -128,5 +130,5 @@ static int test2_add_device(ddf_dev_t *dev) { - printf(NAME ": test2_add_device(name=\"%s\", handle=%d)\n", + ddf_msg(LVL_DEBUG, "test2_add_device(name=\"%s\", handle=%d)", dev->name, (int) dev->handle); @@ -134,5 +136,5 @@ fid_t postpone = fibril_create(postponed_birth, dev); if (postpone == 0) { - printf(NAME ": fibril_create() error\n"); + ddf_msg(LVL_ERROR, "fibril_create() failed."); return ENOMEM; } @@ -149,4 +151,5 @@ { printf(NAME ": HelenOS test2 virtual device driver\n"); + ddf_log_init(NAME, LVL_ERROR); return ddf_driver_main(&test2_driver); } Index: uspace/drv/usbhub/usbhub.c =================================================================== --- uspace/drv/usbhub/usbhub.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/usbhub/usbhub.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -74,6 +74,6 @@ while(errorCode == EOK){ + async_usleep(1000 * 1000 * 10 );/// \TODO proper number once errorCode = usb_hub_check_hub_changes(hub_info); - async_usleep(1000 * 1000 );/// \TODO proper number once } usb_log_error("something in ctrl loop went wrong, errno %d\n",errorCode); Index: uspace/drv/usbkbd/kbddev.c =================================================================== --- uspace/drv/usbkbd/kbddev.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/usbkbd/kbddev.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -56,4 +56,5 @@ #include #include +#include #include @@ -69,15 +70,16 @@ static const unsigned DEFAULT_ACTIVE_MODS = KM_NUM_LOCK; -/** Boot protocol report size (key part). */ -static const size_t BOOTP_REPORT_SIZE = 6; - -/** Boot protocol total report size. */ -static const size_t BOOTP_BUFFER_SIZE = 8; - -/** Boot protocol output report size. */ -static const size_t BOOTP_BUFFER_OUT_SIZE = 1; - -/** Boot protocol error key code. */ -static const uint8_t BOOTP_ERROR_ROLLOVER = 1; +///** Boot protocol report size (key part). */ +//static const size_t BOOTP_REPORT_SIZE = 6; + +///** Boot protocol total report size. */ +//static const size_t BOOTP_BUFFER_SIZE = 8; + +///** Boot protocol output report size. */ +//static const size_t BOOTP_BUFFER_OUT_SIZE = 1; + +///** Boot protocol error key code. */ +//static const uint8_t BOOTP_ERROR_ROLLOVER = 1; +static const uint8_t ERROR_ROLLOVER = 1; /** Default idle rate for keyboards. */ @@ -263,20 +265,20 @@ static void usb_kbd_set_led(usb_kbd_t *kbd_dev) { - uint8_t buffer[BOOTP_BUFFER_OUT_SIZE]; - int rc= 0; - - memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE); - uint8_t leds = 0; - - if (kbd_dev->mods & KM_NUM_LOCK) { - leds |= USB_HID_LED_NUM_LOCK; - } - - if (kbd_dev->mods & KM_CAPS_LOCK) { - leds |= USB_HID_LED_CAPS_LOCK; - } - - if (kbd_dev->mods & KM_SCROLL_LOCK) { - leds |= USB_HID_LED_SCROLL_LOCK; + unsigned i = 0; + + /* Reset the LED data. */ + memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t)); + + if ((kbd_dev->mods & KM_NUM_LOCK) && (i < kbd_dev->led_output_size)) { + kbd_dev->led_data[i++] = USB_HID_LED_NUM_LOCK; + } + + if ((kbd_dev->mods & KM_CAPS_LOCK) && (i < kbd_dev->led_output_size)) { + kbd_dev->led_data[i++] = USB_HID_LED_CAPS_LOCK; + } + + if ((kbd_dev->mods & KM_SCROLL_LOCK) + && (i < kbd_dev->led_output_size)) { + kbd_dev->led_data[i++] = USB_HID_LED_SCROLL_LOCK; } @@ -284,20 +286,22 @@ usb_log_debug("Creating output report.\n"); - usb_log_debug("Leds: 0x%x\n", leds); - if ((rc = usb_hid_boot_keyboard_output_report( - leds, buffer, BOOTP_BUFFER_OUT_SIZE)) != EOK) { - usb_log_warning("Error composing output report to the keyboard:" - "%s.\n", str_error(rc)); + + int rc = usb_hid_report_output_translate(kbd_dev->parser, + kbd_dev->led_path, USB_HID_PATH_COMPARE_END, kbd_dev->output_buffer, + kbd_dev->output_size, kbd_dev->led_data, kbd_dev->led_output_size); + + if (rc != EOK) { + usb_log_warning("Error translating LED output to output report" + ".\n"); return; } usb_log_debug("Output report buffer: %s\n", - usb_debug_str_buffer(buffer, BOOTP_BUFFER_OUT_SIZE, 0)); - - assert(kbd_dev->usb_dev != NULL); + usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size, + 0)); usbhid_req_set_report(&kbd_dev->usb_dev->ctrl_pipe, kbd_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_OUTPUT, - buffer, BOOTP_BUFFER_OUT_SIZE); + kbd_dev->output_buffer, kbd_dev->output_size); } @@ -450,14 +454,14 @@ * First of all, check if the kbd have reported phantom state. * - * this must be changed as we don't know which keys are modifiers - * and which are regular keys. + * As there is no way to distinguish keys from modifiers, we do not have + * a way to check that 'all keys report Error Rollover'. We thus check + * if there is at least one such error and in such case we ignore the + * whole input report. */ i = 0; - // all fields should report Error Rollover - while (i < count && - key_codes[i] == BOOTP_ERROR_ROLLOVER) { + while (i < count && key_codes[i] != ERROR_ROLLOVER) { ++i; } - if (i == count) { + if (i != count) { usb_log_debug("Phantom state occured.\n"); // phantom state, do nothing @@ -586,5 +590,5 @@ */ static void usb_kbd_process_data(usb_kbd_t *kbd_dev, - uint8_t *buffer, size_t actual_size) + uint8_t *buffer, size_t actual_size) { assert(kbd_dev->initialized == USB_KBD_STATUS_INITIALIZED); @@ -760,6 +764,5 @@ usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count); - kbd_dev->keys = (uint8_t *)calloc( - kbd_dev->key_count, sizeof(uint8_t)); + kbd_dev->keys = (uint8_t *)calloc(kbd_dev->key_count, sizeof(uint8_t)); if (kbd_dev->keys == NULL) { @@ -768,8 +771,49 @@ } + /* + * Output report + */ + kbd_dev->output_size = 0; + kbd_dev->output_buffer = usb_hid_report_output(kbd_dev->parser, + &kbd_dev->output_size); + if (kbd_dev->output_buffer == NULL) { + usb_log_warning("Error creating output report buffer.\n"); + free(kbd_dev->keys); + return ENOMEM; /* TODO: other error code */ + } + + usb_log_debug("Output buffer size: %zu\n", kbd_dev->output_size); + + kbd_dev->led_path = usb_hid_report_path(); + usb_hid_report_path_append_item( + kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0); + + kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser, + kbd_dev->led_path, USB_HID_PATH_COMPARE_END); + + usb_log_debug("Output report size (in items): %zu\n", + kbd_dev->led_output_size); + + kbd_dev->led_data = (int32_t *)calloc( + kbd_dev->led_output_size, sizeof(int32_t)); + + if (kbd_dev->led_data == NULL) { + usb_log_warning("Error creating buffer for LED output report." + "\n"); + free(kbd_dev->keys); + usb_hid_report_output_free(kbd_dev->output_buffer); + return ENOMEM; + } + + /* + * Modifiers and locks + */ kbd_dev->modifiers = 0; kbd_dev->mods = DEFAULT_ACTIVE_MODS; kbd_dev->lock_keys = 0; + /* + * Autorepeat + */ kbd_dev->repeat.key_new = 0; kbd_dev->repeat.key_repeated = 0; @@ -879,4 +923,7 @@ } + // free the output buffer + usb_hid_report_output_free((*kbd_dev)->output_buffer); + /* TODO: what about the USB device structure?? */ Index: uspace/drv/usbkbd/kbddev.h =================================================================== --- uspace/drv/usbkbd/kbddev.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/drv/usbkbd/kbddev.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -94,4 +94,14 @@ /** Report descriptor size. */ size_t report_desc_size; + + uint8_t *output_buffer; + + size_t output_size; + + size_t led_output_size; + + usb_hid_report_path_t *led_path; + + int32_t *led_data; /** HID Report parser. */ Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/c/Makefile (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -77,4 +77,5 @@ generic/io/io.c \ generic/io/printf.c \ + generic/io/log.c \ generic/io/klog.c \ generic/io/snprintf.c \ Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/c/generic/devman.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -147,6 +147,4 @@ ret = devman_send_match_id(phone, match_id); if (ret != EOK) { - printf("Driver failed to send match id, error %d\n", - ret); return ret; } @@ -195,10 +193,15 @@ } - devman_send_match_ids(phone, match_ids); - - async_wait_for(req, &retval); - - async_serialize_end(); - + int match_ids_rc = devman_send_match_ids(phone, match_ids); + + async_wait_for(req, &retval); + + async_serialize_end(); + + /* Prefer the answer to DEVMAN_ADD_FUNCTION in case of errors. */ + if ((match_ids_rc != EOK) && (retval == EOK)) { + retval = match_ids_rc; + } + if (retval == EOK) fun_handle = (int) IPC_GET_ARG1(answer); @@ -326,4 +329,49 @@ } +int devman_device_get_handle_by_class(const char *classname, + const char *devname, devman_handle_t *handle, unsigned int flags) +{ + int phone = devman_get_phone(DEVMAN_CLIENT, flags); + + if (phone < 0) + return phone; + + async_serialize_start(); + + ipc_call_t answer; + aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_HANDLE_BY_CLASS, + flags, &answer); + + sysarg_t retval = async_data_write_start(phone, classname, + str_size(classname)); + if (retval != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + return retval; + } + retval = async_data_write_start(phone, devname, + str_size(devname)); + if (retval != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + return retval; + } + + async_wait_for(req, &retval); + + async_serialize_end(); + + if (retval != EOK) { + if (handle != NULL) + *handle = (devman_handle_t) -1; + return retval; + } + + if (handle != NULL) + *handle = (devman_handle_t) IPC_GET_ARG1(answer); + + return retval; +} + /** @} Index: uspace/lib/c/generic/io/log.c =================================================================== --- uspace/lib/c/generic/io/log.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) +++ uspace/lib/c/generic/io/log.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libc + * @{ + */ + +#include +#include +#include +#include +#include +#include + +#include + +/** Serialization mutex for logging functions. */ +static FIBRIL_MUTEX_INITIALIZE(log_serializer); + +/** Current log level. */ +static log_level_t log_level; + +static FILE *log_stream; + +static const char *log_prog_name; + +/** Prefixes for individual logging levels. */ +static const char *log_level_names[] = { + [LVL_FATAL] = "Fatal error", + [LVL_ERROR] = "Error", + [LVL_WARN] = "Warning", + [LVL_NOTE] = "Note", + [LVL_DEBUG] = "Debug", + [LVL_DEBUG2] = "Debug2" +}; + +/** Initialize the logging system. + * + * @param prog_name Program name, will be printed as part of message + * @param level Minimum message level to print + */ +int log_init(const char *prog_name, log_level_t level) +{ + assert(level < LVL_LIMIT); + log_level = level; + + log_stream = stdout; + log_prog_name = str_dup(prog_name); + if (log_prog_name == NULL) + return ENOMEM; + + return EOK; +} + +/** Write an entry to the log. + * + * @param level Message verbosity level. Message is only printed + * if verbosity is less than or equal to current + * reporting level. + * @param fmt Format string (no traling newline). + */ +void log_msg(log_level_t level, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + log_msgv(level, fmt, args); + va_end(args); +} + +/** Write an entry to the log (va_list variant). + * + * @param level Message verbosity level. Message is only printed + * if verbosity is less than or equal to current + * reporting level. + * @param fmt Format string (no trailing newline) + */ +void log_msgv(log_level_t level, const char *fmt, va_list args) +{ + assert(level < LVL_LIMIT); + + /* Higher number means higher verbosity. */ + if (level <= log_level) { + fibril_mutex_lock(&log_serializer); + + fprintf(log_stream, "%s: %s: ", log_prog_name, + log_level_names[level]); + vfprintf(log_stream, fmt, args); + fputc('\n', log_stream); + fflush(log_stream); + + fibril_mutex_unlock(&log_serializer); + } +} + +/** @} + */ Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/c/include/devman.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -53,4 +53,6 @@ extern int devman_device_get_handle(const char *, devman_handle_t *, unsigned int); +extern int devman_device_get_handle_by_class(const char *, const char *, + devman_handle_t *, unsigned int); extern int devman_add_device_to_class(devman_handle_t, const char *); Index: uspace/lib/c/include/io/log.h =================================================================== --- uspace/lib/c/include/io/log.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) +++ uspace/lib/c/include/io/log.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libc + * @{ + */ + +#ifndef LIBC_IO_LOG_H_ +#define LIBC_IO_LOG_H_ + +#include + +typedef enum { + LVL_FATAL, + LVL_ERROR, + LVL_WARN, + LVL_NOTE, + LVL_DEBUG, + LVL_DEBUG2, + + /** For checking range of values */ + LVL_LIMIT +} log_level_t; + +extern int log_init(const char *, log_level_t); +extern void log_msg(log_level_t, const char *, ...); +extern void log_msgv(log_level_t, const char *, va_list); + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/c/include/ipc/devman.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -148,5 +148,6 @@ typedef enum { - DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD + DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD, + DEVMAN_DEVICE_GET_HANDLE_BY_CLASS } client_to_devman_t; Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/drv/Makefile (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -36,4 +36,5 @@ generic/dev_iface.c \ generic/remote_char_dev.c \ + generic/log.c \ generic/remote_hw_res.c \ generic/remote_usb.c \ Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/drv/generic/driver.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -273,12 +273,6 @@ res = driver->driver_ops->add_device(dev); - if (res == EOK) { - printf("%s: new device with handle=%" PRIun " was added.\n", - driver->name, dev_handle); - } else { - printf("%s: failed to add a new device with handle = %" PRIun ".\n", - driver->name, dev_handle); + if (res != EOK) delete_device(dev); - } async_answer_0(iid, res); Index: uspace/lib/drv/generic/log.c =================================================================== --- uspace/lib/drv/generic/log.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) +++ uspace/lib/drv/generic/log.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -0,0 +1,65 @@ +/* + * 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 libdrv + * @{ + */ + +#include +#include + +#include + +/** Initialize the logging system. + * + * @param drv_name Driver name, will be printed as part of message + * @param level Minimum message level to print + */ +int ddf_log_init(const char *drv_name, log_level_t level) +{ + return log_init(drv_name, level); +} + +/** Log a driver message. + * + * @param level Message verbosity level. Message is only printed + * if verbosity is less than or equal to current + * reporting level. + * @param fmt Format string (no trailing newline) + */ +void ddf_msg(log_level_t level, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + log_msgv(level, fmt, args); + va_end(args); +} + +/** @} + */ Index: uspace/lib/drv/include/ddf/log.h =================================================================== --- uspace/lib/drv/include/ddf/log.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) +++ uspace/lib/drv/include/ddf/log.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -0,0 +1,44 @@ +/* + * 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 libdrv + * @{ + */ + +#ifndef DDF_LOG_H_ +#define DDF_LOG_H_ + +#include + +extern int ddf_log_init(const char *, log_level_t); +extern void ddf_msg(log_level_t, const char *, ...); + +#endif + +/** @} + */ Index: uspace/lib/usb/include/usb/classes/hid/utled.h =================================================================== --- uspace/lib/usb/include/usb/classes/hid/utled.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) +++ uspace/lib/usb/include/usb/classes/hid/utled.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2010 Lubos Slovak + * 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 libusb + * @{ + */ +/** @file + * @brief USB HID Usage Tables - LED page. + */ +#ifndef LIBUSB_UTLED_H_ +#define LIBUSB_UTLED_H_ + +typedef enum { + USB_HID_LED_UNDEFINED = 0, + USB_HID_LED_NUM_LOCK, + USB_HID_LED_CAPS_LOCK, + USB_HID_LED_SCROLL_LOCK, + USB_HID_LED_COMPOSE, + USB_HID_LED_KANA, + USB_HID_LED_POWER, + USB_HID_LED_SHIFT, + USB_HID_LED_DND, + USB_HID_LED_MUTE, + USB_HID_LED_TONE_ENABLE, + USB_HID_LED_HIGH_CUT_FILTER, + USB_HID_LED_LOW_CUT_FILTER, + USB_HID_LED_EQ_ENABLE, + USB_HID_LED_SOUND_FIELD_ON, + USB_HID_LED_SURROUND_ON, + USB_HID_LED_REPEAT, + USB_HID_LED_STEREO, + USB_HID_LED_SAMPLING_RATE_DETECT, + USB_HID_LED_SPINNING, + USB_HID_LED_CAV, + USB_HID_LED_CLV, + USB_HID_LED_RECORDING_FORMAT_DETECT, + USB_HID_LED_OFF_HOOK, + USB_HID_LED_RING, + USB_HID_LED_MESSAGE_WAITING, + USB_HID_LED_DATA_MODE, + USB_HID_LED_BATTERY_OPERATION, + USB_HID_LED_BATTERY_OK, + USB_HID_LED_BATTERY_LOW, + USB_HID_LED_SPEAKER, + USB_HID_LED_HEAD_SET, + USB_HID_LED_HOLD, + USB_HID_LED_MICRO, + USB_HID_LED_COVERAGE, + USB_HID_LED_NIGHT_MODE, + USB_HID_LED_SEND_CALLS, + USB_HID_LED_CALL_PICKUP, + USB_HID_LED_CONFERENCE, + USB_HID_LED_STAND_BY, + USB_HID_LED_CAMERA_ON, + USB_HID_LED_CAMERA_OFF, + USB_HID_LED_ON_LINE, + USB_HID_LED_OFF_LINE, + USB_HID_LED_BUSY, + USB_HID_LED_READY, + USB_HID_LED_PAPER_OUT, + USB_HID_LED_PAPER_JAM, + USB_HID_LED_REMOTE, + USB_HID_LED_FORWARD, + USB_HID_LED_REVERSE, + USB_HID_LED_STOP, + USB_HID_LED_REWIND, + USB_HID_LED_FAST_FORWARD, + USB_HID_LED_PLAY, + USB_HID_LED_PAUSE, + USB_HID_LED_RECORD, + USB_HID_LED_ERROR, + USB_HID_LED_USAGE_SELECTED_IND, + USB_HID_LED_USAGE_IN_USE_IND, + USB_HID_LED_USAGE_MULTI_MODE_IND, + USB_HID_LED_IND_ON, + USB_HID_LED_IND_FLASH, + USB_HID_LED_IND_SLOW_BLINK, + USB_HID_LED_IND_FAST_BLINK, + USB_HID_LED_IND_OFF, + USB_HID_LED_FLASH_ON_TIME, + USB_HID_LED_SLOW_BLINK_ON_TIME, + USB_HID_LED_SLOW_BLINK_OFF_TIME, + USB_HID_LED_FAST_BLINK_ON_TIME, + USB_HID_LED_FAST_BLINK_OFF_TIME, + USB_HID_LED_USAGE_IND_COLOR, + USB_HID_LED_IND_RED, + USB_HID_LED_IND_GREEN, + USB_HID_LED_IND_AMBER, + USB_HID_LED_GENERIC_IND, + USB_HID_LED_SYSTEM_SUSPEND, + USB_HID_LED_EXTERNAL_POWER +} usb_hid_usage_led_t; + +#endif /* LIBUSB_UTLED_H_ */ +/** + * @} + */ Index: uspace/lib/usb/include/usb/classes/hidparser.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidparser.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/usb/include/usb/classes/hidparser.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -31,5 +31,5 @@ */ /** @file - * @brief USB HID parser. + * USB HID report descriptor and report data parser */ #ifndef LIBUSB_HIDPARSER_H_ @@ -74,13 +74,20 @@ #define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 4 +/** */ typedef struct { + /** */ int32_t usage_page; + /** */ int32_t usage; - + /** */ link_t link; } usb_hid_report_usage_path_t; +/** */ typedef struct { + /** */ int depth; + + /** */ link_t link; } usb_hid_report_path_t; @@ -90,32 +97,50 @@ */ typedef struct { + /** */ int32_t id; + /** */ int32_t usage_minimum; + /** */ int32_t usage_maximum; + /** */ int32_t logical_minimum; + /** */ int32_t logical_maximum; + /** */ int32_t size; + /** */ int32_t count; + /** */ size_t offset; + /** */ int32_t delimiter; - + /** */ int32_t unit_exponent; + /** */ int32_t unit; - /* - * some not yet used fields - */ + /** */ int32_t string_index; + /** */ int32_t string_minimum; + /** */ int32_t string_maximum; + /** */ int32_t designator_index; + /** */ int32_t designator_minimum; + /** */ int32_t designator_maximum; + /** */ int32_t physical_minimum; + /** */ int32_t physical_maximum; + /** */ uint8_t item_flags; + /** */ usb_hid_report_path_t *usage_path; + /** */ link_t link; } usb_hid_report_item_t; @@ -124,6 +149,9 @@ /** HID report parser structure. */ typedef struct { + /** */ link_t input; + /** */ link_t output; + /** */ link_t feature; } usb_hid_report_parser_t; @@ -154,12 +182,12 @@ } usb_hid_modifiers_t; -typedef enum { - USB_HID_LED_NUM_LOCK = 0x1, - USB_HID_LED_CAPS_LOCK = 0x2, - USB_HID_LED_SCROLL_LOCK = 0x4, - USB_HID_LED_COMPOSE = 0x8, - USB_HID_LED_KANA = 0x10, - USB_HID_LED_COUNT = 5 -} usb_hid_led_t; +//typedef enum { +// USB_HID_LED_NUM_LOCK = 0x1, +// USB_HID_LED_CAPS_LOCK = 0x2, +// USB_HID_LED_SCROLL_LOCK = 0x4, +// USB_HID_LED_COMPOSE = 0x8, +// USB_HID_LED_KANA = 0x10, +// USB_HID_LED_COUNT = 5 +//} usb_hid_led_t; static const usb_hid_modifiers_t @@ -190,16 +218,34 @@ /* - * modifiers definitions - */ - + * Descriptor parser functions + */ +/** */ +int usb_hid_parser_init(usb_hid_report_parser_t *parser); + +/** */ +int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, + const uint8_t *data, size_t size); + +/** */ +void usb_hid_free_report_parser(usb_hid_report_parser_t *parser); + +/** */ +void usb_hid_descriptor_print(usb_hid_report_parser_t *parser); + +/* + * Boot protocol functions + */ +/** */ int usb_hid_boot_keyboard_input_report(const uint8_t *data, size_t size, const usb_hid_report_in_callbacks_t *callbacks, void *arg); +/** */ int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size); -int usb_hid_parser_init(usb_hid_report_parser_t *parser); -int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, - const uint8_t *data, size_t size); - + +/* + * Input report parser functions + */ +/** */ int usb_hid_parse_report(const usb_hid_report_parser_t *parser, const uint8_t *data, size_t size, @@ -207,28 +253,56 @@ const usb_hid_report_in_callbacks_t *callbacks, void *arg); -int usb_hid_report_input_length(const usb_hid_report_parser_t *parser, +/** */ +size_t usb_hid_report_input_length(const usb_hid_report_parser_t *parser, usb_hid_report_path_t *path, int flags); -void usb_hid_free_report_parser(usb_hid_report_parser_t *parser); - -void usb_hid_descriptor_print(usb_hid_report_parser_t *parser); - -/* usage path functions */ + +/* + * usage path functions + */ +/** */ usb_hid_report_path_t *usb_hid_report_path(void); + +/** */ void usb_hid_report_path_free(usb_hid_report_path_t *path); + +/** */ int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, int32_t usage_page, int32_t usage); + +/** */ void usb_hid_report_remove_last_item(usb_hid_report_path_t *usage_path); + +/** */ void usb_hid_report_null_last_item(usb_hid_report_path_t *usage_path); + +/** */ void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, int32_t tag, int32_t data); + +/** */ int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path, usb_hid_report_path_t *path, int flags); -int usb_hid_report_path_clone(usb_hid_report_path_t *new_usage_path, usb_hid_report_path_t *usage_path); - - -// output -// - funkce co vrati cesty poli v output reportu -// - funkce co pro danou cestu nastavi data -// - finalize - + +/** */ +usb_hid_report_path_t *usb_hid_report_path_clone(usb_hid_report_path_t *usage_path); + + +/* + * Output report parser functions + */ +/** Allocates output report buffer*/ +uint8_t *usb_hid_report_output(usb_hid_report_parser_t *parser, size_t *size); + +/** Frees output report buffer*/ +void usb_hid_report_output_free(uint8_t *output); + +/** Returns size of output for given usage path */ +size_t usb_hid_report_output_size(usb_hid_report_parser_t *parser, + usb_hid_report_path_t *path, int flags); + +/** Updates the output report buffer by translated given data */ +int usb_hid_report_output_translate(usb_hid_report_parser_t *parser, + usb_hid_report_path_t *path, int flags, + uint8_t *buffer, size_t size, + int32_t *data, size_t data_size); #endif /** Index: uspace/lib/usb/src/devdrv.c =================================================================== --- uspace/lib/usb/src/devdrv.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/usb/src/devdrv.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -251,5 +251,5 @@ &dev->descriptors.configuration_size); if (rc != EOK) { - usb_log_error("Failed retrieving configuration descriptor: %s.\n", + usb_log_error("Failed retrieving configuration descriptor: %s. %s\n", dev->ddf_dev->name, str_error(rc)); return rc; Index: uspace/lib/usb/src/hidparser.c =================================================================== --- uspace/lib/usb/src/hidparser.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/usb/src/hidparser.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -31,5 +31,5 @@ */ /** @file - * @brief HID parser implementation. + * HID report descriptor and report data parser implementation. */ #include @@ -40,10 +40,16 @@ #include +/** */ #define USB_HID_NEW_REPORT_ITEM 1 + +/** */ #define USB_HID_NO_ACTION 2 + +/** */ #define USB_HID_UNKNOWN_TAG -99 -#define BAD_HACK_USAGE_PAGE 0x07 - +/* + * Private descriptor parser functions + */ int usb_hid_report_parse_tag(uint8_t tag, uint8_t class, const uint8_t *data, size_t item_size, usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path); @@ -58,10 +64,15 @@ int usb_hid_report_reset_local_items(); void usb_hid_free_report_list(link_t *head); + +/* + * Data translation private functions + */ int32_t usb_hid_report_tag_data_int32(const uint8_t *data, size_t size); inline size_t usb_hid_count_item_offset(usb_hid_report_item_t * report_item, size_t offset); int usb_hid_translate_data(usb_hid_report_item_t *item, const uint8_t *data, size_t j); +int32_t usb_hid_translate_data_reverse(usb_hid_report_item_t *item, int32_t value); int usb_pow(int a, int b); - +// TODO: tohle ma bejt asi jinde int usb_pow(int a, int b) { @@ -80,13 +91,16 @@ /** - * + * Initialize the report descriptor parser structure + * + * @param parser Report descriptor parser structure + * @return Error code */ int usb_hid_parser_init(usb_hid_report_parser_t *parser) { - if(parser == NULL) { - return EINVAL; - } - - list_initialize(&(parser->input)); + if(parser == NULL) { + return EINVAL; + } + + list_initialize(&(parser->input)); list_initialize(&(parser->output)); list_initialize(&(parser->feature)); @@ -164,10 +178,7 @@ // store current usage path report_item->usage_path = usage_path; - - // new current usage path - tmp_usage_path = usb_hid_report_path(); - // copy old path to the new one - usb_hid_report_path_clone(tmp_usage_path, usage_path); + // clone path to the new one + tmp_usage_path = usb_hid_report_path_clone(usage_path); // swap @@ -304,4 +315,5 @@ /** + * Parse one tag of the report descriptor * * @param Tag to parse @@ -391,5 +403,4 @@ * @return Error code */ - int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, size_t item_size, usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path) @@ -520,5 +531,5 @@ * Prints content of given list of report items. * - * @param List of report items + * @param List of report items (usb_hid_report_item_t) * @return void */ @@ -552,8 +563,5 @@ path = path->next; } - - -// usb_log_debug("\tUSAGE: %X\n", report_item->usage); -// usb_log_debug("\tUSAGE PAGE: %X\n", report_item->usage_page); + usb_log_debug("\tLOGMIN: %X\n", report_item->logical_minimum); usb_log_debug("\tLOGMAX: %X\n", report_item->logical_maximum); @@ -570,7 +578,7 @@ } /** - * Prints content of given descriptor in human readable format. - * - * @param Parsed descriptor to print + * Prints content of given report descriptor in human readable format. + * + * @param parser Parsed descriptor to print * @return void */ @@ -595,5 +603,6 @@ * Releases whole linked list of report items * - * + * @param head Head of list of report descriptor items (usb_hid_report_item_t) + * @return void */ void usb_hid_free_report_list(link_t *head) @@ -627,8 +636,8 @@ } -/** Free the HID report parser structure +/** Frees the HID report descriptor parser structure * * @param parser Opaque HID report parser structure - * @return Error code + * @return void */ void usb_hid_free_report_parser(usb_hid_report_parser_t *parser) @@ -660,9 +669,4 @@ const usb_hid_report_in_callbacks_t *callbacks, void *arg) { - /* - * - * only key codes (usage page 0x07) will be processed - * other usages will be ignored - */ link_t *list_item; usb_hid_report_item_t *item; @@ -676,7 +680,6 @@ return EINVAL; } - - - // get the size of result keycodes array + + /* get the size of result array */ key_count = usb_hid_report_input_length(parser, path, flags); @@ -685,5 +688,5 @@ } - // read data + /* read data */ list_item = parser->input.next; while(list_item != &(parser->input)) { @@ -719,5 +722,12 @@ } - +/** + * Translate data from the report as specified in report descriptor + * + * @param item Report descriptor item with definition of translation + * @param data Data to translate + * @param j Index of processed field in report descriptor item + * @return Translated data + */ int usb_hid_translate_data(usb_hid_report_item_t *item, const uint8_t *data, size_t j) { @@ -796,16 +806,24 @@ } -int usb_hid_report_input_length(const usb_hid_report_parser_t *parser, +/** + * + * + * @param parser + * @param path + * @param flags + * @return + */ +size_t usb_hid_report_input_length(const usb_hid_report_parser_t *parser, usb_hid_report_path_t *path, int flags) { - int ret = 0; + size_t ret = 0; link_t *item; usb_hid_report_item_t *report_item; if(parser == NULL) { - return EINVAL; - } - - item = (&parser->input)->next; + return 0; + } + + item = parser->input.next; while(&parser->input != item) { report_item = list_get_instance(item, usb_hid_report_item_t, link); @@ -824,4 +842,8 @@ /** * + * @param usage_path + * @param usage_page + * @param usage + * @return */ int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, @@ -845,4 +867,6 @@ /** * + * @param usage_path + * @return */ void usb_hid_report_remove_last_item(usb_hid_report_path_t *usage_path) @@ -860,4 +884,6 @@ /** * + * @param usage_path + * @return */ void usb_hid_report_null_last_item(usb_hid_report_path_t *usage_path) @@ -873,4 +899,8 @@ /** * + * @param usage_path + * @param tag + * @param data + * @return */ void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, int32_t tag, int32_t data) @@ -894,5 +924,10 @@ /** - * + * + * + * @param report_path + * @param path + * @param flags + * @return */ int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path, @@ -949,5 +984,5 @@ break; - /* given path must be the end of the report one*/ + /* compare with only the end of path*/ case USB_HID_PATH_COMPARE_END: report_link = report_path->link.prev; @@ -992,4 +1027,5 @@ /** * + * @return */ usb_hid_report_path_t *usb_hid_report_path(void) @@ -1009,4 +1045,6 @@ /** * + * @param path + * @return void */ void usb_hid_report_path_free(usb_hid_report_path_t *path) @@ -1019,14 +1057,21 @@ /** - * - */ -int usb_hid_report_path_clone(usb_hid_report_path_t *new_usage_path, usb_hid_report_path_t *usage_path) + * Clone content of given usage path to the new one + * + * @param usage_path + * @return + */ +usb_hid_report_path_t *usb_hid_report_path_clone(usb_hid_report_path_t *usage_path) { usb_hid_report_usage_path_t *path_item; link_t *path_link; - + usb_hid_report_path_t *new_usage_path = usb_hid_report_path (); + + if(new_usage_path == NULL){ + return NULL; + } if(list_empty(&usage_path->link)){ - return EOK; + return new_usage_path; } @@ -1039,7 +1084,242 @@ } + return new_usage_path; +} + + +/*** OUTPUT API **/ + +/** Allocates output report buffer + * + * @param parser + * @param size + * @return + */ +uint8_t *usb_hid_report_output(usb_hid_report_parser_t *parser, size_t *size) +{ + if(parser == NULL) { + *size = 0; + return NULL; + } + + // read the last output report item + usb_hid_report_item_t *last; + link_t *link; + + link = parser->output.prev; + if(link != &parser->output) { + last = list_get_instance(link, usb_hid_report_item_t, link); + *size = (last->offset + (last->size * last->count)) / 8; + + uint8_t *buffer = malloc(sizeof(uint8_t) * (*size)); + memset(buffer, 0, sizeof(uint8_t) * (*size)); + usb_log_debug("output buffer: %s\n", usb_debug_str_buffer(buffer, *size, 0)); + + return buffer; + } + else { + *size = 0; + return NULL; + } +} + + +/** Frees output report buffer + * + * @param output Output report buffer + * @return + */ +void usb_hid_report_output_free(uint8_t *output) + +{ + if(output != NULL) { + free (output); + } +} + +/** Returns size of output for given usage path + * + * @param parser + * @param path + * @param flags + * @return + */ +size_t usb_hid_report_output_size(usb_hid_report_parser_t *parser, + usb_hid_report_path_t *path, int flags) +{ + size_t ret = 0; + link_t *item; + usb_hid_report_item_t *report_item; + + if(parser == NULL) { + return 0; + } + + item = parser->output.next; + while(&parser->output != item) { + report_item = list_get_instance(item, usb_hid_report_item_t, link); + if(!USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags) && + (usb_hid_report_compare_usage_path(report_item->usage_path, path, flags) == EOK)) { + ret += report_item->count; + } + + item = item->next; + } + + return ret; + +} + +/** Updates the output report buffer by translated given data + * + * @param parser + * @param path + * @param flags + * @param buffer + * @param size + * @param data + * @param data_size + * @return + */ +int usb_hid_report_output_translate(usb_hid_report_parser_t *parser, + usb_hid_report_path_t *path, int flags, + uint8_t *buffer, size_t size, + int32_t *data, size_t data_size) +{ + usb_hid_report_item_t *report_item; + link_t *item; + size_t idx=0; + int i=0; + int32_t value=0; + int offset; + int length; + int32_t tmp_value; + + if(parser == NULL) { + return EINVAL; + } + + usb_log_debug("OUTPUT BUFFER: %s\n", usb_debug_str_buffer(buffer,size, 0)); + usb_log_debug("OUTPUT DATA[0]: %d, DATA[1]: %d, DATA[2]: %d\n", data[0], data[1], data[2]); + + item = parser->output.next; + while(item != &parser->output) { + report_item = list_get_instance(item, usb_hid_report_item_t, link); + + for(i=0; icount; i++) { + + if(idx >= data_size) { + break; + } + + if((USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) == 0) || + ((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0))) { + +// // variable item + value = usb_hid_translate_data_reverse(report_item, data[idx++]); + offset = report_item->offset + (i * report_item->size); + length = report_item->size; + } + else { + //bitmap + value += usb_hid_translate_data_reverse(report_item, data[idx++]); + offset = report_item->offset; + length = report_item->size * report_item->count; + } + + if((offset/8) == ((offset+length-1)/8)) { + // je to v jednom bytu + if(((size_t)(offset/8) >= size) || ((size_t)(offset+length-1)/8) >= size) { + break; // TODO ErrorCode + } + + size_t shift = offset%8; + + value = value << shift; + value = value & (((1 << length)-1) << shift); + + uint8_t mask = 0; + mask = 0xff - (((1 << length) - 1) << shift); + buffer[offset/8] = (buffer[offset/8] & mask) | value; + } + else { + // je to ve dvou!! FIXME: melo by to umet delsi jak 2 + + // konec prvniho -- dolni x bitu + tmp_value = value; + tmp_value = tmp_value & ((1 << (8-(offset%8)))-1); + tmp_value = tmp_value << (offset%8); + + uint8_t mask = 0; + mask = ~(((1 << (8-(offset%8)))-1) << (offset%8)); + buffer[offset/8] = (buffer[offset/8] & mask) | tmp_value; + + // a ted druhej -- hornich length-x bitu + value = value >> (8 - (offset % 8)); + value = value & ((1 << (length - (8 - (offset % 8)))) - 1); + + mask = ((1 << (length - (8 - (offset % 8)))) - 1); + buffer[(offset+length-1)/8] = (buffer[(offset+length-1)/8] & mask) | value; + } + + } + + item = item->next; + } + + usb_log_debug("OUTPUT BUFFER: %s\n", usb_debug_str_buffer(buffer,size, 0)); + return EOK; } +/** + * + * @param item + * @param value + * @return + */ +int32_t usb_hid_translate_data_reverse(usb_hid_report_item_t *item, int value) +{ + int ret=0; + int resolution; + + if(USB_HID_ITEM_FLAG_CONSTANT(item->item_flags)) { + ret = item->logical_minimum; + } + + if((USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0)) { + + // variable item + if((item->physical_minimum == 0) && (item->physical_maximum == 0)) { + item->physical_minimum = item->logical_minimum; + item->physical_maximum = item->logical_maximum; + } + + if(item->physical_maximum == item->physical_minimum){ + resolution = 1; + } + else { + resolution = (item->logical_maximum - item->logical_minimum) / + ((item->physical_maximum - item->physical_minimum) * + (usb_pow(10,(item->unit_exponent)))); + } + + ret = ((value - item->physical_minimum) * resolution) + item->logical_minimum; + } + else { + // bitmapa + if(value == 0) { + ret = 0; + } + else { + size_t bitmap_idx = (value - item->usage_minimum); + ret = 1 << bitmap_idx; + } + } + + + return ret; +} + /** Index: uspace/lib/usb/src/request.c =================================================================== --- uspace/lib/usb/src/request.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/lib/usb/src/request.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -529,5 +529,4 @@ return rc; } - if (bare_config.descriptor_type != USB_DESCTYPE_CONFIGURATION) { return ENOENT; Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/srv/devman/devman.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -34,4 +34,5 @@ #include #include +#include #include #include @@ -146,14 +147,6 @@ fibril_mutex_unlock(&drivers_list->drivers_mutex); - printf(NAME": the '%s' driver was added to the list of available " - "drivers.\n", drv->name); - - printf(NAME ": match ids:"); - link_t *cur; - for (cur = drv->match_ids.ids.next; cur != &drv->match_ids.ids; cur = cur->next) { - match_id_t *match_id = list_get_instance(cur, match_id_t, link); - printf(" %d:%s", match_id->score, match_id->id); - } - printf("\n"); + log_msg(LVL_NOTE, "Driver `%s' was added to the list of available " + "drivers.", drv->name); } @@ -245,5 +238,5 @@ bool read_match_ids(const char *conf_path, match_id_list_t *ids) { - printf(NAME ": read_match_ids conf_path = %s.\n", conf_path); + log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path); bool suc = false; @@ -255,5 +248,6 @@ fd = open(conf_path, O_RDONLY); if (fd < 0) { - printf(NAME ": unable to open %s\n", conf_path); + log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.", + conf_path, str_error(fd)); goto cleanup; } @@ -263,5 +257,6 @@ lseek(fd, 0, SEEK_SET); if (len == 0) { - printf(NAME ": configuration file '%s' is empty.\n", conf_path); + log_msg(LVL_ERROR, "Configuration file '%s' is empty.", + conf_path); goto cleanup; } @@ -269,6 +264,6 @@ buf = malloc(len + 1); if (buf == NULL) { - printf(NAME ": memory allocation failed when parsing file " - "'%s'.\n", conf_path); + log_msg(LVL_ERROR, "Memory allocation failed when parsing file " + "'%s'.", conf_path); goto cleanup; } @@ -276,5 +271,5 @@ ssize_t read_bytes = safe_read(fd, buf, len); if (read_bytes <= 0) { - printf(NAME ": unable to read file '%s'.\n", conf_path); + log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path); goto cleanup; } @@ -314,5 +309,5 @@ bool get_driver_info(const char *base_path, const char *name, driver_t *drv) { - printf(NAME ": get_driver_info base_path = %s, name = %s.\n", + log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")", base_path, name); @@ -346,5 +341,6 @@ struct stat s; if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */ - printf(NAME ": driver not found at path %s.", drv->binary_path); + log_msg(LVL_ERROR, "Driver not found at path `%s'.", + drv->binary_path); goto cleanup; } @@ -373,5 +369,5 @@ int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path) { - printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path); + log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path); int drv_cnt = 0; @@ -407,5 +403,5 @@ dev_node_t *dev; - printf(NAME ": create_root_nodes\n"); + log_msg(LVL_DEBUG, "create_root_nodes()"); fibril_rwlock_write_lock(&tree->rwlock); @@ -492,6 +488,6 @@ void attach_driver(dev_node_t *dev, driver_t *drv) { - printf(NAME ": attach_driver %s to device %s\n", - drv->name, dev->pfun->pathname); + log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")", + dev->pfun->pathname, drv->name); fibril_mutex_lock(&drv->driver_mutex); @@ -515,10 +511,10 @@ assert(fibril_mutex_is_locked(&drv->driver_mutex)); - printf(NAME ": start_driver '%s'\n", drv->name); + log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name); rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL); if (rc != EOK) { - printf(NAME ": error spawning %s (%s)\n", - drv->name, str_error(rc)); + log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.", + drv->name, drv->binary_path, str_error(rc)); return false; } @@ -582,5 +578,6 @@ int phone; - printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name); + log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")", + driver->name); fibril_mutex_lock(&driver->driver_mutex); @@ -649,5 +646,5 @@ * immediately and possibly started here as well. */ - printf(NAME ": driver %s goes into running state.\n", driver->name); + log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name); driver->state = DRIVER_RUNNING; @@ -666,5 +663,6 @@ void initialize_running_driver(driver_t *driver, dev_tree_t *tree) { - printf(NAME ": initialize_running_driver (`%s')\n", driver->name); + log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")", + driver->name); /* @@ -756,6 +754,6 @@ * access any structures that would affect driver_t. */ - printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name, - dev->pfun->name); + log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")", + drv->name, dev->pfun->name); sysarg_t rc; @@ -818,5 +816,5 @@ driver_t *drv = find_best_match_driver(drivers_list, dev); if (drv == NULL) { - printf(NAME ": no driver found for device '%s'.\n", + log_msg(LVL_ERROR, "No driver found for device `%s'.", dev->pfun->pathname); return false; @@ -856,5 +854,5 @@ bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list) { - printf(NAME ": init_device_tree.\n"); + log_msg(LVL_DEBUG, "init_device_tree()"); tree->current_handle = 0; @@ -1035,5 +1033,5 @@ fun->pathname = (char *) malloc(pathsize); if (fun->pathname == NULL) { - printf(NAME ": failed to allocate device path.\n"); + log_msg(LVL_ERROR, "Failed to allocate device path."); return false; } @@ -1066,4 +1064,7 @@ assert(fibril_rwlock_is_write_locked(&tree->rwlock)); + log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])", + dev, pfun, pfun->pathname); + /* Add the node to the handle-to-node map. */ dev->handle = ++tree->current_handle; @@ -1072,5 +1073,4 @@ /* Add the node to the list of its parent's children. */ - printf("insert_dev_node: dev=%p, dev->pfun := %p\n", dev, pfun); dev->pfun = pfun; pfun->child = dev; @@ -1173,4 +1173,63 @@ } +/** Find function with a specified name belonging to given device. + * + * Device tree rwlock should be held at least for reading. + * + * @param dev Device the function belongs to. + * @param name Function name (not path). + * @return Function node. + * @retval NULL No function with given name. + */ +fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name) +{ + assert(dev != NULL); + assert(name != NULL); + + fun_node_t *fun; + link_t *link; + + for (link = dev->functions.next; + link != &dev->functions; + link = link->next) { + fun = list_get_instance(link, fun_node_t, dev_functions); + + if (str_cmp(name, fun->name) == 0) + return fun; + } + + return NULL; +} + +/** Find function node by its class name and index. */ +fun_node_t *find_fun_node_by_class(class_list_t *class_list, + const char *class_name, const char *dev_name) +{ + assert(class_list != NULL); + assert(class_name != NULL); + assert(dev_name != NULL); + + fibril_rwlock_read_lock(&class_list->rwlock); + + dev_class_t *cl = find_dev_class_no_lock(class_list, class_name); + if (cl == NULL) { + fibril_rwlock_read_unlock(&class_list->rwlock); + return NULL; + } + + dev_class_info_t *dev = find_dev_in_class(cl, dev_name); + if (dev == NULL) { + fibril_rwlock_read_unlock(&class_list->rwlock); + return NULL; + } + + fun_node_t *fun = dev->fun; + + fibril_rwlock_read_unlock(&class_list->rwlock); + + return fun; +} + + /** Find child function node with a specified name. * @@ -1183,19 +1242,5 @@ fun_node_t *find_node_child(fun_node_t *pfun, const char *name) { - fun_node_t *fun; - link_t *link; - - link = pfun->child->functions.next; - - while (link != &pfun->child->functions) { - fun = list_get_instance(link, fun_node_t, dev_functions); - - if (str_cmp(name, fun->name) == 0) - return fun; - - link = link->next; - } - - return NULL; + return find_fun_node_in_device(pfun->child, name); } @@ -1359,4 +1404,24 @@ } +dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name) +{ + assert(dev_class != NULL); + assert(dev_name != NULL); + + link_t *link; + for (link = dev_class->devices.next; + link != &dev_class->devices; + link = link->next) { + dev_class_info_t *dev = list_get_instance(link, + dev_class_info_t, link); + + if (str_cmp(dev->dev_name, dev_name) == 0) { + return dev; + } + } + + return NULL; +} + void init_class_list(class_list_t *class_list) { Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/srv/devman/devman.h (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -338,4 +338,6 @@ extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle); extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *); +extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *); +extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *); /* Device tree */ @@ -359,4 +361,5 @@ extern dev_class_t *get_dev_class(class_list_t *, char *); extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *); +extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *); extern void add_dev_class_no_lock(class_list_t *, dev_class_t *); Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/srv/devman/main.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -43,4 +43,5 @@ #include #include +#include #include #include @@ -51,4 +52,5 @@ #include #include +#include #include #include @@ -71,5 +73,5 @@ driver_t *driver = NULL; - printf(NAME ": devman_driver_register \n"); + log_msg(LVL_DEBUG, "devman_driver_register"); iid = async_get_call(&icall); @@ -88,5 +90,5 @@ } - printf(NAME ": the %s driver is trying to register by the service.\n", + log_msg(LVL_DEBUG, "The `%s' driver is trying to register.", drv_name); @@ -95,5 +97,5 @@ if (driver == NULL) { - printf(NAME ": no driver named %s was found.\n", drv_name); + log_msg(LVL_ERROR, "No driver named `%s' was found.", drv_name); free(drv_name); drv_name = NULL; @@ -106,5 +108,6 @@ /* Create connection to the driver. */ - printf(NAME ": creating connection to the %s driver.\n", driver->name); + log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.", + driver->name); ipc_call_t call; ipc_callid_t callid = async_get_call(&call); @@ -118,5 +121,6 @@ set_driver_phone(driver, IPC_GET_ARG5(call)); - printf(NAME ": the %s driver was successfully registered as running.\n", + log_msg(LVL_NOTE, + "The `%s' driver was successfully registered as running.", driver->name); @@ -142,6 +146,6 @@ callid = async_get_call(&call); if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) { - printf(NAME ": ERROR: devman_receive_match_id - invalid " - "protocol.\n"); + log_msg(LVL_ERROR, + "Invalid protocol when trying to receive match id."); async_answer_0(callid, EINVAL); delete_match_id(match_id); @@ -150,6 +154,5 @@ if (match_id == NULL) { - printf(NAME ": ERROR: devman_receive_match_id - failed to " - "allocate match id.\n"); + log_msg(LVL_ERROR, "Failed to allocate match id."); async_answer_0(callid, ENOMEM); return ENOMEM; @@ -165,6 +168,6 @@ if (rc != EOK) { delete_match_id(match_id); - printf(NAME ": devman_receive_match_id - failed to receive " - "match id string.\n"); + log_msg(LVL_ERROR, "Failed to receive match id string: %s.", + str_error(rc)); return rc; } @@ -172,5 +175,5 @@ list_append(&match_id->link, &match_ids->ids); - printf(NAME ": received match id '%s', score = %d \n", + log_msg(LVL_DEBUG, "Received match id `%s', score %d.", match_id->id, match_id->score); return rc; @@ -228,5 +231,7 @@ if (ftype != fun_inner && ftype != fun_exposed) { /* Unknown function type */ - printf(NAME ": Error, unknown function type provided by driver!\n"); + log_msg(LVL_ERROR, + "Unknown function type %d provided by driver.", + (int) ftype); fibril_rwlock_write_unlock(&tree->rwlock); @@ -243,4 +248,14 @@ } + /* Check that function with same name is not there already. */ + if (find_fun_node_in_device(pdev, fun_name) != NULL) { + fibril_rwlock_write_unlock(&tree->rwlock); + async_answer_0(callid, EEXISTS); + printf(NAME ": Warning, driver tried to register `%s' twice.\n", + fun_name); + free(fun_name); + return; + } + fun_node_t *fun = create_fun_node(); if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) { @@ -265,5 +280,5 @@ fibril_rwlock_write_unlock(&tree->rwlock); - printf(NAME ": devman_add_function %s\n", fun->pathname); + log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname); devman_receive_match_ids(match_count, &fun->match_ids); @@ -347,6 +362,6 @@ devmap_register_class_dev(class_info); - printf(NAME ": function'%s' added to class '%s', class name '%s' was " - "asigned to it\n", fun->pathname, class_name, class_info->dev_name); + log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.", + fun->pathname, class_name, class_info->dev_name); async_answer_0(callid, EOK); @@ -363,5 +378,5 @@ initialize_running_driver(driver, &device_tree); - printf(NAME ": the %s driver was successfully initialized. \n", + log_msg(LVL_DEBUG, "The `%s` driver was successfully initialized.", driver->name); return 0; @@ -385,6 +400,6 @@ fid_t fid = fibril_create(init_running_drv, driver); if (fid == 0) { - printf(NAME ": Error creating fibril for the initialization of " - "the newly registered running driver.\n"); + log_msg(LVL_ERROR, "Failed to create initialization fibril " \ + "for driver `%s'.", driver->name); return; } @@ -438,4 +453,38 @@ } +/** Find handle for the device instance identified by device class name. */ +static void devman_function_get_handle_by_class(ipc_callid_t iid, + ipc_call_t *icall) +{ + char *classname; + char *devname; + + int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0); + if (rc != EOK) { + async_answer_0(iid, rc); + return; + } + rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0); + if (rc != EOK) { + free(classname); + async_answer_0(iid, rc); + return; + } + + + fun_node_t *fun = find_fun_node_by_class(&class_list, + classname, devname); + + free(classname); + free(devname); + + if (fun == NULL) { + async_answer_0(iid, ENOENT); + return; + } + + async_answer_1(iid, EOK, fun->handle); +} + /** Function for handling connections from a client to the device manager. */ @@ -457,4 +506,7 @@ devman_function_get_handle(callid, &call); break; + case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS: + devman_function_get_handle_by_class(callid, &call); + break; default: async_answer_0(callid, ENOENT); @@ -484,6 +536,6 @@ */ if (dev == NULL) { - printf(NAME ": devman_forward error - no device or function with " - "handle %" PRIun " was found.\n", handle); + log_msg(LVL_ERROR, "IPC forwarding failed - no device or " + "function with handle %" PRIun " was found.", handle); async_answer_0(iid, ENOENT); return; @@ -491,6 +543,7 @@ if (fun == NULL && !drv_to_parent) { - printf(NAME ": devman_forward error - cannot connect to " - "handle %" PRIun ", refers to a device.\n", handle); + log_msg(LVL_ERROR, NAME ": devman_forward error - cannot " + "connect to handle %" PRIun ", refers to a device.", + handle); async_answer_0(iid, ENOENT); return; @@ -513,6 +566,6 @@ if (driver == NULL) { - printf(NAME ": devman_forward error - the device %" PRIun \ - " (%s) is not in usable state.\n", + log_msg(LVL_ERROR, "IPC forwarding refused - " \ + "the device %" PRIun "(%s) is not in usable state.", handle, dev->pfun->pathname); async_answer_0(iid, ENOENT); @@ -527,7 +580,7 @@ if (driver->phone <= 0) { - printf(NAME ": devman_forward: cound not forward to driver %s ", - driver->name); - printf("the driver's phone is %" PRIun ").\n", driver->phone); + log_msg(LVL_ERROR, + "Could not forward to driver `%s' (phone is %d).", + driver->name, (int) driver->phone); async_answer_0(iid, EINVAL); return; @@ -535,9 +588,11 @@ if (fun != NULL) { - printf(NAME ": devman_forward: forward connection to function %s to " - "driver %s.\n", fun->pathname, driver->name); + log_msg(LVL_DEBUG, + "Forwarding request for `%s' function to driver `%s'.", + fun->pathname, driver->name); } else { - printf(NAME ": devman_forward: forward connection to device %s to " - "driver %s.\n", dev->pfun->pathname, driver->name); + log_msg(LVL_DEBUG, + "Forwarding request for `%s' device to driver `%s'.", + dev->pfun->pathname, driver->name); } @@ -571,6 +626,7 @@ async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0, IPC_FF_NONE); - printf(NAME ": devman_connection_devmapper: forwarded connection to " - "device %s to driver %s.\n", fun->pathname, dev->drv->name); + log_msg(LVL_DEBUG, + "Forwarding devmapper request for `%s' function to driver `%s'.", + fun->pathname, dev->drv->name); } @@ -607,5 +663,5 @@ static bool devman_init(void) { - printf(NAME ": devman_init - looking for available drivers.\n"); + log_msg(LVL_DEBUG, "devman_init - looking for available drivers."); /* Initialize list of available drivers. */ @@ -613,13 +669,13 @@ if (lookup_available_drivers(&drivers_list, DRIVER_DEFAULT_STORE) == 0) { - printf(NAME " no drivers found."); + log_msg(LVL_FATAL, "No drivers found."); return false; } - printf(NAME ": devman_init - list of drivers has been initialized.\n"); + log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized."); /* Create root device node. */ if (!init_device_tree(&device_tree, &drivers_list)) { - printf(NAME " failed to initialize device tree."); + log_msg(LVL_FATAL, "Failed to initialize device tree."); return false; } @@ -642,6 +698,11 @@ printf(NAME ": HelenOS Device Manager\n"); + if (log_init(NAME, LVL_ERROR) != EOK) { + printf(NAME ": Error initializing logging subsystem.\n"); + return -1; + } + if (!devman_init()) { - printf(NAME ": Error while initializing service\n"); + log_msg(LVL_ERROR, "Error while initializing service."); return -1; } @@ -651,8 +712,10 @@ /* Register device manager at naming service. */ - if (service_register(SERVICE_DEVMAN) != EOK) + if (service_register(SERVICE_DEVMAN) != EOK) { + log_msg(LVL_ERROR, "Failed registering as a service."); return -1; - - printf(NAME ": Accepting connections\n"); + } + + printf(NAME ": Accepting connections.\n"); async_manager(); Index: uspace/srv/devmap/devmap.c =================================================================== --- uspace/srv/devmap/devmap.c (revision d773285ffe7dee46caac6fd3fb53c959abdcec05) +++ uspace/srv/devmap/devmap.c (revision 0053fa389cb88e96dbd4e306a499a09779dcdfd3) @@ -551,5 +551,5 @@ if (devmap_device_find_name(namespace->name, device->name) != NULL) { printf("%s: Device '%s/%s' already registered\n", NAME, - device->namespace->name, device->name); + namespace->name, device->name); devmap_namespace_destroy(namespace); fibril_mutex_unlock(&devices_list_mutex);