Index: uspace/app/bdsh/cmds/modules/cat/cat.c =================================================================== --- uspace/app/bdsh/cmds/modules/cat/cat.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/bdsh/cmds/modules/cat/cat.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -1,3 +1,4 @@ /* Copyright (c) 2008, Tim Post + * Copyright (c) 2011, Martin Sucha * All rights reserved. * @@ -35,4 +36,11 @@ #include #include +#include +#include +#include +#include +#include +#include +#include #include "config.h" @@ -48,4 +56,12 @@ static const char *cat_oops = "That option is not yet supported\n"; +static const char *hexchars = "0123456789abcdef"; + +static bool paging_enabled = false; +static size_t chars_remaining = 0; +static size_t lines_remaining = 0; +static sysarg_t console_cols = 0; +static sysarg_t console_rows = 0; +static bool should_quit = false; static struct option const long_options[] = { @@ -56,4 +72,5 @@ { "buffer", required_argument, 0, 'b' }, { "more", no_argument, 0, 'm' }, + { "hex", no_argument, 0, 'x' }, { 0, 0, 0, 0 } }; @@ -75,4 +92,5 @@ " -b, --buffer ## Set the read buffer size to ##\n" " -m, --more Pause after each screen full\n" + " -x, --hex Print bytes as hex values\n" "Currently, %s is under development, some options don't work.\n", cmdname, cmdname); @@ -82,9 +100,71 @@ } -static unsigned int cat_file(const char *fname, size_t blen) +static void waitprompt() +{ + console_set_pos(fphone(stdout), 0, console_rows-1); + console_set_color(fphone(stdout), COLOR_BLUE, COLOR_WHITE, 0); + printf("ENTER/SPACE/PAGE DOWN - next page, " + "ESC/Q - quit, C - continue unpaged"); + fflush(stdout); + console_set_style(fphone(stdout), STYLE_NORMAL); +} + +static void waitkey() +{ + console_event_t ev; + + while (true) { + if (!console_get_event(fphone(stdin), &ev)) { + return; + } + if (ev.type == KEY_PRESS) { + if (ev.key == KC_ESCAPE || ev.key == KC_Q) { + should_quit = true; + return; + } + if (ev.key == KC_C) { + paging_enabled = false; + return; + } + if (ev.key == KC_ENTER || ev.key == KC_SPACE || + ev.key == KC_PAGE_DOWN) { + return; + } + } + } + assert(false); +} + +static void newpage() +{ + console_clear(fphone(stdout)); + chars_remaining = console_cols; + lines_remaining = console_rows-1; +} + +static void paged_char(wchar_t c) +{ + putchar(c); + if (paging_enabled) { + chars_remaining--; + if (c == '\n' || chars_remaining == 0) { + chars_remaining = console_cols; + lines_remaining--; + } + if (lines_remaining == 0) { + fflush(stdout); + waitprompt(); + waitkey(); + newpage(); + } + } +} + +static unsigned int cat_file(const char *fname, size_t blen, bool hex) { int fd, bytes = 0, count = 0, reads = 0; - off64_t total = 0; char *buff = NULL; + int i; + size_t offset = 0; fd = open(fname, O_RDONLY); @@ -93,7 +173,4 @@ return 1; } - - total = lseek(fd, 0, SEEK_END); - lseek(fd, 0, SEEK_SET); if (NULL == (buff = (char *) malloc(blen + 1))) { @@ -109,8 +186,23 @@ count += bytes; buff[bytes] = '\0'; - printf("%s", buff); + offset = 0; + for (i = 0; i < bytes && !should_quit; i++) { + if (hex) { + paged_char(hexchars[((uint8_t)buff[i])/16]); + paged_char(hexchars[((uint8_t)buff[i])%16]); + } + else { + wchar_t c = str_decode(buff, &offset, bytes); + if (c == 0) { + /* Reached end of string */ + break; + } + paged_char(c); + } + + } reads++; } - } while (bytes > 0); + } while (bytes > 0 && !should_quit); close(fd); @@ -131,9 +223,24 @@ unsigned int argc, i, ret = 0, buffer = 0; int c, opt_ind; + bool hex = false; + bool more = false; + sysarg_t rows, cols; + int rc; + + /* + * reset global state + * TODO: move to structure? + */ + paging_enabled = false; + chars_remaining = 0; + lines_remaining = 0; + console_cols = 0; + console_rows = 0; + should_quit = false; argc = cli_count_args(argv); for (c = 0, optind = 0, opt_ind = 0; c != -1;) { - c = getopt_long(argc, argv, "hvmH:t:b:", long_options, &opt_ind); + c = getopt_long(argc, argv, "xhvmH:t:b:", long_options, &opt_ind); switch (c) { case 'h': @@ -144,15 +251,18 @@ return CMD_SUCCESS; case 'H': - printf(cat_oops); + printf("%s", cat_oops); return CMD_FAILURE; case 't': - printf(cat_oops); + printf("%s", cat_oops); return CMD_FAILURE; case 'b': - printf(cat_oops); + printf("%s", cat_oops); break; case 'm': - printf(cat_oops); - return CMD_FAILURE; + more = true; + break; + case 'x': + hex = true; + break; } } @@ -168,7 +278,19 @@ if (buffer <= 0) buffer = CAT_DEFAULT_BUFLEN; - - for (i = optind; argv[i] != NULL; i++) - ret += cat_file(argv[i], buffer); + + if (more) { + rc = console_get_size(fphone(stdout), &cols, &rows); + if (rc != EOK) { + printf("%s - cannot get console size\n", cmdname); + return CMD_FAILURE; + } + console_cols = cols; + console_rows = rows; + paging_enabled = true; + newpage(); + } + + for (i = optind; argv[i] != NULL && !should_quit; i++) + ret += cat_file(argv[i], buffer, hex); if (ret) Index: uspace/app/bdsh/cmds/modules/cat/cat.h =================================================================== --- uspace/app/bdsh/cmds/modules/cat/cat.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/bdsh/cmds/modules/cat/cat.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -4,5 +4,5 @@ /* Prototypes for the cat command, excluding entry points */ -static unsigned int cat_file(const char *, size_t); +static unsigned int cat_file(const char *, size_t, bool); #endif /* CAT_H */ Index: uspace/app/bdsh/cmds/modules/cp/cp.c =================================================================== --- uspace/app/bdsh/cmds/modules/cp/cp.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/bdsh/cmds/modules/cp/cp.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -108,4 +108,5 @@ for (;;) { ssize_t res; + size_t written = 0; bytes = read(fd1, buff, blen); @@ -120,7 +121,8 @@ * returned less data than requested. */ - bytes = write(fd2, buff, res); + bytes = write(fd2, buff + written, res); if (bytes < 0) goto err; + written += bytes; res -= bytes; } while (res > 0); Index: uspace/app/bdsh/cmds/modules/ls/ls.c =================================================================== --- uspace/app/bdsh/cmds/modules/ls/ls.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/bdsh/cmds/modules/ls/ls.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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: uspace/app/bdsh/cmds/modules/ls/ls.h =================================================================== --- uspace/app/bdsh/cmds/modules/ls/ls.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ (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/bdsh/cmds/modules/rm/rm.c =================================================================== --- uspace/app/bdsh/cmds/modules/rm/rm.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/bdsh/cmds/modules/rm/rm.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -101,7 +101,42 @@ } +static unsigned int rm_recursive_not_empty_dirs(const char *path) +{ + DIR *dirp; + struct dirent *dp; + char buff[PATH_MAX]; + unsigned int scope; + unsigned int ret = 0; + + dirp = opendir(path); + if (!dirp) { + /* May have been deleted between scoping it and opening it */ + cli_error(CL_EFAIL, "Could not open %s", path); + return ret; + } + + memset(buff, 0, sizeof(buff)); + while ((dp = readdir(dirp))) { + snprintf(buff, PATH_MAX - 1, "%s/%s", path, dp->d_name); + scope = rm_scope(buff); + switch (scope) { + case RM_BOGUS: + break; + case RM_FILE: + ret += rm_single(buff); + break; + case RM_DIR: + ret += rm_recursive(buff); + break; + } + } + + return ret; +} + static unsigned int rm_recursive(const char *path) { int rc; + unsigned int ret = 0; /* First see if it will just go away */ @@ -111,7 +146,14 @@ /* Its not empty, recursively scan it */ - cli_error(CL_ENOTSUP, - "Can not remove %s, directory not empty", path); - return 1; + ret = rm_recursive_not_empty_dirs(path); + + /* Delete directory */ + rc = rmdir(path); + if (rc == 0) + return ret; + + cli_error(CL_ENOTSUP, "Can not remove %s", path); + + return ret + 1; } @@ -227,5 +269,5 @@ } memset(buff, 0, sizeof(buff)); - snprintf(buff, len, argv[i]); + snprintf(buff, len, "%s", argv[i]); scope = rm_scope(buff); Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/init/init.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -272,4 +272,7 @@ mount_tmpfs(); +#ifdef CONFIG_START_DEVMAN + spawn("/srv/devman"); +#endif spawn("/srv/apic"); spawn("/srv/i8259"); Index: uspace/app/sbi/src/run_expr.c =================================================================== --- uspace/app/sbi/src/run_expr.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/sbi/src/run_expr.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -2529,4 +2529,6 @@ if (rc1 == EOK) rc2 = os_str_get_char(string->value, elem_index, &cval); + else + rc2 = EOK; if (rc1 != EOK || rc2 != EOK) { Index: uspace/app/stats/stats.c =================================================================== --- uspace/app/stats/stats.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/stats/stats.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -265,5 +265,5 @@ /* Threads */ if ((off = arg_parse_short_long(argv[i], "-t", "--task=")) != -1) { - // TODO: Support for 64b range + /* TODO: Support for 64b range */ int tmp; int ret = arg_parse_int(argc, argv, &i, &tmp, off); Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/tester/Makefile (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -49,4 +49,5 @@ loop/loop1.c \ mm/malloc1.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 8aa2b3bd36816eb9f9e92cc4098498870194aade) +++ uspace/app/tester/devs/devman1.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 8aa2b3bd36816eb9f9e92cc4098498870194aade) +++ uspace/app/tester/devs/devman1.def (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -0,0 +1,6 @@ +{ + "devman1", + "devman test", + &test_devman1, + false +}, Index: uspace/app/tester/fault/fault2.c =================================================================== --- uspace/app/tester/fault/fault2.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/tester/fault/fault2.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -29,4 +29,5 @@ #include "../tester.h" +#include typedef int __attribute__((may_alias)) aliasing_int; @@ -38,4 +39,5 @@ var1 = *((aliasing_int *) (((char *) (&var)) + 1)); + printf("Read %d\n", var1); return "Survived unaligned read"; Index: uspace/app/tester/tester.c =================================================================== --- uspace/app/tester/tester.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/tester/tester.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -64,4 +64,5 @@ #include "hw/serial/serial1.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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/tester/tester.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -80,4 +80,5 @@ extern const char *test_serial1(void); extern const char *test_virtchar1(void); +extern const char *test_devman1(void); extern test_t tests[]; Index: uspace/app/trace/trace.c =================================================================== --- uspace/app/trace/trace.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/app/trace/trace.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -53,5 +53,5 @@ #include -// Temporary: service and method names +/* Temporary: service and method names */ #include "proto.h" #include @@ -872,5 +872,5 @@ static display_mask_t parse_display_mask(const char *text) { - display_mask_t dm; + display_mask_t dm = 0; const char *c = text; Index: uspace/drv/isa/isa.c =================================================================== --- uspace/drv/isa/isa.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/isa/isa.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -53,4 +53,5 @@ #include +#include #include @@ -82,5 +83,5 @@ static bool isa_enable_fun_interrupt(ddf_fun_t *fnode) { - // TODO + /* TODO */ return false; @@ -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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/ns8250/ns8250.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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/pciintel/pci.c =================================================================== --- uspace/drv/pciintel/pci.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/pciintel/pci.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -48,4 +48,5 @@ #include +#include #include #include @@ -225,5 +226,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; } @@ -231,5 +232,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)); } @@ -323,7 +324,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); } @@ -350,5 +351,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); } @@ -406,5 +407,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; } @@ -412,5 +413,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; } @@ -426,5 +427,5 @@ fnode->driver_data = fun; - printf(NAME ": adding new function %s.\n", + ddf_msg(LVL_DEBUG, "Adding new function %s.", fnode->name); @@ -443,6 +444,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); @@ -466,10 +468,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; @@ -481,6 +483,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; @@ -491,11 +493,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); @@ -509,5 +511,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; @@ -516,9 +518,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; @@ -527,10 +529,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); @@ -554,4 +556,5 @@ static void pciintel_init(void) { + ddf_log_init(NAME, LVL_ERROR); pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops; } @@ -631,5 +634,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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/root/root.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/rootpc/rootpc.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/rootvirt/rootvirt.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/test1/test1.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/drv/test2/test2.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/Makefile (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -84,4 +84,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/arch/abs32le/_link.ld.in =================================================================== --- uspace/lib/c/arch/abs32le/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/abs32le/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -11,6 +11,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/amd64/_link.ld.in =================================================================== --- uspace/lib/c/arch/amd64/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/amd64/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -16,6 +16,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/arm32/_link.ld.in =================================================================== --- uspace/lib/c/arch/arm32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/arm32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/ia32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/ia32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -16,6 +16,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/ia64/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia64/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/ia64/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text @@ -23,5 +23,5 @@ .got : { _gp = .; - *(.got*); + *(.got .got.*); } :data Index: uspace/lib/c/arch/mips32/_link.ld.in =================================================================== --- uspace/lib/c/arch/mips32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/mips32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/ppc32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ppc32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/ppc32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/arch/sparc64/_link.ld.in =================================================================== --- uspace/lib/c/arch/sparc64/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/arch/sparc64/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -15,6 +15,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/lib/c/generic/adt/measured_strings.c =================================================================== --- uspace/lib/c/generic/adt/measured_strings.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/generic/adt/measured_strings.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -74,5 +74,5 @@ new->length = length; new->value = ((uint8_t *) new) + sizeof(measured_string_t); - // append terminating zero explicitly - to be safe + /* Append terminating zero explicitly - to be safe */ memcpy(new->value, string, new->length); new->value[new->length] = '\0'; Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/generic/devman.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 8aa2b3bd36816eb9f9e92cc4098498870194aade) +++ uspace/lib/c/generic/io/log.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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/generic/net/packet.c =================================================================== --- uspace/lib/c/generic/net/packet.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/generic/net/packet.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -190,5 +190,5 @@ } } - gpm_destroy(&pm_globals.packet_map); + gpm_destroy(&pm_globals.packet_map, free); /* leave locked */ } Index: uspace/lib/c/generic/net/socket_client.c =================================================================== --- uspace/lib/c/generic/net/socket_client.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/generic/net/socket_client.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -749,5 +749,5 @@ dyn_fifo_destroy(&socket->received); dyn_fifo_destroy(&socket->accepted); - sockets_exclude(socket_get_sockets(), socket->socket_id); + sockets_exclude(socket_get_sockets(), socket->socket_id, free); } Index: uspace/lib/c/generic/vfs/vfs.c =================================================================== --- uspace/lib/c/generic/vfs/vfs.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/generic/vfs/vfs.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -756,8 +756,9 @@ { struct stat stat; - int rc; - - rc = fstat(fildes, &stat); - + + int rc = fstat(fildes, &stat); + if (rc != 0) + return rc; + if (!stat.device) return -1; Index: uspace/lib/c/include/adt/generic_char_map.h =================================================================== --- uspace/lib/c/include/adt/generic_char_map.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/include/adt/generic_char_map.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -47,4 +47,8 @@ #define GENERIC_CHAR_MAP_MAGIC_VALUE 0x12345622 +/** Generic destructor function pointer. */ +#define DTOR_T(identifier) \ + void (*identifier)(const void *) + /** Character string to generic type map declaration. * @param[in] name Name of the map. @@ -64,6 +68,6 @@ int name##_add(name##_t *, const uint8_t *, const size_t, type *); \ int name##_count(name##_t *); \ - void name##_destroy(name##_t *); \ - void name##_exclude(name##_t *, const uint8_t *, const size_t); \ + void name##_destroy(name##_t *, DTOR_T()); \ + void name##_exclude(name##_t *, const uint8_t *, const size_t, DTOR_T()); \ type *name##_find(name##_t *, const uint8_t *, const size_t); \ int name##_initialize(name##_t *); \ @@ -84,5 +88,4 @@ type *value) \ { \ - int rc; \ int index; \ if (!name##_is_valid(map)) \ @@ -91,10 +94,5 @@ if (index < 0) \ return index; \ - rc = char_map_add(&map->names, name, length, index); \ - if (rc != EOK) { \ - name##_items_exclude_index(&map->values, index); \ - return rc; \ - } \ - return EOK; \ + return char_map_add(&map->names, name, length, index); \ } \ \ @@ -105,14 +103,14 @@ } \ \ - void name##_destroy(name##_t *map) \ + void name##_destroy(name##_t *map, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ char_map_destroy(&map->names); \ - name##_items_destroy(&map->values); \ + name##_items_destroy(&map->values, dtor); \ } \ } \ \ void name##_exclude(name##_t *map, const uint8_t *name, \ - const size_t length) \ + const size_t length, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -121,5 +119,5 @@ if (index != CHAR_MAP_NULL) \ name##_items_exclude_index(&map->values, \ - index); \ + index, dtor); \ } \ } \ Index: uspace/lib/c/include/adt/generic_field.h =================================================================== --- uspace/lib/c/include/adt/generic_field.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/include/adt/generic_field.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -46,4 +46,8 @@ #define GENERIC_FIELD_MAGIC_VALUE 0x55667788 +/** Generic destructor function pointer. */ +#define DTOR_T(identifier) \ + void (*identifier)(const void *) + /** Generic type field declaration. * @@ -63,6 +67,6 @@ int name##_add(name##_t *, type *); \ int name##_count(name##_t *); \ - void name##_destroy(name##_t *); \ - void name##_exclude_index(name##_t *, int); \ + void name##_destroy(name##_t *, DTOR_T()); \ + void name##_exclude_index(name##_t *, int, DTOR_T()); \ type **name##_get_field(name##_t *); \ type *name##_get_index(name##_t *, int); \ @@ -103,12 +107,14 @@ } \ \ - void name##_destroy(name##_t *field) \ + void name##_destroy(name##_t *field, DTOR_T(dtor)) \ { \ if (name##_is_valid(field)) { \ int index; \ field->magic = 0; \ - for (index = 0; index < field->next; index++) { \ - if (field->items[index]) \ - free(field->items[index]); \ + if (dtor) { \ + for (index = 0; index < field->next; index++) { \ + if (field->items[index]) \ + dtor(field->items[index]); \ + } \ } \ free(field->items); \ @@ -116,9 +122,10 @@ } \ \ - void name##_exclude_index(name##_t *field, int index) \ + void name##_exclude_index(name##_t *field, int index, DTOR_T(dtor)) \ { \ if (name##_is_valid(field) && (index >= 0) && \ (index < field->next) && (field->items[index])) { \ - free(field->items[index]); \ + if (dtor) \ + dtor(field->items[index]); \ field->items[index] = NULL; \ } \ Index: uspace/lib/c/include/adt/int_map.h =================================================================== --- uspace/lib/c/include/adt/int_map.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/include/adt/int_map.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -49,4 +49,8 @@ #define INT_MAP_ITEM_MAGIC_VALUE 0x55667788 +/** Generic destructor function pointer. */ +#define DTOR_T(identifier) \ + void (*identifier)(const void *) + /** Integer to generic type map declaration. * @@ -72,9 +76,9 @@ \ int name##_add(name##_t *, int, type *); \ - void name##_clear(name##_t *); \ + void name##_clear(name##_t *, DTOR_T()); \ int name##_count(name##_t *); \ - void name##_destroy(name##_t *); \ - void name##_exclude(name##_t *, int); \ - void name##_exclude_index(name##_t *, int); \ + void name##_destroy(name##_t *, DTOR_T()); \ + void name##_exclude(name##_t *, int, DTOR_T()); \ + void name##_exclude_index(name##_t *, int, DTOR_T()); \ type *name##_find(name##_t *, int); \ int name##_update(name##_t *, int, int); \ @@ -82,5 +86,5 @@ int name##_initialize(name##_t *); \ int name##_is_valid(name##_t *); \ - void name##_item_destroy(name##_item_t *); \ + void name##_item_destroy(name##_item_t *, DTOR_T()); \ int name##_item_is_valid(name##_item_t *); @@ -115,5 +119,5 @@ } \ \ - void name##_clear(name##_t *map) \ + void name##_clear(name##_t *map, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -122,5 +126,5 @@ if (name##_item_is_valid(&map->items[index])) { \ name##_item_destroy( \ - &map->items[index]); \ + &map->items[index], dtor); \ } \ } \ @@ -135,5 +139,5 @@ } \ \ - void name##_destroy(name##_t *map) \ + void name##_destroy(name##_t *map, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -143,5 +147,5 @@ if (name##_item_is_valid(&map->items[index])) { \ name##_item_destroy( \ - &map->items[index]); \ + &map->items[index], dtor); \ } \ } \ @@ -150,5 +154,5 @@ } \ \ - void name##_exclude(name##_t *map, int key) \ + void name##_exclude(name##_t *map, int key, DTOR_T(dtor)) \ { \ if (name##_is_valid(map)) { \ @@ -158,16 +162,16 @@ (map->items[index].key == key)) { \ name##_item_destroy( \ - &map->items[index]); \ - } \ - } \ - } \ - } \ - \ - void name##_exclude_index(name##_t *map, int index) \ + &map->items[index], dtor); \ + } \ + } \ + } \ + } \ + \ + void name##_exclude_index(name##_t *map, int index, DTOR_T(dtor)) \ { \ if (name##_is_valid(map) && (index >= 0) && \ (index < map->next) && \ name##_item_is_valid(&map->items[index])) { \ - name##_item_destroy(&map->items[index]); \ + name##_item_destroy(&map->items[index], dtor); \ } \ } \ @@ -236,10 +240,11 @@ } \ \ - void name##_item_destroy(name##_item_t *item) \ + void name##_item_destroy(name##_item_t *item, DTOR_T(dtor)) \ { \ if (name##_item_is_valid(item)) { \ item->magic = 0; \ if (item->value) { \ - free(item->value); \ + if (dtor) \ + dtor(item->value); \ item->value = NULL; \ } \ Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/include/devman.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 8aa2b3bd36816eb9f9e92cc4098498870194aade) +++ uspace/lib/c/include/io/log.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/include/ipc/devman.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/c/include/ipc/services.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -47,8 +47,5 @@ SERVICE_DEVMAP, SERVICE_DEVMAN, - SERVICE_FHC, - SERVICE_OBIO, - SERVICE_APIC, - SERVICE_I8259, + SERVICE_IRC, SERVICE_CLIPBOARD, SERVICE_NETWORKING, Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/drv/Makefile (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -35,4 +35,5 @@ generic/driver.c \ generic/dev_iface.c \ + generic/log.c \ generic/remote_hw_res.c \ generic/remote_char_dev.c Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/drv/generic/driver.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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); @@ -408,5 +402,5 @@ get_remote_method(rem_iface, iface_method_idx); if (iface_method_ptr == NULL) { - // the interface has not such method + /* The interface has not such method */ printf("%s: driver_connection_gen error - " "invalid interface method.", driver->name); Index: uspace/lib/drv/generic/log.c =================================================================== --- uspace/lib/drv/generic/log.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) +++ uspace/lib/drv/generic/log.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 8aa2b3bd36816eb9f9e92cc4098498870194aade) +++ uspace/lib/drv/include/ddf/log.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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/fs/libfs.c =================================================================== --- uspace/lib/fs/libfs.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/fs/libfs.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -391,4 +391,6 @@ if (lflag & L_CREATE) (void) ops->destroy(fn); + else + (void) ops->node_put(fn); async_answer_0(rid, rc); } else { @@ -473,4 +475,6 @@ if (lflag & L_CREATE) (void) ops->destroy(fn); + else + (void) ops->node_put(fn); async_answer_0(rid, rc); } else { Index: uspace/lib/net/generic/generic.c =================================================================== --- uspace/lib/net/generic/generic.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/generic/generic.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -106,5 +106,5 @@ return EBADMEM; - // request the address + /* Request the address */ message_id = async_send_1(phone, (sysarg_t) message, (sysarg_t) device_id, NULL); @@ -112,7 +112,7 @@ async_wait_for(message_id, &result); - // if not successful + /* If not successful */ if ((string == EOK) && (result != EOK)) { - // clear the data + /* Clear the data */ free(*address); free(*data); @@ -242,5 +242,5 @@ return EBADMEM; - // request the translation + /* Request the translation */ message_id = async_send_3(phone, (sysarg_t) message, (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL); @@ -249,7 +249,7 @@ async_wait_for(message_id, &result); - // if not successful + /* If not successful */ if ((string == EOK) && (result != EOK)) { - // clear the data + /* Clear the data */ free(*translation); free(*data); Index: uspace/lib/net/generic/net_checksum.c =================================================================== --- uspace/lib/net/generic/net_checksum.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/generic/net_checksum.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -52,5 +52,5 @@ uint16_t compact_checksum(uint32_t sum) { - // shorten to the 16 bits + /* Shorten to the 16 bits */ while (sum >> 16) sum = (sum & 0xffff) + (sum >> 16); @@ -72,9 +72,9 @@ size_t index; - // sum all the 16 bit fields + /* Sum all the 16 bit fields */ for (index = 0; index + 1 < length; index += 2) seed += (data[index] << 8) + data[index + 1]; - // last odd byte with zero padding + /* Last odd byte with zero padding */ if (index + 1 == length) seed += data[index] << 8; @@ -94,39 +94,39 @@ size_t index; - // process full bytes + /* Process full bytes */ while (length >= 8) { - // add the data + /* Add the data */ seed ^= (*data) << 24; - // for each added bit + /* For each added bit */ for (index = 0; index < 8; ++index) { - // if the first bit is set + /* If the first bit is set */ if (seed & 0x80000000) { - // shift and divide the checksum + /* Shift and divide the checksum */ seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE); } else { - // shift otherwise + /* shift otherwise */ seed <<= 1; } } - // move to the next byte + /* Move to the next byte */ ++data; length -= 8; } - // process the odd bits + /* Process the odd bits */ if (length > 0) { - // add the data with zero padding + /* Add the data with zero padding */ seed ^= ((*data) & (0xff << (8 - length))) << 24; - // for each added bit + /* For each added bit */ for (index = 0; index < length; ++index) { - // if the first bit is set + /* If the first bit is set */ if (seed & 0x80000000) { - // shift and divide the checksum + /* Shift and divide the checksum */ seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE); } else { - // shift otherwise + /* Shift otherwise */ seed <<= 1; } @@ -148,38 +148,38 @@ size_t index; - // process full bytes + /* Process full bytes */ while (length >= 8) { - // add the data + /* Add the data */ seed ^= (*data); - // for each added bit + /* For each added bit */ for (index = 0; index < 8; ++index) { - // if the last bit is set + /* If the last bit is set */ if (seed & 1) { - // shift and divide the checksum + /* Shift and divide the checksum */ seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE); } else { - // shift otherwise + /* Shift otherwise */ seed >>= 1; } } - // move to the next byte + /* Move to the next byte */ ++data; length -= 8; } - // process the odd bits + /* Process the odd bits */ if (length > 0) { - // add the data with zero padding + /* Add the data with zero padding */ seed ^= (*data) >> (8 - length); for (index = 0; index < length; ++index) { - // if the last bit is set + /* If the last bit is set */ if (seed & 1) { - // shift and divide the checksum + /* Shift and divide the checksum */ seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE); } else { - // shift otherwise + /* Shift otherwise */ seed >>= 1; } @@ -198,5 +198,5 @@ uint16_t flip_checksum(uint16_t checksum) { - // flip, zero is returned as 0xFFFF (not flipped) + /* Flip, zero is returned as 0xFFFF (not flipped) */ checksum = ~checksum; return checksum ? checksum : IP_CHECKSUM_ZERO; @@ -216,5 +216,5 @@ uint16_t ip_checksum(uint8_t *data, size_t length) { - // compute, compact and flip the data checksum + /* Compute, compact and flip the data checksum */ return flip_checksum(compact_checksum(compute_checksum(0, data, length))); Index: uspace/lib/net/generic/packet_client.c =================================================================== --- uspace/lib/net/generic/packet_client.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/generic/packet_client.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -267,5 +267,5 @@ return NULL; - // get a new packet + /* Get a new packet */ copy = packet_get_4_remote(phone, PACKET_DATA_LENGTH(packet), PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix, @@ -274,10 +274,10 @@ return NULL; - // get addresses + /* Get addresses */ addrlen = packet_get_addr(packet, &src, &dest); - // copy data + /* Copy data */ if ((packet_copy_data(copy, packet_get_data(packet), PACKET_DATA_LENGTH(packet)) == EOK) && - // copy addresses if present + /* Copy addresses if present */ ((addrlen <= 0) || (packet_set_addr(copy, src, dest, addrlen) == EOK))) { Index: uspace/lib/net/il/ip_client.c =================================================================== --- uspace/lib/net/il/ip_client.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/il/ip_client.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -123,5 +123,5 @@ return EOK; - // TODO IPv6 + /* TODO IPv6 */ /* case AF_INET6: if (addrlen != sizeof(struct sockaddr_in6)) @@ -159,6 +159,8 @@ size_t padding; - // compute the padding if IP options are set - // multiple of 4 bytes + /* + * Compute the padding if IP options are set + * multiple of 4 bytes + */ padding = ipopt_length % 4; if (padding) { @@ -167,14 +169,14 @@ } - // prefix the header + /* Prefix the header */ data = (uint8_t *) packet_prefix(packet, sizeof(ip_header_t) + padding); if (!data) return ENOMEM; - // add the padding + /* Add the padding */ while (padding--) data[sizeof(ip_header_t) + padding] = IPOPT_NOOP; - // set the header + /* Set the header */ header = (ip_header_t *) data; header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + @@ -256,5 +258,5 @@ header_in->data_length = htons(data_length); return EOK; - // TODO IPv6 + /* TODO IPv6 */ } else { return EINVAL; Index: uspace/lib/net/include/ip_client.h =================================================================== --- uspace/lib/net/include/ip_client.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/include/ip_client.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -54,5 +54,5 @@ socklen_t, struct sockaddr *, socklen_t, size_t, void **, size_t *); -// TODO ipopt manipulation +/* TODO ipopt manipulation */ #endif Index: uspace/lib/net/tl/icmp_client.c =================================================================== --- uspace/lib/net/tl/icmp_client.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/tl/icmp_client.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -81,5 +81,5 @@ *mtu = header->un.frag.mtu; - // remove debug dump + /* Remove debug dump */ #ifdef CONFIG_DEBUG printf("ICMP error %d (%d) in packet %d\n", header->type, header->code, Index: uspace/lib/net/tl/socket_core.c =================================================================== --- uspace/lib/net/tl/socket_core.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/tl/socket_core.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -91,11 +91,11 @@ int packet_id; - // if bound + /* If bound */ if (socket->port) { - // release the port + /* Release the port */ socket_port_release(global_sockets, socket); } - // release all received packets + /* Release all received packets */ while ((packet_id = dyn_fifo_pop(&socket->received)) >= 0) pq_release_remote(packet_phone, packet_id); @@ -107,5 +107,5 @@ socket_release(socket); - socket_cores_exclude(local_sockets, socket->socket_id); + socket_cores_exclude(local_sockets, socket->socket_id, free); } @@ -166,5 +166,5 @@ int rc; - // create a wrapper + /* Create a wrapper */ socket_ref = malloc(sizeof(*socket_ref)); if (!socket_ref) @@ -172,5 +172,5 @@ *socket_ref = socket; - // add the wrapper + /* Add the wrapper */ rc = socket_port_map_add(&socket_port->map, key, key_length, socket_ref); @@ -206,5 +206,5 @@ int rc; - // create a wrapper + /* Create a wrapper */ socket_port = malloc(sizeof(*socket_port)); if (!socket_port) @@ -221,5 +221,5 @@ goto fail; - // register the incomming port + /* Register the incoming port */ rc = socket_ports_add(global_sockets, port, socket_port); if (rc < 0) @@ -230,5 +230,5 @@ fail: - socket_port_map_destroy(&socket_port->map); + socket_port_map_destroy(&socket_port->map, free); free(socket_port); return rc; @@ -277,25 +277,25 @@ address_in = (struct sockaddr_in *) addr; - // find the socket + /* Find the socket */ socket = socket_cores_find(local_sockets, socket_id); if (!socket) return ENOTSOCK; - // bind a free port? + /* Bind a free port? */ if (address_in->sin_port <= 0) return socket_bind_free_port(global_sockets, socket, free_ports_start, free_ports_end, last_used_port); - // try to find the port + /* Try to find the port */ socket_port = socket_ports_find(global_sockets, ntohs(address_in->sin_port)); if (socket_port) { - // already used + /* Already used */ return EADDRINUSE; } - // if bound + /* If bound */ if (socket->port) { - // release the port + /* Release the port */ socket_port_release(global_sockets, socket); } @@ -306,5 +306,5 @@ case AF_INET6: - // TODO IPv6 + /* TODO IPv6 */ break; } @@ -333,5 +333,5 @@ int index; - // from the last used one + /* From the last used one */ index = last_used_port; @@ -339,18 +339,18 @@ ++index; - // til the range end + /* Till the range end */ if (index >= free_ports_end) { - // start from the range beginning + /* Start from the range beginning */ index = free_ports_start - 1; do { ++index; - // til the last used one + /* Till the last used one */ if (index >= last_used_port) { - // none found + /* None found */ return ENOTCONN; } } while (socket_ports_find(global_sockets, index)); - // found, break immediately + /* Found, break immediately */ break; } @@ -384,5 +384,5 @@ socket_id = 1; ++count; - // only this branch for last_id + /* Only this branch for last_id */ } else { if (socket_id < INT_MAX) { @@ -425,5 +425,5 @@ return EINVAL; - // store the socket + /* Store the socket */ if (*socket_id <= 0) { positive = (*socket_id == 0); @@ -441,5 +441,5 @@ return ENOMEM; - // initialize + /* Initialize */ socket->phone = app_phone; socket->port = -1; @@ -493,10 +493,10 @@ int accepted_id; - // find the socket + /* Find the socket */ socket = socket_cores_find(local_sockets, socket_id); if (!socket) return ENOTSOCK; - // destroy all accepted sockets + /* Destroy all accepted sockets */ while ((accepted_id = dyn_fifo_pop(&socket->accepted)) >= 0) socket_destroy(packet_phone, accepted_id, local_sockets, @@ -535,13 +535,13 @@ next_packet = pq_next(packet); if (!next_packet) { - // write all if only one fragment + /* Write all if only one fragment */ rc = data_reply(packet_get_data(packet), packet_get_data_length(packet)); if (rc != EOK) return rc; - // store the total length + /* Store the total length */ *length = packet_get_data_length(packet); } else { - // count the packet fragments + /* Count the packet fragments */ fragments = 1; next_packet = pq_next(packet); @@ -549,5 +549,5 @@ ++fragments; - // compute and store the fragment lengths + /* Compute and store the fragment lengths */ lengths = (size_t *) malloc(sizeof(size_t) * fragments + sizeof(size_t)); @@ -565,5 +565,5 @@ } - // write the fragment lengths + /* Write the fragment lengths */ rc = data_reply(lengths, sizeof(int) * (fragments + 1)); if (rc != EOK) { @@ -573,5 +573,5 @@ next_packet = packet; - // write the fragments + /* Write the fragments */ for (index = 0; index < fragments; ++index) { rc = data_reply(packet_get_data(next_packet), @@ -584,5 +584,5 @@ } - // store the total length + /* Store the total length */ *length = lengths[fragments]; free(lengths); @@ -636,8 +636,8 @@ return; - // find ports + /* Find ports */ socket_port = socket_ports_find(global_sockets, socket->port); if (socket_port) { - // find the socket + /* Find the socket */ socket_ref = socket_port_map_find(&socket_port->map, socket->key, socket->key_length); @@ -646,15 +646,15 @@ --socket_port->count; - // release if empty + /* Release if empty */ if (socket_port->count <= 0) { - // destroy the map - socket_port_map_destroy(&socket_port->map); - // release the port + /* Destroy the map */ + socket_port_map_destroy(&socket_port->map, free); + /* Release the port */ socket_ports_exclude(global_sockets, - socket->port); + socket->port, free); } else { - // remove + /* Remove */ socket_port_map_exclude(&socket_port->map, - socket->key, socket->key_length); + socket->key, socket->key_length, free); } } @@ -685,10 +685,10 @@ int rc; - // find ports + /* Find ports */ socket_port = socket_ports_find(global_sockets, port); if (!socket_port) return ENOENT; - // add the socket + /* Add the socket */ rc = socket_port_add_core(socket_port, socket, key, key_length); if (rc != EOK) Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/net/tl/tl_common.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -182,5 +182,5 @@ else packet_dimensions_exclude(packet_dimensions, - DEVICE_INVALID_ID); + DEVICE_INVALID_ID, free); } } @@ -255,5 +255,5 @@ int length; - // detach the first packet and release the others + /* Detach the first packet and release the others */ next = pq_detach(packet); if (next) @@ -262,6 +262,8 @@ length = packet_get_addr(packet, &src, NULL); if ((length > 0) && (!error) && (icmp_phone >= 0) && - // set both addresses to the source one (avoids the source address - // deletion before setting the destination one) + /* + * Set both addresses to the source one (avoids the source address + * deletion before setting the destination one) + */ (packet_set_addr(packet, src, src, (size_t) length) == EOK)) { return EOK; @@ -299,9 +301,9 @@ return EINVAL; - // get the data length + /* Get the data length */ if (!async_data_write_receive(&callid, &length)) return EINVAL; - // get a new packet + /* Get a new packet */ *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix); @@ -309,5 +311,5 @@ return ENOMEM; - // allocate space in the packet + /* Allocate space in the packet */ data = packet_suffix(*packet, length); if (!data) { @@ -316,5 +318,5 @@ } - // read the data into the packet + /* Read the data into the packet */ rc = async_data_write_finalize(callid, data, length); if (rc != EOK) { @@ -323,5 +325,5 @@ } - // set the packet destination address + /* Set the packet destination address */ rc = packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen); if (rc != EOK) { Index: uspace/lib/packet/generic/packet_server.c =================================================================== --- uspace/lib/packet/generic/packet_server.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/packet/generic/packet_server.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -112,9 +112,9 @@ size_t max_content, size_t max_suffix) { - // clear the packet content + /* Clear the packet content */ bzero(((void *) packet) + sizeof(packet_t), packet->length - sizeof(packet_t)); - // clear the packet header + /* Clear the packet header */ packet->order = 0; packet->metric = 0; @@ -151,5 +151,5 @@ assert(fibril_mutex_is_locked(&ps_globals.lock)); - // already locked + /* Already locked */ packet = (packet_t *) mmap(NULL, length, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0); Index: uspace/lib/softint/generic/multiplication.c =================================================================== --- uspace/lib/softint/generic/multiplication.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/lib/softint/generic/multiplication.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -109,5 +109,5 @@ * result does not fit in signed one */ if (SOFTINT_CHECK_OF && ((t2 < t1) || (t2 & (1ull << 63)))) { - // error, overflow + /* Error, overflow */ return (neg ? INT64_MIN : INT64_MAX); } Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -372,4 +372,5 @@ uint16_t w; uint8_t c; + uint16_t bc; size_t pos, len; int rc; @@ -387,11 +388,24 @@ } else if (rc == EIO) { /* - * There is something, but not a register device. - * It could be a packet device. + * There is something, but not a register device. Check to see + * whether the IDENTIFY command left the packet signature in + * the registers in case this is a packet device. + * + * According to the ATA specification, the LBA low and + * interrupt reason registers should be set to 0x01. However, + * there are many devices that do not follow this and only set + * the byte count registers. So, only check these. */ - rc = identify_pkt_dev(disk_id, &idata); - if (rc == EOK) { - /* We have a packet device. */ - d->dev_type = ata_pkt_dev; + bc = ((uint16_t)pio_read_8(&cmd->cylinder_high) << 8) | + pio_read_8(&cmd->cylinder_low); + + if (bc == PDEV_SIGNATURE_BC) { + rc = identify_pkt_dev(disk_id, &idata); + if (rc == EOK) { + /* We have a packet device. */ + d->dev_type = ata_pkt_dev; + } else { + return EIO; + } } else { /* Nope. Something's there, but not recognized. */ @@ -403,5 +417,4 @@ } - printf("device caps: 0x%04x\n", idata.caps); if (d->dev_type == ata_pkt_dev) { /* Packet device */ @@ -566,8 +579,9 @@ /* - * This is where we would most likely expect a non-existing device to - * show up by not setting SR_DRDY. + * Do not wait for DRDY to be set in case this is a packet device. + * We determine whether the device is present by waiting for DRQ to be + * set after issuing the command. */ - if (wait_status(SR_DRDY, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK) + if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK) return ETIMEOUT; @@ -577,15 +591,20 @@ return ETIMEOUT; + /* + * If ERR is set, this may be a packet device, so return EIO to cause + * the caller to check for one. + */ + if ((status & SR_ERR) != 0) { + return EIO; + } + + if (wait_status(SR_DRQ, ~SR_BSY, &status, TIMEOUT_PROBE) != EOK) + return ETIMEOUT; + /* Read data from the disk buffer. */ - if ((status & SR_DRQ) != 0) { - for (i = 0; i < identify_data_size / 2; i++) { - data = pio_read_16(&cmd->data_port); - ((uint16_t *) buf)[i] = data; - } - } - - if ((status & SR_ERR) != 0) { - return EIO; + for (i = 0; i < identify_data_size / 2; i++) { + data = pio_read_16(&cmd->data_port); + ((uint16_t *) buf)[i] = data; } Index: uspace/srv/bd/ata_bd/ata_hw.h =================================================================== --- uspace/srv/bd/ata_bd/ata_hw.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/bd/ata_bd/ata_hw.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -293,4 +293,12 @@ }; +enum ata_pdev_signature { + /** + * Signature put by a packet device in byte count register + * in response to Identify command. + */ + PDEV_SIGNATURE_BC = 0xEB14 +}; + #endif Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/devman/devman.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -34,4 +34,5 @@ #include #include +#include #include #include @@ -146,6 +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); + log_msg(LVL_NOTE, "Driver `%s' was added to the list of available " + "drivers.", drv->name); } @@ -237,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; @@ -247,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; } @@ -255,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; } @@ -261,14 +264,15 @@ 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; } - if (read(fd, buf, len) <= 0) { - printf(NAME ": unable to read file '%s'.\n", conf_path); + ssize_t read_bytes = safe_read(fd, buf, len); + if (read_bytes <= 0) { + log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path); goto cleanup; } - buf[len] = 0; + buf[read_bytes] = 0; suc = parse_match_ids(buf, ids); @@ -305,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); @@ -337,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; } @@ -364,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; @@ -398,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); @@ -483,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); @@ -506,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; } @@ -573,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); @@ -640,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; @@ -657,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); /* @@ -747,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; @@ -809,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; @@ -847,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; @@ -1026,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; } @@ -1057,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; @@ -1063,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; @@ -1123,4 +1132,11 @@ fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path) { + assert(path != NULL); + + bool is_absolute = path[0] == '/'; + if (!is_absolute) { + return NULL; + } + fibril_rwlock_read_lock(&tree->rwlock); @@ -1132,5 +1148,5 @@ char *rel_path = path; char *next_path_elem = NULL; - bool cont = (rel_path[0] == '/'); + bool cont = true; while (cont && fun != NULL) { @@ -1157,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. * @@ -1167,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); } @@ -1343,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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/devman/devman.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/devman/main.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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); @@ -477,7 +529,13 @@ dev = fun->dev; - if (fun == NULL && dev == NULL) { - printf(NAME ": devman_forward error - no device or function with " - "handle %" PRIun " was found.\n", handle); + /* + * For a valid function to connect to we need a device. The root + * function, for example, has no device and cannot be connected to. + * This means @c dev needs to be valid regardless whether we are + * connecting to a device or to a function. + */ + if (dev == NULL) { + log_msg(LVL_ERROR, "IPC forwarding failed - no device or " + "function with handle %" PRIun " was found.", handle); async_answer_0(iid, ENOENT); return; @@ -485,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; @@ -507,6 +566,6 @@ if (driver == NULL) { - printf(NAME ": devman_forward error - the device is not in %" PRIun - " usable state.\n", handle); + log_msg(LVL_ERROR, "IPC forwarding refused - " \ + "the device %" PRIun " is not in usable state.", handle); async_answer_0(iid, ENOENT); return; @@ -520,7 +579,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; @@ -528,9 +587,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); } @@ -564,6 +625,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); } @@ -600,5 +662,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. */ @@ -606,13 +668,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; } @@ -635,6 +697,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; } @@ -644,8 +711,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/devman/util.c =================================================================== --- uspace/srv/devman/util.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/devman/util.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -111,4 +111,31 @@ } +ssize_t safe_read(int fd, void *buffer, size_t size) +{ + if (size == 0) { + return 0; + } + + uint8_t *buf_ptr = (uint8_t *) buffer; + + size_t total_read = 0; + while (total_read < size) { + ssize_t bytes_read = read(fd, buf_ptr, size - total_read); + if (bytes_read < 0) { + /* Error. */ + return bytes_read; + } else if (bytes_read == 0) { + /* Possibly end of file. */ + break; + } else { + /* Read at least something. */ + buf_ptr += bytes_read; + total_read += bytes_read; + } + } + + return (ssize_t) total_read; +} + /** @} */ Index: uspace/srv/devman/util.h =================================================================== --- uspace/srv/devman/util.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/devman/util.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -47,4 +47,6 @@ extern void replace_char(char *, char, char); +extern ssize_t safe_read(int, void *, size_t); + #endif Index: uspace/srv/devmap/devmap.c =================================================================== --- uspace/srv/devmap/devmap.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/devmap/devmap.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -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); Index: uspace/srv/hid/kbd/Makefile =================================================================== --- uspace/srv/hid/kbd/Makefile (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hid/kbd/Makefile (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -78,5 +78,5 @@ SOURCES += \ port/pl050.c \ - ctl/pl050.c + ctl/pc.c endif endif Index: uspace/srv/hid/kbd/ctl/pl050.c =================================================================== --- uspace/srv/hid/kbd/ctl/pl050.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ (revision ) @@ -1,267 +1,0 @@ -/* - * Copyright (c) 2009 Vineeth Pillai - * 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 kbd_ctl - * @ingroup kbd - * @{ - */ -/** - * @file - * @brief PL050 keyboard controller driver. - */ - -#include -#include -#include -#include -#include -#include - -#define PL050_CAPS_SCAN_CODE 0x58 -#define PL050_NUM_SCAN_CODE 0x77 -#define PL050_SCROLL_SCAN_CODE 0x7E - -static bool is_lock_key(int); -enum dec_state { - ds_s, - ds_e -}; - -static enum dec_state ds; - -static int scanmap_simple[] = { - - [0x0e] = KC_BACKTICK, - - [0x16] = KC_1, - [0x1e] = KC_2, - [0x26] = KC_3, - [0x25] = KC_4, - [0x2e] = KC_5, - [0x36] = KC_6, - [0x3d] = KC_7, - [0x3e] = KC_8, - [0x46] = KC_9, - [0x45] = KC_0, - - [0x4e] = KC_MINUS, - [0x55] = KC_EQUALS, - [0x66] = KC_BACKSPACE, - - [0x0d] = KC_TAB, - - [0x15] = KC_Q, - [0x1d] = KC_W, - [0x24] = KC_E, - [0x2d] = KC_R, - [0x2c] = KC_T, - [0x35] = KC_Y, - [0x3c] = KC_U, - [0x43] = KC_I, - [0x44] = KC_O, - [0x4d] = KC_P, - - [0x54] = KC_LBRACKET, - [0x5b] = KC_RBRACKET, - - [0x58] = KC_CAPS_LOCK, - - [0x1c] = KC_A, - [0x1b] = KC_S, - [0x23] = KC_D, - [0x2b] = KC_F, - [0x34] = KC_G, - [0x33] = KC_H, - [0x3b] = KC_J, - [0x42] = KC_K, - [0x4b] = KC_L, - - [0x4c] = KC_SEMICOLON, - [0x52] = KC_QUOTE, - [0x5d] = KC_BACKSLASH, - - [0x12] = KC_LSHIFT, - - [0x1a] = KC_Z, - [0x22] = KC_X, - [0x21] = KC_C, - [0x2a] = KC_V, - [0x32] = KC_B, - [0x31] = KC_N, - [0x3a] = KC_M, - - [0x41] = KC_COMMA, - [0x49] = KC_PERIOD, - [0x4a] = KC_SLASH, - - [0x59] = KC_RSHIFT, - - [0x14] = KC_LCTRL, - [0x11] = KC_LALT, - [0x29] = KC_SPACE, - - [0x76] = KC_ESCAPE, - - [0x05] = KC_F1, - [0x06] = KC_F2, - [0x04] = KC_F3, - [0x0c] = KC_F4, - [0x03] = KC_F5, - [0x0b] = KC_F6, - [0x02] = KC_F7, - - [0x0a] = KC_F8, - [0x01] = KC_F9, - [0x09] = KC_F10, - - [0x78] = KC_F11, - [0x07] = KC_F12, - - [0x60] = KC_SCROLL_LOCK, - - [0x5a] = KC_ENTER, - - [0x77] = KC_NUM_LOCK, - [0x7c] = KC_NTIMES, - [0x7b] = KC_NMINUS, - [0x79] = KC_NPLUS, - [0x6c] = KC_N7, - [0x75] = KC_N8, - [0x7d] = KC_N9, - [0x6b] = KC_N4, - [0x73] = KC_N5, - [0x74] = KC_N6, - [0x69] = KC_N1, - [0x72] = KC_N2, - [0x7a] = KC_N3, - [0x70] = KC_N0, - [0x71] = KC_NPERIOD -}; - -static int scanmap_e0[] = { - [0x65] = KC_RALT, - [0x59] = KC_RSHIFT, - - [0x64] = KC_PRTSCR, - - [0x70] = KC_INSERT, - [0x6c] = KC_HOME, - [0x7d] = KC_PAGE_UP, - - [0x71] = KC_DELETE, - [0x69] = KC_END, - [0x7a] = KC_PAGE_DOWN, - - [0x75] = KC_UP, - [0x6b] = KC_LEFT, - [0x72] = KC_DOWN, - [0x74] = KC_RIGHT, - - [0x4a] = KC_NSLASH, - [0x5a] = KC_NENTER -}; - -int kbd_ctl_init(void) -{ - ds = ds_s; - return 0; -} - -void kbd_ctl_parse_scancode(int scancode) -{ - static int key_release_flag = 0; - static int is_locked = 0; - console_ev_type_t type; - unsigned int key; - int *map; - size_t map_length; - - if (scancode == 0xe0) { - ds = ds_e; - return; - } - - switch (ds) { - case ds_s: - map = scanmap_simple; - map_length = sizeof(scanmap_simple) / sizeof(int); - break; - case ds_e: - map = scanmap_e0; - map_length = sizeof(scanmap_e0) / sizeof(int); - break; - default: - map = NULL; - map_length = 0; - } - - ds = ds_s; - if (scancode == 0xf0) { - key_release_flag = 1; - return; - } else { - if (key_release_flag) { - type = KEY_RELEASE; - key_release_flag = 0; - if (is_lock_key(scancode)) { - if (!is_locked) { - is_locked = 1; - } else { - is_locked = 0; - return; - } - } - } else { - if (is_lock_key(scancode) && is_locked) - return; - type = KEY_PRESS; - } - } - - if (scancode < 0) - return; - - key = map[scancode]; - if (key != 0) - kbd_push_ev(type, key); -} - -static bool is_lock_key(int sc) -{ - return ((sc == PL050_CAPS_SCAN_CODE) || (sc == PL050_NUM_SCAN_CODE) || - (sc == PL050_SCROLL_SCAN_CODE)); -} - -void kbd_ctl_set_ind(unsigned mods) -{ - (void) mods; -} - -/** - * @} - */ Index: uspace/srv/hid/kbd/generic/kbd.c =================================================================== --- uspace/srv/hid/kbd/generic/kbd.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hid/kbd/generic/kbd.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -67,6 +67,6 @@ static unsigned lock_keys; -int cir_service = 0; -int cir_phone = -1; +bool irc_service = false; +int irc_phone = -1; #define NUM_LAYOUTS 3 @@ -216,12 +216,11 @@ sysarg_t obio; - if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc)) - cir_service = SERVICE_FHC; - else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)) - cir_service = SERVICE_OBIO; - - if (cir_service) { - while (cir_phone < 0) - cir_phone = service_connect_blocking(cir_service, 0, 0); + if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc)) + || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))) + irc_service = true; + + if (irc_service) { + while (irc_phone < 0) + irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0); } Index: uspace/srv/hid/kbd/include/kbd.h =================================================================== --- uspace/srv/hid/kbd/include/kbd.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hid/kbd/include/kbd.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -38,6 +38,8 @@ #define KBD_KBD_H_ -extern int cir_service; -extern int cir_phone; +#include + +extern bool irc_service; +extern int irc_phone; extern void kbd_push_scancode(int); Index: uspace/srv/hid/kbd/port/ns16550.c =================================================================== --- uspace/srv/hid/kbd/port/ns16550.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hid/kbd/port/ns16550.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -120,6 +120,6 @@ kbd_push_scancode(scan_code); - if (cir_service) - async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT, + if (irc_service) + async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, IPC_GET_IMETHOD(*call)); } Index: uspace/srv/hid/kbd/port/z8530.c =================================================================== --- uspace/srv/hid/kbd/port/z8530.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hid/kbd/port/z8530.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -108,6 +108,6 @@ kbd_push_scancode(scan_code); - if (cir_service) - async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT, + if (irc_service) + async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, IPC_GET_IMETHOD(*call)); } Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -367,9 +367,9 @@ static void cuda_irq_rcv_end(void *buf, size_t *len) { - uint8_t data, b; - + uint8_t b; + b = pio_read_8(&dev->b); - data = pio_read_8(&dev->sr); - + pio_read_8(&dev->sr); + if ((b & TREQ) == 0) { instance->xstate = cx_receive; @@ -379,7 +379,7 @@ cuda_send_start(); } - - memcpy(buf, instance->rcv_buf, instance->bidx); - *len = instance->bidx; + + memcpy(buf, instance->rcv_buf, instance->bidx); + *len = instance->bidx; instance->bidx = 0; } Index: uspace/srv/hw/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hw/irc/apic/apic.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -56,5 +56,5 @@ static int apic_enable_irq(sysarg_t irq) { - // FIXME: TODO + /* FIXME: TODO */ return ENOTSUP; } @@ -107,5 +107,5 @@ async_set_client_connection(apic_connection); - service_register(SERVICE_APIC); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/irc/fhc/fhc.c =================================================================== --- uspace/srv/hw/irc/fhc/fhc.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hw/irc/fhc/fhc.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -136,5 +136,5 @@ async_set_client_connection(fhc_connection); - service_register(SERVICE_FHC); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/irc/i8259/i8259.c =================================================================== --- uspace/srv/hw/irc/i8259/i8259.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hw/irc/i8259/i8259.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -149,5 +149,5 @@ async_set_client_connection(i8259_connection); - service_register(SERVICE_I8259); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/irc/obio/obio.c =================================================================== --- uspace/srv/hw/irc/obio/obio.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hw/irc/obio/obio.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -137,5 +137,5 @@ async_set_client_connection(obio_connection); - service_register(SERVICE_OBIO); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/netif/ne2000/dp8390.c =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hw/netif/ne2000/dp8390.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -391,4 +391,5 @@ if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { + fibril_mutex_unlock(&ne2k->sq_mutex); fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n", NAME, size); Index: uspace/srv/hw/netif/ne2000/ne2000.c =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/hw/netif/ne2000/ne2000.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -75,5 +75,5 @@ #define IRQ_GET_TSR(call) ((int) IPC_GET_ARG3(call)) -static int irc_service = 0; +static bool irc_service = false; static int irc_phone = -1; @@ -383,12 +383,11 @@ sysarg_t i8259; - if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) - irc_service = SERVICE_APIC; - else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) - irc_service = SERVICE_I8259; + if (((sysinfo_get_value("apic", &apic) == EOK) && (apic)) + || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) + irc_service = true; if (irc_service) { while (irc_phone < 0) - irc_phone = service_connect_blocking(irc_service, 0, 0); + irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0); } Index: uspace/srv/loader/arch/abs32le/_link.ld.in =================================================================== --- uspace/srv/loader/arch/abs32le/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/abs32le/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -21,6 +21,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/amd64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/amd64/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/amd64/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -27,6 +27,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/arm32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/arm32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/arm32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ia32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ia32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/ia32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -26,6 +26,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ia64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ia64/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/ia64/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -21,6 +21,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text @@ -29,5 +29,5 @@ .got : { _gp = .; - *(.got*); + *(.got .got.*); } :data Index: uspace/srv/loader/arch/mips32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/mips32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/mips32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ppc32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ppc32/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/ppc32/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/sparc64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/sparc64/_link.ld.in (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/arch/sparc64/_link.ld.in (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -20,6 +20,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/loader/main.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -415,12 +415,10 @@ /* Not reached */ default: - retval = ENOENT; + retval = EINVAL; break; } - if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) { - DPRINTF("Responding EINVAL to method %d.\n", - IPC_GET_IMETHOD(call)); - async_answer_0(callid, EINVAL); - } + + if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) + async_answer_0(callid, retval); } } Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/net/il/arp/arp.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -157,9 +157,9 @@ arp_clear_addr(&proto->addresses); - arp_addr_destroy(&proto->addresses); - } - } - - arp_protos_clear(&device->protos); + arp_addr_destroy(&proto->addresses, free); + } + } + + arp_protos_clear(&device->protos, free); } @@ -184,5 +184,5 @@ } - arp_cache_clear(&arp_globals.cache); + arp_cache_clear(&arp_globals.cache, free); fibril_mutex_unlock(&arp_globals.lock); @@ -212,5 +212,5 @@ arp_clear_trans(trans); - arp_addr_exclude(&proto->addresses, address->value, address->length); + arp_addr_exclude(&proto->addresses, address->value, address->length, free); fibril_mutex_unlock(&arp_globals.lock); @@ -345,5 +345,5 @@ header->protocol_length, trans); if (rc != EOK) { - /* The generic char map has already freed trans! */ + free(trans); return rc; } @@ -556,5 +556,5 @@ if (index < 0) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return index; @@ -569,5 +569,5 @@ if (device->phone < 0) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return EREFUSED; @@ -579,5 +579,5 @@ if (rc != EOK) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -589,5 +589,5 @@ if (rc != EOK) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -601,5 +601,5 @@ free(device->addr); free(device->addr_data); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -614,5 +614,5 @@ free(device->broadcast_addr); free(device->broadcast_data); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -746,5 +746,5 @@ arp_clear_trans(trans); arp_addr_exclude(&proto->addresses, target->value, - target->length); + target->length, free); return EAGAIN; } @@ -794,5 +794,5 @@ trans); if (rc != EOK) { - /* The generic char map has already freed trans! */ + free(trans); return rc; } @@ -807,5 +807,5 @@ arp_clear_trans(trans); arp_addr_exclude(&proto->addresses, target->value, - target->length); + target->length, free); return ENOENT; } Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/net/il/ip/ip.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -176,5 +176,5 @@ socklen_t addrlen; - // detach the first packet and release the others + /* Detach the first packet and release the others */ next = pq_detach(packet); if (next) @@ -185,5 +185,5 @@ return ENOMEM; - // get header + /* Get header */ header = (ip_header_t *) packet_get_data(packet); if (!header) @@ -192,13 +192,13 @@ } - // only for the first fragment + /* Only for the first fragment */ if (IP_FRAGMENT_OFFSET(header)) return EINVAL; - // not for the ICMP protocol + /* Not for the ICMP protocol */ if (header->protocol == IPPROTO_ICMP) return EPERM; - // set the destination address + /* Set the destination address */ switch (header->version) { case IPVERSION: @@ -351,5 +351,5 @@ configuration = &names[0]; - // get configuration + /* Get configuration */ rc = net_get_device_conf_req(ip_globals.net_phone, ip_netif->device_id, &configuration, count, &data); @@ -365,5 +365,5 @@ if (ip_netif->dhcp) { - // TODO dhcp + /* TODO dhcp */ net_free_settings(configuration, data); return ENOTSUP; @@ -398,5 +398,5 @@ } } else { - // TODO ipv6 in separate module + /* TODO ipv6 in separate module */ net_free_settings(configuration, data); return ENOTSUP; @@ -419,5 +419,5 @@ } - // binds the netif service which also initializes the device + /* Bind netif service which also initializes the device */ ip_netif->phone = nil_bind_service(ip_netif->service, (sysarg_t) ip_netif->device_id, SERVICE_IP, @@ -429,5 +429,5 @@ } - // has to be after the device netif module initialization + /* Has to be after the device netif module initialization */ if (ip_netif->arp) { if (route) { @@ -445,5 +445,5 @@ } - // get packet dimensions + /* Get packet dimensions */ rc = nil_packet_size_req(ip_netif->phone, ip_netif->device_id, &ip_netif->packet_dimension); @@ -463,5 +463,5 @@ if (gateway.s_addr) { - // the default gateway + /* The default gateway */ ip_globals.gateway.address.s_addr = 0; ip_globals.gateway.netmask.s_addr = 0; @@ -505,5 +505,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&ip_globals.netifs_lock); - ip_routes_destroy(&ip_netif->routes); + ip_routes_destroy(&ip_netif->routes, free); free(ip_netif); return rc; @@ -512,10 +512,10 @@ ip_netif->arp->usage++; - // print the settings + /* Print the settings */ printf("%s: Device registered (id: %d, phone: %d, ipv: %d, conf: %s)\n", NAME, ip_netif->device_id, ip_netif->phone, ip_netif->ipv, ip_netif->dhcp ? "dhcp" : "static"); - // TODO ipv6 addresses + /* TODO ipv6 addresses */ char address[INET_ADDRSTRLEN]; @@ -587,5 +587,5 @@ ip_netif_t *netif; - // start with the last netif - the newest one + /* Start with the last netif - the newest one */ index = ip_netifs_count(&ip_globals.netifs) - 1; while (index >= 0) { @@ -629,18 +629,18 @@ size_t length; - // copy first itself + /* Copy first itself */ memcpy(last, first, sizeof(ip_header_t)); length = sizeof(ip_header_t); next = sizeof(ip_header_t); - // process all ip options + /* Process all IP options */ while (next < first->header_length) { option = (ip_option_t *) (((uint8_t *) first) + next); - // skip end or noop + /* Skip end or noop */ if ((option->type == IPOPT_END) || (option->type == IPOPT_NOOP)) { next++; } else { - // copy if told so or skip + /* Copy if told so or skip */ if (IPOPT_COPIED(option->type)) { memcpy(((uint8_t *) last) + length, @@ -648,10 +648,10 @@ length += option->length; } - // next option + /* Next option */ next += option->length; } } - // align 4 byte boundary + /* Align 4 byte boundary */ if (length % 4) { bzero(((uint8_t *) last) + length, 4 - (length % 4)); @@ -789,5 +789,5 @@ header->total_length = htons(length); - // unnecessary for all protocols + /* Unnecessary for all protocols */ header->header_checksum = IP_HEADER_CHECKSUM(header); @@ -916,14 +916,14 @@ return ENOMEM; - // get header + /* Get header */ header = (ip_header_t *) packet_get_data(packet); if (!header) return EINVAL; - // fragmentation forbidden? + /* Fragmentation forbidden? */ if(header->flags & IPFLAG_DONT_FRAGMENT) return EPERM; - // create the last fragment + /* Create the last fragment */ new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length, suffix, ((addrlen > addr_len) ? addrlen : addr_len)); @@ -931,5 +931,5 @@ return ENOMEM; - // allocate as much as originally + /* Allocate as much as originally */ last_header = (ip_header_t *) packet_suffix(new_packet, IP_HEADER_LENGTH(header)); @@ -939,5 +939,5 @@ ip_create_last_header(last_header, header); - // trim the unused space + /* Trim the unused space */ rc = packet_trim(new_packet, 0, IP_HEADER_LENGTH(header) - IP_HEADER_LENGTH(last_header)); @@ -945,6 +945,6 @@ return ip_release_and_return(packet, rc); - // biggest multiple of 8 lower than content - // TODO even fragmentation? + /* Greatest multiple of 8 lower than content */ + /* TODO even fragmentation? */ length = length & ~0x7; @@ -957,8 +957,8 @@ return ip_release_and_return(packet, rc); - // mark the first as fragmented + /* Mark the first as fragmented */ header->flags |= IPFLAG_MORE_FRAGMENTS; - // create middle framgents + /* Create middle fragments */ while (IP_TOTAL_LENGTH(header) > length) { new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, @@ -981,5 +981,5 @@ } - // finish the first fragment + /* Finish the first fragment */ header->header_checksum = IP_HEADER_CHECKSUM(header); @@ -1012,5 +1012,5 @@ next = packet; - // check all packets + /* Check all packets */ while (next) { length = packet_get_data_length(next); @@ -1021,5 +1021,5 @@ } - // too long + /* Too long */ result = ip_fragment_packet(next, content, prefix, suffix, addr_len); @@ -1027,13 +1027,13 @@ new_packet = pq_detach(next); if (next == packet) { - // the new first packet of the queue + /* The new first packet of the queue */ packet = new_packet; } - // fragmentation needed? + /* Fragmentation needed? */ if (result == EPERM) { phone = ip_prepare_icmp_and_get_phone( error, next, NULL); if (phone >= 0) { - // fragmentation necessary ICMP + /* Fragmentation necessary ICMP */ icmp_destination_unreachable_msg(phone, ICMP_FRAG_NEEDED, content, next); @@ -1080,5 +1080,5 @@ int rc; - // get destination hardware address + /* Get destination hardware address */ if (netif->arp && (route->address.s_addr != dest.s_addr)) { destination.value = route->gateway.s_addr ? @@ -1102,5 +1102,5 @@ NULL); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1148,6 +1148,8 @@ int rc; - // addresses in the host byte order - // should be the next hop address or the target destination address + /* + * Addresses in the host byte order + * Should be the next hop address or the target destination address + */ addrlen = packet_get_addr(packet, NULL, (uint8_t **) &addr); if (addrlen < 0) @@ -1174,5 +1176,5 @@ fibril_rwlock_read_lock(&ip_globals.netifs_lock); - // device specified? + /* Device specified? */ if (device_id > 0) { netif = ip_netifs_find(&ip_globals.netifs, device_id); @@ -1190,5 +1192,5 @@ phone = ip_prepare_icmp_and_get_phone(error, packet, NULL); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_NET_UNREACH, 0, packet); @@ -1198,6 +1200,8 @@ if (error) { - // do not send for broadcast, anycast packets or network - // broadcast + /* + * Do not send for broadcast, anycast packets or network + * broadcast. + */ if (!dest->s_addr || !(~dest->s_addr) || !(~((dest->s_addr & ~route->netmask.s_addr) | @@ -1208,8 +1212,8 @@ } - // if the local host is the destination + /* Ff the local host is the destination */ if ((route->address.s_addr == dest->s_addr) && (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) { - // find the loopback device to deliver + /* Find the loopback device to deliver */ dest->s_addr = IPV4_LOCALHOST_ADDRESS; route = ip_find_route(*dest); @@ -1220,5 +1224,5 @@ NULL); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1252,5 +1256,5 @@ fibril_rwlock_write_lock(&ip_globals.netifs_lock); - // find the device + /* Find the device */ netif = ip_netifs_find(&ip_globals.netifs, device_id); if (!netif) { @@ -1275,5 +1279,5 @@ in_addr_t destination; - // TODO search set ipopt route? + /* TODO search set ipopt route? */ destination.s_addr = header->destination_address; return destination; @@ -1317,5 +1321,5 @@ if ((header->flags & IPFLAG_MORE_FRAGMENTS) || IP_FRAGMENT_OFFSET(header)) { - // TODO fragmented + /* TODO fragmented */ return ENOTSUP; } @@ -1344,5 +1348,5 @@ return ip_release_and_return(packet, rc); - // trim padding if present + /* Trim padding if present */ if (!error && (IP_TOTAL_LENGTH(header) < packet_get_data_length(packet))) { @@ -1360,5 +1364,5 @@ phone = ip_prepare_icmp_and_get_phone(error, packet, header); if (phone >= 0) { - // unreachable ICMP + /* Unreachable ICMP */ icmp_destination_unreachable_msg(phone, ICMP_PROT_UNREACH, 0, packet); @@ -1417,10 +1421,10 @@ return ip_release_and_return(packet, ENOMEM); - // checksum + /* Checksum */ if ((header->header_checksum) && (IP_HEADER_CHECKSUM(header) != IP_CHECKSUM_ZERO)) { phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // checksum error ICMP + /* Checksum error ICMP */ icmp_parameter_problem_msg(phone, ICMP_PARAM_POINTER, ((size_t) ((void *) &header->header_checksum)) - @@ -1433,5 +1437,5 @@ phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // ttl exceeded ICMP + /* ttl exceeded ICMP */ icmp_time_exceeded_msg(phone, ICMP_EXC_TTL, packet); } @@ -1439,8 +1443,8 @@ } - // process ipopt and get destination + /* Process ipopt and get destination */ dest = ip_get_destination(header); - // set the addrination address + /* Set the destination address */ switch (header->version) { case IPVERSION: @@ -1464,5 +1468,5 @@ phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // unreachable ICMP + /* Unreachable ICMP */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1472,5 +1476,5 @@ if (route->address.s_addr == dest.s_addr) { - // local delivery + /* Local delivery */ return ip_deliver_local(device_id, packet, header, 0); } @@ -1484,5 +1488,5 @@ phone = ip_prepare_icmp_and_get_phone(0, packet, header); if (phone >= 0) { - // unreachable ICMP if no routing + /* Unreachable ICMP if no routing */ icmp_destination_unreachable_msg(phone, ICMP_HOST_UNREACH, 0, packet); @@ -1770,8 +1774,8 @@ header = (ip_header_t *)(data + offset); - // destination host unreachable? + /* Destination host unreachable? */ if ((type != ICMP_DEST_UNREACH) || (code != ICMP_HOST_UNREACH)) { - // no, something else + /* No, something else */ break; } @@ -1787,8 +1791,8 @@ route = ip_routes_get_index(&netif->routes, 0); - // from the same network? + /* From the same network? */ if (route && ((route->address.s_addr & route->netmask.s_addr) == (header->destination_address & route->netmask.s_addr))) { - // clear the ARP mapping if any + /* Clear the ARP mapping if any */ address.value = (uint8_t *) &header->destination_address; address.length = sizeof(header->destination_address); @@ -1844,8 +1848,8 @@ fibril_rwlock_read_lock(&ip_globals.lock); route = ip_find_route(*dest); - // if the local host is the destination + /* If the local host is the destination */ if (route && (route->address.s_addr == dest->s_addr) && (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) { - // find the loopback device to deliver + /* Find the loopback device to deliver */ dest->s_addr = IPV4_LOCALHOST_ADDRESS; route = ip_find_route(*dest); Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/net/net/net.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -289,12 +289,15 @@ if (rc != EOK) return rc; + rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME, (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service); if (rc != EOK) return rc; + rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME, (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service); if (rc != EOK) return rc; + rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME, (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service); @@ -552,5 +555,5 @@ rc = read_netif_configuration(conf_files[i], netif); if (rc != EOK) { - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return rc; @@ -562,5 +565,5 @@ if (!setting) { fprintf(stderr, "%s: Network interface name is missing\n", NAME); - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return EINVAL; @@ -571,5 +574,5 @@ int index = netifs_add(&net_globals.netifs, netif->id, netif); if (index < 0) { - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return index; @@ -583,6 +586,6 @@ index); if (rc != EOK) { - measured_strings_destroy(&netif->configuration); - netifs_exclude_index(&net_globals.netifs, index); + measured_strings_destroy(&netif->configuration, free); + netifs_exclude_index(&net_globals.netifs, index, free); return rc; } @@ -590,10 +593,9 @@ rc = start_device(netif); if (rc != EOK) { - printf("%s: Error starting interface %s (%s)\n", NAME, + printf("%s: Ignoring failed interface %s (%s)\n", NAME, netif->name, str_error(rc)); - measured_strings_destroy(&netif->configuration); - netifs_exclude_index(&net_globals.netifs, index); - - return rc; + measured_strings_destroy(&netif->configuration, free); + netifs_exclude_index(&net_globals.netifs, index, free); + continue; } Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/net/nil/eth/eth.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -214,5 +214,5 @@ if (rc != EOK) { free(eth_globals.broadcast_addr); - eth_devices_destroy(ð_globals.devices); + eth_devices_destroy(ð_globals.devices, free); } out: @@ -531,5 +531,5 @@ proto->service); } else { - // drop invalid/unknown + /* Drop invalid/unknown */ pq_release_remote(eth_globals.net_phone, packet_get_id(packet)); Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/net/tl/tcp/tcp.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -299,7 +299,8 @@ return tcp_release_and_return(packet, NO_DATA); -// printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header), -// ntohs(header->destination_port)); - +#if 0 + printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header), + ntohs(header->destination_port)); +#endif result = packet_get_addr(packet, (uint8_t **) &src, (uint8_t **) &dest); if (result <= 0) @@ -1062,5 +1063,5 @@ tcp_process_acknowledgement(socket, socket_data, header); - socket_data->next_incoming = ntohl(header->sequence_number); // + 1; + socket_data->next_incoming = ntohl(header->sequence_number); /* + 1; */ pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); socket_data->state = TCP_SOCKET_ESTABLISHED; @@ -1707,5 +1708,5 @@ if (socket->port > 0) { socket_ports_exclude(&tcp_globals.sockets, - socket->port); + socket->port, free); socket->port = 0; } @@ -2492,5 +2493,5 @@ rc = packet_dimensions_initialize(&tcp_globals.dimensions); if (rc != EOK) { - socket_ports_destroy(&tcp_globals.sockets); + socket_ports_destroy(&tcp_globals.sockets, free); goto out; } Index: uspace/srv/net/tl/tcp/tcp.h =================================================================== --- uspace/srv/net/tl/tcp/tcp.h (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/net/tl/tcp/tcp.h (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -190,7 +190,4 @@ int backlog; -// /** Segment size. */ -// size_t segment_size; - /** * Parent listening socket identifier. Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/net/tl/udp/udp.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -417,5 +417,5 @@ rc = packet_dimensions_initialize(&udp_globals.dimensions); if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); + socket_ports_destroy(&udp_globals.sockets, free); fibril_rwlock_write_unlock(&udp_globals.lock); return rc; @@ -434,5 +434,5 @@ &data); if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); + socket_ports_destroy(&udp_globals.sockets, free); fibril_rwlock_write_unlock(&udp_globals.lock); return rc; @@ -499,5 +499,9 @@ device_id_t device_id; packet_dimension_t *packet_dimension; + size_t size; int rc; + + /* In case of error, do not update the data fragment size. */ + *data_fragment_size = 0; rc = tl_get_address_port(addr, addrlen, &dest_port); @@ -539,4 +543,14 @@ packet_dimension = &udp_globals.packet_dimension; // } + + /* + * Update the data fragment size based on what the lower layers can + * handle without fragmentation, but not more than the maximum allowed + * for UDP. + */ + size = MAX_UDP_FRAGMENT_SIZE; + if (packet_dimension->content < size) + size = packet_dimension->content; + *data_fragment_size = size; /* Read the first packet fragment */ @@ -786,13 +800,12 @@ break; + size = MAX_UDP_FRAGMENT_SIZE; if (tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK) { - SOCKET_SET_DATA_FRAGMENT_SIZE(answer, - packet_dimension->content); + if (packet_dimension->content < size) + size = packet_dimension->content; } - -// SOCKET_SET_DATA_FRAGMENT_SIZE(answer, -// MAX_UDP_FRAGMENT_SIZE); + SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size); SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE); answer_count = 3; Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 3a3d4ca595a9beb21ff6843f12c73a08d87978e7) +++ uspace/srv/vfs/vfs_ops.c (revision 8aa2b3bd36816eb9f9e92cc4098498870194aade) @@ -611,5 +611,5 @@ void vfs_open_node(ipc_callid_t rid, ipc_call_t *request) { - // FIXME: check for sanity of the supplied fs, dev and index + /* FIXME: check for sanity of the supplied fs, dev and index */ /* @@ -1234,4 +1234,5 @@ if (!parentc) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, rc); free(old); @@ -1251,4 +1252,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, rc); free(old); @@ -1261,4 +1263,5 @@ (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, EXDEV); /* different file systems */ free(old); @@ -1279,4 +1282,5 @@ if (!new_node) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, ENOMEM); free(old); @@ -1290,4 +1294,5 @@ default: fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, ENOTEMPTY); free(old); @@ -1300,4 +1305,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); if (new_node) vfs_node_put(new_node);