Index: uspace/app/bdsh/cmds/modules/cmp/cmp.c =================================================================== --- uspace/app/bdsh/cmds/modules/cmp/cmp.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/bdsh/cmds/modules/cmp/cmp.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -59,10 +59,10 @@ help_cmd_cmp(HELP_SHORT); printf( - "Usage: %s [options] \n" - "Options:\n" - " -h, --help A short option summary\n" - " -v, --version Print version information and exit\n" - "No output is printed; the return code is 1 if the files differ.\n", - cmdname); + "Usage: %s [options] \n" + "Options:\n" + " -h, --help A short option summary\n" + " -v, --version Print version information and exit\n" + "No output is printed; the return code is 1 if the files differ.\n", + cmdname); } @@ -73,9 +73,9 @@ { errno_t rc = EOK; - const char *fn[2] = {fn0, fn1}; - int fd[2] = {-1, -1}; + const char *fn[2] = { fn0, fn1 }; + int fd[2] = { -1, -1 }; char buffer[2][CMP_BUFLEN]; size_t offset[2]; - aoff64_t pos[2] = {}; + aoff64_t pos[2] = { }; for (int i = 0; i < 2; i++) { @@ -142,5 +142,5 @@ if (argc - optind != 2) { printf("%s - incorrect number of arguments. Try `%s --help'\n", - cmdname, cmdname); + cmdname, cmdname); return CMD_FAILURE; } Index: uspace/app/bdsh/test/toktest.c =================================================================== --- uspace/app/bdsh/test/toktest.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/bdsh/test/toktest.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -43,5 +43,6 @@ /* Tokenize the input, asserts that number of tokens is okay. */ -static void prepare(const char *input, size_t expected_token_count) { +static void prepare(const char *input, size_t expected_token_count) +{ str_cpy(input_buffer, MAX_INPUT, input); @@ -68,5 +69,6 @@ PCUT_TEST_SUITE(tokenizer); -PCUT_TEST_AFTER { +PCUT_TEST_AFTER +{ /* Destroy the tokenizer. */ tok_fini(&tokenizer); @@ -74,9 +76,11 @@ -PCUT_TEST(empty_input) { +PCUT_TEST(empty_input) +{ prepare("", 0); } -PCUT_TEST(only_spaces) { +PCUT_TEST(only_spaces) +{ prepare(" ", 1); @@ -84,5 +88,6 @@ } -PCUT_TEST(two_text_tokens) { +PCUT_TEST(two_text_tokens) +{ prepare("alpha bravo", 3); Index: uspace/app/mkbd/main.c =================================================================== --- uspace/app/mkbd/main.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/mkbd/main.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -145,6 +145,6 @@ usb_hid_report_field_t *field = usb_hid_report_get_sibling( - report, NULL, path, USB_HID_PATH_COMPARE_END - | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + report, NULL, path, USB_HID_PATH_COMPARE_END | + USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); @@ -157,6 +157,6 @@ field = usb_hid_report_get_sibling( - report, field, path, USB_HID_PATH_COMPARE_END - | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + report, field, path, USB_HID_PATH_COMPARE_END | + USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); } @@ -228,5 +228,5 @@ if (!sess) { printf(NAME ": failed to connect to the device (handle %" - PRIun "): %s.\n", dev_handle, str_error(errno)); + PRIun "): %s.\n", dev_handle, str_error(errno)); return errno; } @@ -238,5 +238,5 @@ if (rc != EOK) { printf(NAME ": failed to get path (handle %" - PRIun "): %s.\n", dev_handle, str_error(errno)); + PRIun "): %s.\n", dev_handle, str_error(errno)); return ENOMEM; } Index: uspace/app/sbi/src/run_expr.c =================================================================== --- uspace/app/sbi/src/run_expr.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/sbi/src/run_expr.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -311,6 +311,6 @@ assert(csi != NULL); - if (symbol_search_csi(run->program, csi, nameref->name) - == NULL) { + if (symbol_search_csi(run->program, csi, nameref->name) == + NULL) { /* Function is not in the current object. */ printf("Error: Cannot access non-static member " @@ -349,6 +349,6 @@ assert(csi != NULL); - if (symbol_search_csi(run->program, csi, nameref->name) - == NULL && !stree_symbol_is_static(sym)) { + if (symbol_search_csi(run->program, csi, nameref->name) == + NULL && !stree_symbol_is_static(sym)) { /* Symbol is not in the current object. */ printf("Error: Cannot access non-static member " @@ -1271,5 +1271,5 @@ switch (unop->uc) { case uo_plus: - bigint_clone(&val->var->u.int_v->value, &int_v->value); + bigint_clone(&val->var->u.int_v->value, &int_v->value); break; case uo_minus: @@ -1318,5 +1318,5 @@ c2 = &v2->var->u.char_v->value; - bigint_sub(c1, c2, &diff); + bigint_sub(c1, c2, &diff); *res = bigint_is_zero(&diff); break; @@ -1438,5 +1438,6 @@ } - i = 0; length = 1; + i = 0; + length = 1; while (node != NULL) { expr = list_node_data(node, stree_expr_t *); @@ -1567,5 +1568,5 @@ *res = run_recovery_item(run); goto cleanup; - } + } if (rarg == NULL) { @@ -2755,8 +2756,16 @@ switch (rarg_vi->u.value->var->vc) { - case vc_bool: csi_sym = bi->boxed_bool; break; - case vc_char: csi_sym = bi->boxed_char; break; - case vc_int: csi_sym = bi->boxed_int; break; - case vc_string: csi_sym = bi->boxed_string; break; + case vc_bool: + csi_sym = bi->boxed_bool; + break; + case vc_char: + csi_sym = bi->boxed_char; + break; + case vc_int: + csi_sym = bi->boxed_int; + break; + case vc_string: + csi_sym = bi->boxed_string; + break; case vc_ref: Index: uspace/app/sbi/src/stype_expr.c =================================================================== --- uspace/app/sbi/src/stype_expr.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/sbi/src/stype_expr.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -151,16 +151,40 @@ switch (expr->ec) { - case ec_nameref: stype_nameref(stype, expr->u.nameref, &et); break; - case ec_literal: stype_literal(stype, expr->u.literal, &et); break; - case ec_self_ref: stype_self_ref(stype, expr->u.self_ref, &et); break; - case ec_binop: stype_binop(stype, expr->u.binop, &et); break; - case ec_unop: stype_unop(stype, expr->u.unop, &et); break; - case ec_new: stype_new(stype, expr->u.new_op, &et); break; - case ec_access: stype_access(stype, expr->u.access, &et); break; - case ec_call: stype_call(stype, expr->u.call, &et); break; - case ec_index: stype_index(stype, expr->u.index, &et); break; - case ec_assign: stype_assign(stype, expr->u.assign, &et); break; - case ec_as: stype_as(stype, expr->u.as_op, &et); break; - case ec_box: stype_box(stype, expr->u.box, &et); break; + case ec_nameref: + stype_nameref(stype, expr->u.nameref, &et); + break; + case ec_literal: + stype_literal(stype, expr->u.literal, &et); + break; + case ec_self_ref: + stype_self_ref(stype, expr->u.self_ref, &et); + break; + case ec_binop: + stype_binop(stype, expr->u.binop, &et); + break; + case ec_unop: + stype_unop(stype, expr->u.unop, &et); + break; + case ec_new: + stype_new(stype, expr->u.new_op, &et); + break; + case ec_access: + stype_access(stype, expr->u.access, &et); + break; + case ec_call: + stype_call(stype, expr->u.call, &et); + break; + case ec_index: + stype_index(stype, expr->u.index, &et); + break; + case ec_assign: + stype_assign(stype, expr->u.assign, &et); + break; + case ec_as: + stype_as(stype, expr->u.as_op, &et); + break; + case ec_box: + stype_box(stype, expr->u.box, &et); + break; } @@ -362,9 +386,19 @@ switch (literal->ltc) { - case ltc_bool: tpc = tpc_bool; break; - case ltc_char: tpc = tpc_char; break; - case ltc_int: tpc = tpc_int; break; - case ltc_ref: tpc = tpc_nil; break; - case ltc_string: tpc = tpc_string; break; + case ltc_bool: + tpc = tpc_bool; + break; + case ltc_char: + tpc = tpc_char; + break; + case ltc_int: + tpc = tpc_int; + break; + case ltc_ref: + tpc = tpc_nil; + break; + case ltc_string: + tpc = tpc_string; + break; } @@ -1771,6 +1805,6 @@ * conversion destination. */ - if (stype_targs_check_equal(stype, pred_ti, as_op->arg->titem) - != EOK) { + if (stype_targs_check_equal(stype, pred_ti, as_op->arg->titem) != + EOK) { stype_convert_failure(stype, convc_as, as_op->arg, titem); *rtitem = titem; Index: uspace/app/stats/stats.c =================================================================== --- uspace/app/stats/stats.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/stats/stats.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -124,5 +124,5 @@ printf("(none) "); - printf("%8" PRIu64"%c %8" PRIu64"%c\n", + printf("%8" PRIu64 "%c %8" PRIu64 "%c\n", ucycles, usuffix, kcycles, ksuffix); } @@ -230,6 +230,5 @@ "\n" "Without any options all tasks are listed\n", - name - ); + name); } Index: uspace/app/taskdump/elf_core.c =================================================================== --- uspace/app/taskdump/elf_core.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/taskdump/elf_core.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -176,7 +176,7 @@ p_hdr[0].p_vaddr = 0; p_hdr[0].p_paddr = 0; - p_hdr[0].p_filesz = sizeof(elf_note_t) - + ALIGN_UP((str_size("CORE") + 1), word_size) - + ALIGN_UP(sizeof(elf_prstatus_t), word_size); + p_hdr[0].p_filesz = sizeof(elf_note_t) + + ALIGN_UP((str_size("CORE") + 1), word_size) + + ALIGN_UP(sizeof(elf_prstatus_t), word_size); p_hdr[0].p_memsz = 0; p_hdr[0].p_flags = 0; Index: uspace/app/tester/mm/common.c =================================================================== --- uspace/app/tester/mm/common.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/tester/mm/common.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -269,5 +269,5 @@ void fill_block(mem_block_t *block) { - for (uint8_t *pos = block->addr, *end = pos + block->size; + for (uint8_t * pos = block->addr, *end = pos + block->size; pos < end; pos++) *pos = block_expected_value(block, pos); @@ -286,5 +286,5 @@ void check_block(mem_block_t *block) { - for (uint8_t *pos = block->addr, *end = pos + block->size; + for (uint8_t * pos = block->addr, *end = pos + block->size; pos < end; pos++) { if (*pos != block_expected_value(block, pos)) { @@ -402,5 +402,5 @@ void fill_area(mem_area_t *area) { - for (uint8_t *pos = area->addr, *end = pos + area->size; + for (uint8_t * pos = area->addr, *end = pos + area->size; pos < end; pos++) *pos = area_expected_value(area, pos); Index: uspace/app/tester/print/print6.c =================================================================== --- uspace/app/tester/print/print6.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/tester/print/print6.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -63,5 +63,5 @@ /* Special */ { 1e300 * 1e300, "%g", "inf", 0 }, - { -1.0 /(1e300 * 1e300), "%g", "-0", 0 }, + { -1.0 / (1e300 * 1e300), "%g", "-0", 0 }, { 1234567.8901, "%g", "1234567.8901", 0 }, @@ -130,9 +130,9 @@ { 1e300 * 1e300, "%10.5e", " inf", 0 }, - { -1.0 /(1e300 * 1e300), "%10.2e", " -0.00e+00", 0 }, + { -1.0 / (1e300 * 1e300), "%10.2e", " -0.00e+00", 0 }, /* __PRINTF_FLAG_BIGCHARS */ { 1e300 * 1e300, "%10.5E", " INF", 0 }, /* __PRINTF_FLAG_BIGCHARS */ - { -1.0 /(1e300 * 1e300), "%10.2E", " -0.00E+00", 0 }, + { -1.0 / (1e300 * 1e300), "%10.2E", " -0.00E+00", 0 }, /* @@ -171,8 +171,8 @@ /* Next closest to 0.1 */ { 0.0999999999999999917, "%+10.20f", "+0.09999999999999999170", - 0 }, + 0 }, { 0.0999999999999999917, "%+10f", " +0.100000", 0 }, { 0.0999999999999998945, "%10.20f", "0.09999999999999989450", - 0 }, + 0 }, }; Index: uspace/app/tetris/tetris.c =================================================================== --- uspace/app/tetris/tetris.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/tetris/tetris.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -52,6 +52,6 @@ static volatile const char copyright[] = - "@(#) Copyright (c) 1992, 1993\n" - "\tThe Regents of the University of California. All rights reserved.\n"; + "@(#) Copyright (c) 1992, 1993\n" + "\tThe Regents of the University of California. All rights reserved.\n"; #include @@ -185,5 +185,5 @@ printf("Level = %d (press keys 1 - 9 to change)", level); moveto(9, 10); - printf("Preview is %s (press 'p' to change)", (showpreview ? "on ": "off")); + printf("Preview is %s (press 'p' to change)", (showpreview ? "on " : "off")); moveto(12, 10); printf("Press 'h' to show hiscore table."); @@ -204,36 +204,36 @@ int i = getchar(); - switch(i) { - case 'p': - showpreview = !showpreview; - moveto(9, 21); - if (showpreview) - printf("on "); - else - printf("off"); - break; - case 'h': - loadscores(); - showscores(firstgame); - tetris_menu_draw(*level); - break; - case 's': - firstgame = 0; - return 1; - case 'q': - return 0; - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - *level = i - '0'; - moveto(8, 18); - printf("%d", *level); - break; + switch (i) { + case 'p': + showpreview = !showpreview; + moveto(9, 21); + if (showpreview) + printf("on "); + else + printf("off"); + break; + case 'h': + loadscores(); + showscores(firstgame); + tetris_menu_draw(*level); + break; + case 's': + firstgame = 0; + return 1; + case 'q': + return 0; + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + *level = i - '0'; + moveto(8, 18); + printf("%d", *level); + break; } } @@ -259,5 +259,5 @@ while ((ch = getopt(argc, argv, "ck:ps")) != -1) - switch(ch) { + switch (ch) { case 'c': /* Index: uspace/app/top/top.c =================================================================== --- uspace/app/top/top.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/top/top.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -62,13 +62,13 @@ static const column_t task_columns[] = { - {"taskid", 't', 8}, - {"thrds", 'h', 7}, - {"resident", 'r', 10}, - {"%resi", 'R', 7}, - {"virtual", 'v', 9}, - {"%virt", 'V', 7}, - {"%user", 'U', 7}, - {"%kern", 'K', 7}, - {"name", 'd', 0}, + { "taskid", 't', 8 }, + { "thrds", 'h', 7 }, + { "resident", 'r', 10 }, + { "%resi", 'R', 7 }, + { "virtual", 'v', 9 }, + { "%virt", 'V', 7 }, + { "%user", 'U', 7 }, + { "%kern", 'K', 7 }, + { "name", 'd', 0 }, }; @@ -87,11 +87,11 @@ static const column_t ipc_columns[] = { - {"taskid", 't', 8}, - {"cls snt", 'c', 9}, - {"cls rcv", 'C', 9}, - {"ans snt", 'a', 9}, - {"ans rcv", 'A', 9}, - {"forward", 'f', 9}, - {"name", 'd', 0}, + { "taskid", 't', 8 }, + { "cls snt", 'c', 9 }, + { "cls rcv", 'C', 9 }, + { "ans snt", 'a', 9 }, + { "ans rcv", 'A', 9 }, + { "forward", 'f', 9 }, + { "name", 'd', 0 }, }; @@ -108,10 +108,10 @@ static const column_t exception_columns[] = { - {"exc", 'e', 8}, - {"count", 'n', 10}, - {"%count", 'N', 8}, - {"cycles", 'c', 10}, - {"%cycles", 'C', 9}, - {"description", 'd', 0}, + { "exc", 'e', 8 }, + { "count", 'n', 10 }, + { "%count", 'N', 8 }, + { "cycles", 'c', 10 }, + { "%cycles", 'C', 9 }, + { "description", 'd', 0 }, }; @@ -383,9 +383,9 @@ return 0; case FIELD_PERCENT: - if (fa->fixed.upper * fb->fixed.lower - > fb->fixed.upper * fa->fixed.lower) + if (fa->fixed.upper * fb->fixed.lower > + fb->fixed.upper * fa->fixed.lower) return 1 * sort_reverse; - if (fa->fixed.upper * fb->fixed.lower - < fb->fixed.upper * fa->fixed.lower) + if (fa->fixed.upper * fb->fixed.lower < + fb->fixed.upper * fa->fixed.lower) return -1 * sort_reverse; return 0; Index: uspace/app/usbinfo/dump.c =================================================================== --- uspace/app/usbinfo/dump.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/usbinfo/dump.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -64,5 +64,5 @@ INDENT INDENT INDENT INDENT INDENT INDENT, }; - static size_t indents_count = sizeof(indents)/sizeof(indents[0]); + static size_t indents_count = sizeof(indents) / sizeof(indents[0]); if (level >= indents_count) { return indents[indents_count - 1]; @@ -84,6 +84,6 @@ for (i = 0; i < length; i++) { printf("0x%02X", buffer[i]); - if (((i > 0) && (((i+1) % BYTES_PER_LINE) == 0)) - || (i + 1 == length)) { + if (((i > 0) && (((i + 1) % BYTES_PER_LINE) == 0)) || + (i + 1 == length)) { printf("\n"); if (i + 1 < length) { Index: uspace/app/usbinfo/hid.c =================================================================== --- uspace/app/usbinfo/hid.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/usbinfo/hid.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -185,6 +185,6 @@ if (is_descriptor_kind(raw_descriptor, USB_DESCTYPE_INTERFACE)) { - context->last_iface - = (usb_standard_interface_descriptor_t *) raw_descriptor; + context->last_iface = + (usb_standard_interface_descriptor_t *) raw_descriptor; return; } @@ -198,6 +198,6 @@ } - usb_standard_hid_descriptor_t *hid_descr - = (usb_standard_hid_descriptor_t *) raw_descriptor; + usb_standard_hid_descriptor_t *hid_descr = + (usb_standard_hid_descriptor_t *) raw_descriptor; if (hid_descr->report_desc_info.type != USB_DESCTYPE_HID_REPORT) { Index: uspace/app/usbinfo/info.c =================================================================== --- uspace/app/usbinfo/info.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/usbinfo/info.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -70,6 +70,6 @@ assert(usb_dev); - usb_standard_interface_descriptor_t *iface - = (usb_standard_interface_descriptor_t *) descriptor; + usb_standard_interface_descriptor_t *iface = + (usb_standard_interface_descriptor_t *) descriptor; printf("%sInterface #%d match ids (%s, 0x%02x, 0x%02x)\n", @@ -143,6 +143,6 @@ usb_endpoint_t endpoint_no = descriptor->endpoint_address & 0xF; usb_transfer_type_t transfer = descriptor->attributes & 0x3; - usb_direction_t direction = descriptor->endpoint_address & 0x80 - ? USB_DIRECTION_IN : USB_DIRECTION_OUT; + usb_direction_t direction = descriptor->endpoint_address & 0x80 ? + USB_DIRECTION_IN : USB_DIRECTION_OUT; printf("%sEndpoint #%d (%s %s, %zu)\n", prefix, endpoint_no, usb_str_transfer_type(transfer), @@ -226,6 +226,6 @@ dump_descriptor_tree_brief_hub); - default: - break; + default: + break; } Index: uspace/app/vuhid/device.c =================================================================== --- uspace/app/vuhid/device.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/vuhid/device.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -129,10 +129,10 @@ /* Check that we have not run out of available endpoints. */ - if ((iface->in_data_size > 0) - && (hid_data->in_endpoint_first_free >= VUHID_ENDPOINT_MAX)) { + if ((iface->in_data_size > 0) && + (hid_data->in_endpoint_first_free >= VUHID_ENDPOINT_MAX)) { return ELIMIT; } - if ((iface->out_data_size > 0) - && (hid_data->out_endpoint_first_free >= VUHID_ENDPOINT_MAX)) { + if ((iface->out_data_size > 0) && + (hid_data->out_endpoint_first_free >= VUHID_ENDPOINT_MAX)) { return ELIMIT; } @@ -192,6 +192,6 @@ descr_iface->length = sizeof(usb_standard_interface_descriptor_t); descr_iface->descriptor_type = USB_DESCTYPE_INTERFACE; - descr_iface->interface_number - = dev->descriptors->configuration->descriptor->interface_count; + descr_iface->interface_number = + dev->descriptors->configuration->descriptor->interface_count; descr_iface->alternate_setting = 0; descr_iface->endpoint_count = ep_count; @@ -230,6 +230,6 @@ descr_ep_in->length = sizeof(usb_standard_endpoint_descriptor_t); descr_ep_in->descriptor_type = USB_DESCTYPE_ENDPOINT; - descr_ep_in->endpoint_address - = 0x80 | hid_data->in_endpoint_first_free; + descr_ep_in->endpoint_address = + 0x80 | hid_data->in_endpoint_first_free; descr_ep_in->attributes = 3; descr_ep_in->max_packet_size = iface->in_data_size; @@ -246,6 +246,6 @@ descr_ep_out->length = sizeof(usb_standard_endpoint_descriptor_t); descr_ep_out->descriptor_type = USB_DESCTYPE_ENDPOINT; - descr_ep_out->endpoint_address - = 0x00 | hid_data->out_endpoint_first_free; + descr_ep_out->endpoint_address = + 0x00 | hid_data->out_endpoint_first_free; descr_ep_out->attributes = 3; descr_ep_out->max_packet_size = iface->out_data_size; @@ -256,6 +256,6 @@ usbvirt_device_configuration_extras_t *extra_descriptors; extra_descriptors = realloc(dev->descriptors->configuration->extra, - sizeof(usbvirt_device_configuration_extras_t) - * (dev->descriptors->configuration->extra_count + descr_count)); + sizeof(usbvirt_device_configuration_extras_t) * + (dev->descriptors->configuration->extra_count + descr_count)); if (extra_descriptors == NULL) { rc = ENOMEM; @@ -300,25 +300,24 @@ */ if (iface->in_data_size > 0) { - hid_data->in_endpoints_mapping[hid_data->in_endpoint_first_free] - = iface; - dev->ops->data_in[hid_data->in_endpoint_first_free] - = on_data_from_device; + hid_data->in_endpoints_mapping[hid_data->in_endpoint_first_free] = + iface; + dev->ops->data_in[hid_data->in_endpoint_first_free] = + on_data_from_device; hid_data->in_endpoint_first_free++; } if (iface->out_data_size > 0) { - hid_data->out_endpoints_mapping[hid_data->out_endpoint_first_free] - = iface; - dev->ops->data_out[hid_data->out_endpoint_first_free] - = on_data_to_device; + hid_data->out_endpoints_mapping[hid_data->out_endpoint_first_free] = + iface; + dev->ops->data_out[hid_data->out_endpoint_first_free] = + on_data_to_device; hid_data->out_endpoint_first_free++; } - hid_data->interface_mapping[ - dev->descriptors->configuration->descriptor->interface_count] - = iface; + hid_data->interface_mapping[dev->descriptors->configuration->descriptor->interface_count] = + iface; dev->descriptors->configuration->descriptor->interface_count++; - dev->descriptors->configuration->descriptor->total_length - += total_descr_size; + dev->descriptors->configuration->descriptor->total_length += + total_descr_size; hid_data->iface_count++; Index: uspace/app/vuhid/stdreq.c =================================================================== --- uspace/app/vuhid/stdreq.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/vuhid/stdreq.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -50,6 +50,6 @@ if (setup_packet->value_high == USB_DESCTYPE_HID_REPORT) { - vuhid_interface_t *iface - = vuhid->interface_mapping[setup_packet->index]; + vuhid_interface_t *iface = + vuhid->interface_mapping[setup_packet->index]; if (iface == NULL) { return EFORWARD; Index: uspace/app/wavplay/dplay.c =================================================================== --- uspace/app/wavplay/dplay.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/wavplay/dplay.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -58,8 +58,8 @@ void *base; size_t size; - void* write_ptr; + void *write_ptr; } buffer; pcm_format_t f; - FILE* source; + FILE *source; volatile bool playing; fibril_mutex_t mutex; @@ -104,5 +104,5 @@ ipc_call_t call; cap_call_handle_t chandle = async_get_call(&call); - switch(IPC_GET_IMETHOD(call)) { + switch (IPC_GET_IMETHOD(call)) { case PCM_EVENT_PLAYBACK_STARTED: case PCM_EVENT_FRAMES_PLAYED: @@ -125,5 +125,5 @@ } const size_t bytes = fread(pb->buffer.write_ptr, - sizeof(uint8_t), fragment_size, pb->source); + sizeof(uint8_t), fragment_size, pb->source); printf("Copied from position %p size %zu/%zu\n", pb->buffer.write_ptr, bytes, fragment_size); @@ -297,5 +297,5 @@ if (ret != EOK) { printf("Failed to update position indicator " - "%s\n", str_error(ret)); + "%s\n", str_error(ret)); } } @@ -305,6 +305,6 @@ /* Compute delay time */ - const useconds_t real_delay = (usecs > work_time) - ? usecs - work_time : 0; + const useconds_t real_delay = (usecs > work_time) ? + usecs - work_time : 0; DPRINTF("POS %zu: %u usecs (%u) to play %zu bytes.\n", pos, usecs, real_delay, to_play); @@ -356,5 +356,5 @@ } - char* info = NULL; + char *info = NULL; ret = audio_pcm_get_info_str(session, &info); if (ret != EOK) { Index: uspace/app/wavplay/drec.c =================================================================== --- uspace/app/wavplay/drec.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/wavplay/drec.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -63,7 +63,7 @@ size_t size; unsigned id; - void* position; + void *position; } buffer; - FILE* file; + FILE *file; audio_pcm_sess_t *device; } record_t; @@ -104,5 +104,5 @@ ipc_call_t call; cap_call_handle_t chandle = async_get_call(&call); - switch(IPC_GET_IMETHOD(call)) { + switch (IPC_GET_IMETHOD(call)) { case PCM_EVENT_CAPTURE_TERMINATED: printf("Recording terminated\n"); @@ -125,5 +125,5 @@ /* Write directly from device buffer to file */ const size_t bytes = fwrite(rec->buffer.position, - sizeof(uint8_t), buffer_part, rec->file); + sizeof(uint8_t), buffer_part, rec->file); printf("%zu ", bytes); rec->buffer.position += buffer_part; @@ -154,5 +154,5 @@ pcm_sample_format_str(f.sample_format), f.channels); const unsigned frames = - pcm_format_size_to_frames(rec->buffer.size / BUFFER_PARTS, &f); + pcm_format_size_to_frames(rec->buffer.size / BUFFER_PARTS, &f); ret = audio_pcm_start_capture_fragment(rec->device, frames, f.channels, f.sampling_rate, f.sample_format); @@ -199,5 +199,5 @@ } - char* info = NULL; + char *info = NULL; ret = audio_pcm_get_info_str(session, &info); if (ret != EOK) { Index: uspace/app/websrv/websrv.c =================================================================== --- uspace/app/websrv/websrv.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/app/websrv/websrv.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -231,5 +231,5 @@ if (verbose) - fprintf(stderr, "Sending response\n"); + fprintf(stderr, "Sending response\n"); errno_t rc = tcp_conn_send(conn, (void *) msg, response_size); @@ -386,5 +386,5 @@ port = (uint16_t) value; - } else if (str_cmp(argv[*index] +2, "verbose") == 0) { + } else if (str_cmp(argv[*index] + 2, "verbose") == 0) { verbose = true; } else { Index: uspace/dist/src/c/demos/tetris/tetris.c =================================================================== --- uspace/dist/src/c/demos/tetris/tetris.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/dist/src/c/demos/tetris/tetris.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -123,5 +123,5 @@ /* This row is to be elided */ rows++; - memset(&board[base], 0, sizeof(cell) *(B_COLS - 2)); + memset(&board[base], 0, sizeof(cell) * (B_COLS - 2)); scr_update(); Index: uspace/dist/src/c/demos/top/top.c =================================================================== --- uspace/dist/src/c/demos/top/top.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/dist/src/c/demos/top/top.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -62,13 +62,13 @@ static const column_t task_columns[] = { - {"taskid", 't', 8}, - {"thrds", 'h', 7}, - {"resident", 'r', 10}, - {"%resi", 'R', 7}, - {"virtual", 'v', 9}, - {"%virt", 'V', 7}, - {"%user", 'U', 7}, - {"%kern", 'K', 7}, - {"name", 'd', 0}, + { "taskid", 't', 8 }, + { "thrds", 'h', 7 }, + { "resident", 'r', 10 }, + { "%resi", 'R', 7 }, + { "virtual", 'v', 9 }, + { "%virt", 'V', 7 }, + { "%user", 'U', 7 }, + { "%kern", 'K', 7 }, + { "name", 'd', 0 }, }; @@ -87,11 +87,11 @@ static const column_t ipc_columns[] = { - {"taskid", 't', 8}, - {"cls snt", 'c', 9}, - {"cls rcv", 'C', 9}, - {"ans snt", 'a', 9}, - {"ans rcv", 'A', 9}, - {"forward", 'f', 9}, - {"name", 'd', 0}, + { "taskid", 't', 8 }, + { "cls snt", 'c', 9 }, + { "cls rcv", 'C', 9 }, + { "ans snt", 'a', 9 }, + { "ans rcv", 'A', 9 }, + { "forward", 'f', 9 }, + { "name", 'd', 0 }, }; @@ -108,10 +108,10 @@ static const column_t exception_columns[] = { - {"exc", 'e', 8}, - {"count", 'n', 10}, - {"%count", 'N', 8}, - {"cycles", 'c', 10}, - {"%cycles", 'C', 9}, - {"description", 'd', 0}, + { "exc", 'e', 8 }, + { "count", 'n', 10 }, + { "%count", 'N', 8 }, + { "cycles", 'c', 10 }, + { "%cycles", 'C', 9 }, + { "description", 'd', 0 }, }; @@ -383,9 +383,9 @@ return 0; case FIELD_PERCENT: - if (fa->fixed.upper * fb->fixed.lower - > fb->fixed.upper * fa->fixed.lower) + if (fa->fixed.upper * fb->fixed.lower > + fb->fixed.upper * fa->fixed.lower) return 1 * sort_reverse; - if (fa->fixed.upper * fb->fixed.lower - < fb->fixed.upper * fa->fixed.lower) + if (fa->fixed.upper * fb->fixed.lower < + fb->fixed.upper * fa->fixed.lower) return -1 * sort_reverse; return 0; Index: uspace/drv/audio/hdaudio/hdaudio.c =================================================================== --- uspace/drv/audio/hdaudio/hdaudio.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/audio/hdaudio/hdaudio.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -199,5 +199,5 @@ ddf_msg(LVL_NOTE, "hda reg base: %" PRIx64, - RNGABS(res.mem_ranges.ranges[0])); + RNGABS(res.mem_ranges.ranges[0])); if (hda->rwsize < sizeof(hda_regs_t)) { @@ -372,5 +372,6 @@ hda_t *hda = (hda_t *)ddf_dev_data_get(dev); - if (0) ddf_msg(LVL_NOTE, "## interrupt ##"); + if (0) + ddf_msg(LVL_NOTE, "## interrupt ##"); // ddf_msg(LVL_NOTE, "interrupt arg4=0x%x", (int)IPC_GET_ARG4(*icall)); hda_ctl_interrupt(hda->ctl); Index: uspace/drv/audio/sb16/dsp.c =================================================================== --- uspace/drv/audio/sb16/dsp.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/audio/sb16/dsp.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -63,7 +63,7 @@ #define AUTO_DMA_MODE -static inline const char * dsp_state_to_str(dsp_state_t state) -{ - static const char* state_names[] = { +static inline const char *dsp_state_to_str(dsp_state_t state) +{ + static const char *state_names[] = { [DSP_PLAYBACK_ACTIVE_EVENTS] = "PLAYBACK w/ EVENTS", [DSP_CAPTURE_ACTIVE_EVENTS] = "CAPTURE w/ EVENTS", @@ -240,6 +240,5 @@ dsp->active.samples / ((dsp->active.mode & DSP_MODE_STEREO) ? 2 : 1); - switch (dsp->state) - { + switch (dsp->state) { case DSP_PLAYBACK_ACTIVE_EVENTS: dsp_report_event(dsp, PCM_EVENT_FRAMES_PLAYED); @@ -277,5 +276,5 @@ { ddf_log_verbose("Querying cap %s", audio_pcm_cap_str(cap)); - switch(cap) { + switch (cap) { case AUDIO_CAP_CAPTURE: case AUDIO_CAP_PLAYBACK: @@ -312,5 +311,5 @@ errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate, - pcm_sample_format_t *format) + pcm_sample_format_t *format) { errno_t ret = EOK; @@ -346,5 +345,5 @@ } -async_sess_t * sb_dsp_get_event_session(sb_dsp_t *dsp) +async_sess_t *sb_dsp_get_event_session(sb_dsp_t *dsp) { assert(dsp); @@ -416,7 +415,7 @@ } - dsp->active.mode = 0 - | (pcm_sample_format_is_signed(format) ? DSP_MODE_SIGNED : 0) - | (channels == 2 ? DSP_MODE_STEREO : 0); + dsp->active.mode = 0 | + (pcm_sample_format_is_signed(format) ? DSP_MODE_SIGNED : 0) | + (channels == 2 ? DSP_MODE_STEREO : 0); dsp->active.samples = frames * channels; dsp->active.frame_count = 0; @@ -446,6 +445,5 @@ if ((dsp->state == DSP_PLAYBACK_NOEVENTS || dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS) && - immediate) - { + immediate) { dsp_write(dsp, DMA_16B_PAUSE); dsp_reset(dsp); @@ -459,6 +457,5 @@ return EOK; } - if (dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS) - { + if (dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS) { /* Stop after current fragment */ assert(!immediate); @@ -494,7 +491,7 @@ } - dsp->active.mode = 0 - | (pcm_sample_format_is_signed(format) ? DSP_MODE_SIGNED : 0) - | (channels == 2 ? DSP_MODE_STEREO : 0); + dsp->active.mode = 0 | + (pcm_sample_format_is_signed(format) ? DSP_MODE_SIGNED : 0) | + (channels == 2 ? DSP_MODE_STEREO : 0); dsp->active.samples = frames * channels; dsp->active.frame_count = 0; @@ -522,6 +519,5 @@ if ((dsp->state == DSP_CAPTURE_NOEVENTS || dsp->state == DSP_CAPTURE_ACTIVE_EVENTS) && - immediate) - { + immediate) { dsp_write(dsp, DMA_16B_PAUSE); dsp_reset(dsp); @@ -535,6 +531,5 @@ return EOK; } - if (dsp->state == DSP_CAPTURE_ACTIVE_EVENTS) - { + if (dsp->state == DSP_CAPTURE_ACTIVE_EVENTS) { /* Stop after current fragment */ assert(!immediate); Index: uspace/drv/audio/sb16/main.c =================================================================== --- uspace/drv/audio/sb16/main.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/audio/sb16/main.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -71,5 +71,5 @@ int main(int argc, char *argv[]) { - printf(NAME": HelenOS SB16 audio driver.\n"); + printf(NAME ": HelenOS SB16 audio driver.\n"); ddf_log_init(NAME); return ddf_driver_main(&sb_driver); @@ -191,6 +191,6 @@ /* 1x IRQ, 1-2x DMA(8,16), 1-2x IO (MPU is separate). */ if (hw_res.irqs.count != 1 || - (hw_res.io_ranges.count != 1 && hw_res.io_ranges.count != 2) || - (hw_res.dma_channels.count != 1 && hw_res.dma_channels.count != 2)) { + (hw_res.io_ranges.count != 1 && hw_res.io_ranges.count != 2) || + (hw_res.dma_channels.count != 1 && hw_res.dma_channels.count != 2)) { hw_res_list_parsed_clean(&hw_res); return EINVAL; @@ -229,6 +229,6 @@ } else { const int sb = - (hw_res.io_ranges.ranges[0].size >= sizeof(sb16_regs_t)) - ? 0 : 1; + (hw_res.io_ranges.ranges[0].size >= sizeof(sb16_regs_t)) ? + 0 : 1; const int mpu = 1 - sb; if (pp_sb_regs && *pp_sb_regs) Index: uspace/drv/audio/sb16/mixer.c =================================================================== --- uspace/drv/audio/sb16/mixer.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/audio/sb16/mixer.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -98,18 +98,18 @@ [SB_MIXER_UNKNOWN] = { NULL, 0 }, [SB_MIXER_CT1335] = { - channels_table_ct1335, - ARRAY_SIZE(channels_table_ct1335), + channels_table_ct1335, + ARRAY_SIZE(channels_table_ct1335), }, [SB_MIXER_CT1345] = { - channels_table_ct1345, - ARRAY_SIZE(channels_table_ct1345), + channels_table_ct1345, + ARRAY_SIZE(channels_table_ct1345), }, [SB_MIXER_CT1745] = { - channels_table_ct1745, - ARRAY_SIZE(channels_table_ct1745), + channels_table_ct1745, + ARRAY_SIZE(channels_table_ct1745), }, }; -const char * sb_mixer_type_str(sb_mixer_type_t type) +const char *sb_mixer_type_str(sb_mixer_type_t type) { static const char *names[] = { @@ -150,5 +150,5 @@ errno_t sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned item, - const char** name, unsigned *levels) + const char **name, unsigned *levels) { assert(mixer); @@ -182,6 +182,6 @@ const channel_t *chan = &volume_table[mixer->type].table[item]; pio_write_8(&mixer->regs->mixer_address, chan->address); - *value = (pio_read_8(&mixer->regs->mixer_data) >> chan->shift) - & (chan->volume_levels - 1); + *value = (pio_read_8(&mixer->regs->mixer_data) >> chan->shift) & + (chan->volume_levels - 1); return EOK; } Index: uspace/drv/bus/isa/i8237.c =================================================================== --- uspace/drv/bus/isa/i8237.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/isa/i8237.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -293,5 +293,5 @@ ret = pio_enable(DMA_CONTROLLER_SECOND_BASE, - sizeof(dma_controller_regs_second_t), (void **) &controller->second); + sizeof(dma_controller_regs_second_t), (void **) &controller->second); if (ret != EOK) return EIO; @@ -484,5 +484,5 @@ fibril_mutex_unlock(&guard); - uint16_t remain = (value_high << 8 | value_low) ; + uint16_t remain = (value_high << 8 | value_low); /* 16 bit DMA size is in words, * the upper bits are bogus for 16bit transfers so we need to get @@ -490,5 +490,5 @@ if (is_dma16(channel)) remain <<= 1; - *size = is_dma16(channel) ? remain + 2: remain + 1; + *size = is_dma16(channel) ? remain + 2 : remain + 1; return EOK; } Index: uspace/drv/bus/usb/ehci/ehci_batch.c =================================================================== --- uspace/drv/bus/usb/ehci/ehci_batch.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ehci/ehci_batch.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -53,5 +53,5 @@ #define EHCI_TD_MAX_TRANSFER (16 * 1024) -static void (*const batch_setup[])(ehci_transfer_batch_t*); +static void (*const batch_setup[])(ehci_transfer_batch_t *); /** Safely destructs ehci_transfer_batch_t structure @@ -74,5 +74,5 @@ * */ -ehci_transfer_batch_t * ehci_transfer_batch_create(endpoint_t *ep) +ehci_transfer_batch_t *ehci_transfer_batch_create(endpoint_t *ep) { assert(ep); @@ -99,7 +99,7 @@ assert(ehci_batch); - const size_t setup_size = (ehci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL) - ? USB_SETUP_PACKET_SIZE - : 0; + const size_t setup_size = (ehci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL) ? + USB_SETUP_PACKET_SIZE : + 0; const size_t size = ehci_batch->base.size; @@ -109,6 +109,6 @@ /* Determine number of TDs needed */ - ehci_batch->td_count = (size + EHCI_TD_MAX_TRANSFER - 1) - / EHCI_TD_MAX_TRANSFER; + ehci_batch->td_count = (size + EHCI_TD_MAX_TRANSFER - 1) / + EHCI_TD_MAX_TRANSFER; /* Control transfer need Setup and Status stage */ @@ -173,6 +173,6 @@ ehci_batch->qh->next, ehci_batch->qh->alternate); - if (!qh_halted(ehci_batch->qh) && (qh_transfer_pending(ehci_batch->qh) - || qh_transfer_active(ehci_batch->qh))) + if (!qh_halted(ehci_batch->qh) && (qh_transfer_pending(ehci_batch->qh) || + qh_transfer_active(ehci_batch->qh))) return false; @@ -204,6 +204,6 @@ * we leave the very last(unused) TD behind. */ - ehci_batch->base.transferred_size - -= td_remain_size(&ehci_batch->tds[i]); + ehci_batch->base.transferred_size -= + td_remain_size(&ehci_batch->tds[i]); } else { usb_log_debug("Batch %p found error TD(%zu):%08x: %s.", @@ -274,5 +274,5 @@ dma_buffer_phys(&ehci_batch->ehci_dma_buffer, ehci_batch->setup_buffer), USB_DIRECTION_BOTH, USB_SETUP_PACKET_SIZE, toggle, false); - usb_log_debug2("Batch %p: Created CONTROL SETUP TD(%"PRIxn"): " + usb_log_debug2("Batch %p: Created CONTROL SETUP TD(%" PRIxn "): " "%08x:%08x:%08x", ehci_batch, dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[0]), @@ -292,5 +292,5 @@ dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[td_current + 1]), buffer, data_dir, transfer_size, toggle, false); - usb_log_debug2("Batch %p: Created CONTROL DATA TD(%"PRIxn"): " + usb_log_debug2("Batch %p: Created CONTROL DATA TD(%" PRIxn "): " "%08x:%08x:%08x", ehci_batch, dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[td_current]), @@ -308,5 +308,5 @@ assert(td_current == ehci_batch->td_count - 1); td_init(&ehci_batch->tds[td_current], 0, 0, status_dir, 0, 1, true); - usb_log_debug2("Batch %p: Created CONTROL STATUS TD %d(%"PRIxn"): " + usb_log_debug2("Batch %p: Created CONTROL STATUS TD %d(%" PRIxn "): " "%08x:%08x:%08x", ehci_batch, td_current, dma_buffer_phys(&ehci_batch->ehci_dma_buffer, &ehci_batch->tds[td_current]), @@ -340,17 +340,17 @@ ehci_batch->data_buffer); while (remain_size > 0) { - const size_t transfer_size = remain_size > EHCI_TD_MAX_TRANSFER - ? EHCI_TD_MAX_TRANSFER : remain_size; + const size_t transfer_size = remain_size > EHCI_TD_MAX_TRANSFER ? + EHCI_TD_MAX_TRANSFER : remain_size; const bool last = (remain_size == transfer_size); td_init(&ehci_batch->tds[td_current], last ? 0 : dma_buffer_phys(&ehci_batch->ehci_dma_buffer, - &ehci_batch->tds[td_current + 1]), + &ehci_batch->tds[td_current + 1]), buffer, ehci_batch->base.dir, transfer_size, -1, last); - usb_log_debug2("Batch %p: DATA TD(%"PRIxn": %08x:%08x:%08x", + usb_log_debug2("Batch %p: DATA TD(%" PRIxn ": %08x:%08x:%08x", ehci_batch, dma_buffer_phys(&ehci_batch->ehci_dma_buffer, - &ehci_batch->tds[td_current]), + &ehci_batch->tds[td_current]), ehci_batch->tds[td_current].status, ehci_batch->tds[td_current].next, @@ -365,6 +365,6 @@ /** Transfer setup table. */ -static void (*const batch_setup[])(ehci_transfer_batch_t*) = -{ +static void (*const batch_setup[])(ehci_transfer_batch_t *) = + { [USB_TRANSFER_CONTROL] = batch_control, [USB_TRANSFER_BULK] = batch_data, Index: uspace/drv/bus/usb/ehci/ehci_rh.c =================================================================== --- uspace/drv/bus/usb/ehci/ehci_rh.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ehci/ehci_rh.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -119,5 +119,5 @@ } for (unsigned i = 0; i < instance->port_count; ++i) - usb_log_debug2("RH(%p-%u): status: %"PRIx32, instance, i, + usb_log_debug2("RH(%p-%u): status: %" PRIx32, instance, i, EHCI_RD(regs->portsc[i])); @@ -147,5 +147,5 @@ assert(batch); batch->error = virthub_base_request(&instance->base, batch->target, - batch->dir, (void*) batch->setup.buffer, + batch->dir, (void *) batch->setup.buffer, batch->dma_buffer.virt, batch->size, &batch->transferred_size); @@ -195,5 +195,5 @@ } - usb_transfer_batch_t * const batch = ep->active_batch; + usb_transfer_batch_t *const batch = ep->active_batch; endpoint_deactivate_locked(ep); instance->status_change_endpoint = NULL; @@ -206,5 +206,5 @@ instance, batch); batch->error = virthub_base_request(&instance->base, batch->target, - batch->dir, (void*) batch->setup.buffer, + batch->dir, (void *) batch->setup.buffer, batch->dma_buffer.virt, batch->size, &batch->transferred_size); @@ -304,5 +304,5 @@ EHCI2USB(reg, USB_PORTSC_PORT_POWER_FLAG, USB2_HUB_PORT_STATUS_POWER) | (((reg & USB_PORTSC_LINE_STATUS_MASK) == USB_PORTSC_LINE_STATUS_K) ? - (USB2_HUB_PORT_STATUS_LOW_SPEED) : 0) | + (USB2_HUB_PORT_STATUS_LOW_SPEED) : 0) | ((reg & USB_PORTSC_PORT_OWNER_FLAG) ? 0 : USB2_HUB_PORT_STATUS_HIGH_SPEED) | EHCI2USB(reg, USB_PORTSC_PORT_TEST_MASK, USB2_HUB_PORT_STATUS_TEST) | @@ -312,9 +312,8 @@ (hub->resume_flag[port] ? USB2_HUB_PORT_STATUS_C_SUSPEND : 0) | EHCI2USB(reg, USB_PORTSC_OC_CHANGE_FLAG, USB_HUB_PORT_STATUS_C_OC) | - (hub->reset_flag[port] ? USB_HUB_PORT_STATUS_C_RESET: 0) - ); + (hub->reset_flag[port] ? USB_HUB_PORT_STATUS_C_RESET : 0)); /* Note feature numbers for test and indicator feature do not * correspond to the port status bit locations */ - usb_log_debug2("RH(%p-%u) port status: %"PRIx32"(%"PRIx32")", hub, port, + usb_log_debug2("RH(%p-%u) port status: %" PRIx32 "(%" PRIx32 ")", hub, port, status, reg); memcpy(data, &status, sizeof(status)); @@ -345,5 +344,5 @@ if (!(EHCI_RD(job->hub->registers->portsc[job->port]) & USB_PORTSC_ENABLED_FLAG)) { - usb_log_info("RH(%p-%u): Port not enabled after reset (%"PRIX32 + usb_log_info("RH(%p-%u): Port not enabled after reset (%" PRIX32 "), giving up ownership", job->hub, job->port, EHCI_RD(job->hub->registers->portsc[job->port])); @@ -370,5 +369,5 @@ } -static errno_t delayed_job(errno_t (*func)(void*), ehci_rh_t *rh, unsigned port) +static errno_t delayed_job(errno_t (*func)(void *), ehci_rh_t *rh, unsigned port) { ehci_rh_job_t *job = malloc(sizeof(*job)); @@ -405,6 +404,5 @@ const unsigned feature = uint16_usb2host(setup_packet->value); /* Enabled features to clear: see page 269 of USB specs */ - switch (feature) - { + switch (feature) { case USB_HUB_FEATURE_PORT_POWER: /*8*/ usb_log_debug2("RH(%p-%u): Clear port power.", hub, port); @@ -424,5 +422,5 @@ if ((EHCI_RD(hub->registers->portsc[port]) & USB_PORTSC_SUSPEND_FLAG) == 0) - return EOK; + return EOK; /* Host driven resume */ EHCI_SET(hub->registers->portsc[port], @@ -542,5 +540,5 @@ if ((status & USB_PORTSC_CONNECT_CH_FLAG) && (status & USB_PORTSC_LINE_STATUS_MASK) == - USB_PORTSC_LINE_STATUS_K) + USB_PORTSC_LINE_STATUS_K) EHCI_SET(hub->registers->portsc[port], USB_PORTSC_PORT_OWNER_FLAG); @@ -550,5 +548,5 @@ } - usb_log_debug2("RH(%p): root hub interrupt mask: %"PRIx16, hub, mask); + usb_log_debug2("RH(%p): root hub interrupt mask: %" PRIx16, hub, mask); if (mask == 0) @@ -619,5 +617,5 @@ /** Virtual EHCI root hub ops */ static usbvirt_device_ops_t ops = { - .control = control_transfer_handlers, - .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler, + .control = control_transfer_handlers, + .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler, }; Index: uspace/drv/bus/usb/ehci/hc.c =================================================================== --- uspace/drv/bus/usb/ehci/hc.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ehci/hc.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -133,5 +133,5 @@ ehci_regs_t *registers = - (ehci_regs_t *)(RNGABSPTR(regs) + EHCI_RD8(instance->caps->caplength)); + (ehci_regs_t *)(RNGABSPTR(regs) + EHCI_RD8(instance->caps->caplength)); code->cmds[0].addr = (void *) ®isters->usbsts; code->cmds[3].addr = (void *) ®isters->usbsts; @@ -158,6 +158,6 @@ if (hw_res->mem_ranges.count != 1 || hw_res->mem_ranges.ranges[0].size < - (sizeof(ehci_caps_regs_t) + sizeof(ehci_regs_t))) - return EINVAL; + (sizeof(ehci_caps_regs_t) + sizeof(ehci_regs_t))) + return EINVAL; errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0], @@ -169,12 +169,12 @@ } - usb_log_info("HC(%p): Device registers at %"PRIx64" (%zuB) accessible.", + usb_log_info("HC(%p): Device registers at %" PRIx64 " (%zuB) accessible.", instance, hw_res->mem_ranges.ranges[0].address.absolute, hw_res->mem_ranges.ranges[0].size); instance->registers = - (void*)instance->caps + EHCI_RD8(instance->caps->caplength); + (void *)instance->caps + EHCI_RD8(instance->caps->caplength); usb_log_info("HC(%p): Device control registers at %" PRIx64, instance, - hw_res->mem_ranges.ranges[0].address.absolute - + EHCI_RD8(instance->caps->caplength)); + hw_res->mem_ranges.ranges[0].address.absolute + + EHCI_RD8(instance->caps->caplength)); list_initialize(&instance->pending_endpoints); @@ -221,6 +221,5 @@ usb_str_transfer_type_short(ep->transfer_type), usb_str_direction(ep->direction)); - switch (ep->transfer_type) - { + switch (ep->transfer_type) { case USB_TRANSFER_CONTROL: case USB_TRANSFER_BULK: @@ -245,6 +244,5 @@ usb_str_transfer_type_short(ep->transfer_type), usb_str_direction(ep->direction)); - switch (ep->transfer_type) - { + switch (ep->transfer_type) { case USB_TRANSFER_INTERRUPT: endpoint_list_remove_ep(&instance->int_list, ehci_ep); @@ -305,6 +303,6 @@ } - endpoint_t * const ep = batch->ep; - ehci_endpoint_t * const ehci_ep = ehci_endpoint_get(ep); + endpoint_t *const ep = batch->ep; + ehci_endpoint_t *const ehci_ep = ehci_endpoint_get(ep); ehci_transfer_batch_t *ehci_batch = ehci_transfer_batch_get(batch); @@ -345,5 +343,5 @@ assert(hc); - usb_log_debug2("HC(%p): Interrupt: %"PRIx32, hc, status); + usb_log_debug2("HC(%p): Interrupt: %" PRIx32, hc, status); if (status & USB_STS_PORT_CHANGE_FLAG) { ehci_rh_interrupt(&hc->rh); @@ -361,11 +359,11 @@ usb_log_debug2("HC(%p): Scanning %lu pending endpoints", hc, - list_count(&hc->pending_endpoints)); + list_count(&hc->pending_endpoints)); list_foreach_safe(hc->pending_endpoints, current, next) { - ehci_endpoint_t *ep - = list_get_instance(current, ehci_endpoint_t, pending_link); - - ehci_transfer_batch_t *batch - = ehci_transfer_batch_get(ep->base.active_batch); + ehci_endpoint_t *ep = + list_get_instance(current, ehci_endpoint_t, pending_link); + + ehci_transfer_batch_t *batch = + ehci_transfer_batch_get(ep->base.active_batch); assert(batch); @@ -429,5 +427,5 @@ assert(instance->periodic_list); uintptr_t phys_base = - addr_to_phys((void*)instance->periodic_list); + addr_to_phys((void *)instance->periodic_list); assert((phys_base & USB_PERIODIC_LIST_BASE_MASK) == phys_base); EHCI_WR(instance->registers->periodiclistbase, phys_base); @@ -437,5 +435,5 @@ /* Enable Async schedule */ - phys_base = addr_to_phys((void*)instance->async_list.list_head); + phys_base = addr_to_phys((void *)instance->async_list.list_head); assert((phys_base & USB_ASYNCLIST_MASK) == phys_base); EHCI_WR(instance->registers->asynclistaddr, phys_base); @@ -516,6 +514,5 @@ usb_log_debug2("HC(%p): Initializing Periodic list.", instance); - for (unsigned i = 0; i < PAGE_SIZE/sizeof(link_pointer_t); ++i) - { + for (unsigned i = 0; i < PAGE_SIZE / sizeof(link_pointer_t); ++i) { /* Disable everything for now */ instance->periodic_list[i] = Index: uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c =================================================================== --- uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -92,5 +92,5 @@ ((dir[direction] & TD_STATUS_PID_MASK) << TD_STATUS_PID_SHIFT) | ((size & TD_STATUS_TOTAL_MASK) << TD_STATUS_TOTAL_SHIFT) | - (ioc ? TD_STATUS_IOC_FLAG : 0) ); + (ioc ? TD_STATUS_IOC_FLAG : 0)); if (toggle == 0 || toggle == 1) { @@ -101,6 +101,6 @@ if (buffer != 0) { assert(size != 0); - for (unsigned i = 0; (i < ARRAY_SIZE(instance->buffer_pointer)) - && size; ++i) { + for (unsigned i = 0; (i < ARRAY_SIZE(instance->buffer_pointer)) && + size; ++i) { const uintptr_t offset = buffer & TD_BUFFER_POINTER_OFFSET_MASK; assert(offset == 0 || i == 0); Index: uspace/drv/bus/usb/ehci/res.c =================================================================== --- uspace/drv/bus/usb/ehci/res.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ehci/res.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -95,6 +95,6 @@ ret = pci_config_space_read_32( parent_sess, eecp + USBLEGSUP_OFFSET, &usblegsup); - while ((ret == EOK) && (wait < DEFAULT_WAIT) - && (usblegsup & USBLEGSUP_BIOS_CONTROL)) { + while ((ret == EOK) && (wait < DEFAULT_WAIT) && + (usblegsup & USBLEGSUP_BIOS_CONTROL)) { async_usleep(WAIT_STEP); ret = pci_config_space_read_32(parent_sess, @@ -109,5 +109,5 @@ /* BIOS failed to hand over control, this should not happen. */ - usb_log_warning( "BIOS failed to release control after " + usb_log_warning("BIOS failed to release control after " "%zu usecs, force it.", wait); ret = pci_config_space_write_32(parent_sess, @@ -197,5 +197,5 @@ usb_log_error("Failed to disable extended capabilities: %s.", str_error(ret)); - goto clean; + goto clean; } clean: Index: uspace/drv/bus/usb/ohci/hc.c =================================================================== --- uspace/drv/bus/usb/ohci/hc.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/hc.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -158,5 +158,5 @@ if (hw_res->mem_ranges.count != 1 || hw_res->mem_ranges.ranges[0].size < sizeof(ohci_regs_t)) - return EINVAL; + return EINVAL; errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0], @@ -273,5 +273,5 @@ assert(hc); - if (hc->registers){ + if (hc->registers) { *status = OHCI_RD(hc->registers->interrupt_status); OHCI_WR(hc->registers->interrupt_status, *status); @@ -301,5 +301,5 @@ endpoint_t *ep = batch->ep; - ohci_endpoint_t * const ohci_ep = ohci_endpoint_get(ep); + ohci_endpoint_t *const ohci_ep = ohci_endpoint_get(ep); ohci_transfer_batch_t *ohci_batch = ohci_transfer_batch_get(batch); int err; @@ -319,6 +319,5 @@ /* Control and bulk schedules need a kick to start working */ - switch (batch->ep->transfer_type) - { + switch (batch->ep->transfer_type) { case USB_TRANSFER_CONTROL: OHCI_SET(hc->registers->command_status, CS_CLF); @@ -364,9 +363,9 @@ list_foreach_safe(hc->pending_endpoints, current, next) { - ohci_endpoint_t *ep - = list_get_instance(current, ohci_endpoint_t, pending_link); - - ohci_transfer_batch_t *batch - = ohci_transfer_batch_get(ep->base.active_batch); + ohci_endpoint_t *ep = + list_get_instance(current, ohci_endpoint_t, pending_link); + + ohci_transfer_batch_t *batch = + ohci_transfer_batch_get(ep->base.active_batch); assert(batch); @@ -407,5 +406,5 @@ */ volatile uint32_t *ohci_emulation_reg = - (uint32_t*)((char*)instance->registers + LEGACY_REGS_OFFSET); + (uint32_t *)((char *)instance->registers + LEGACY_REGS_OFFSET); usb_log_debug("OHCI legacy register %p: %x.", ohci_emulation_reg, OHCI_RD(*ohci_emulation_reg)); Index: uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -81,8 +81,8 @@ /* Status: address, endpoint nr, direction mask and max packet size. */ OHCI_MEM32_WR(instance->status, - ((ep->device->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT) - | ((ep->endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT) - | ((dir[ep->direction] & ED_STATUS_D_MASK) << ED_STATUS_D_SHIFT) - | ((ep->max_packet_size & ED_STATUS_MPS_MASK) << ED_STATUS_MPS_SHIFT)); + ((ep->device->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT) | + ((ep->endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT) | + ((dir[ep->direction] & ED_STATUS_D_MASK) << ED_STATUS_D_SHIFT) | + ((ep->max_packet_size & ED_STATUS_MPS_MASK) << ED_STATUS_MPS_SHIFT)); /* Low speed flag */ Index: uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -119,6 +119,6 @@ { assert(instance); - return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_HALTED_FLAG) - || (OHCI_MEM32_RD(instance->status) & ED_STATUS_K_FLAG); + return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_HALTED_FLAG) || + (OHCI_MEM32_RD(instance->status) & ED_STATUS_K_FLAG); } @@ -137,6 +137,6 @@ { assert(instance); - return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_PTR_MASK) - != (OHCI_MEM32_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK); + return (OHCI_MEM32_RD(instance->td_head) & ED_TDHEAD_PTR_MASK) != + (OHCI_MEM32_RD(instance->td_tail) & ED_TDTAIL_PTR_MASK); } Index: uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -68,6 +68,6 @@ /* Set PID and Error code */ OHCI_MEM32_WR(instance->status, - ((dir[direction] & TD_STATUS_DP_MASK) << TD_STATUS_DP_SHIFT) - | ((CC_NOACCESS2 & TD_STATUS_CC_MASK) << TD_STATUS_CC_SHIFT)); + ((dir[direction] & TD_STATUS_DP_MASK) << TD_STATUS_DP_SHIFT) | + ((CC_NOACCESS2 & TD_STATUS_CC_MASK) << TD_STATUS_CC_SHIFT)); if (toggle == 0 || toggle == 1) { Index: uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -103,6 +103,6 @@ { assert(instance); - const int cc = (OHCI_MEM32_RD(instance->status) >> TD_STATUS_CC_SHIFT) - & TD_STATUS_CC_MASK; + const int cc = (OHCI_MEM32_RD(instance->status) >> TD_STATUS_CC_SHIFT) & + TD_STATUS_CC_MASK; /* This value is changed on transfer completion, * either to CC_NOERROR or and error code. @@ -122,6 +122,6 @@ { assert(instance); - const int cc = (OHCI_MEM32_RD(instance->status) - >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK; + const int cc = (OHCI_MEM32_RD(instance->status) >> + TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK; return cc_to_rc(cc); } Index: uspace/drv/bus/usb/ohci/ohci_batch.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci_batch.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/ohci_batch.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -48,5 +48,5 @@ #include "ohci_bus.h" -static void (*const batch_setup[])(ohci_transfer_batch_t*); +static void (*const batch_setup[])(ohci_transfer_batch_t *); /** Safely destructs ohci_transfer_batch_t structure @@ -67,5 +67,5 @@ * NULL otherwise. */ -ohci_transfer_batch_t * ohci_transfer_batch_create(endpoint_t *ep) +ohci_transfer_batch_t *ohci_transfer_batch_create(endpoint_t *ep) { assert(ep); @@ -97,6 +97,6 @@ return ENOTSUP; - ohci_batch->td_count = (usb_batch->size + OHCI_TD_MAX_TRANSFER - 1) - / OHCI_TD_MAX_TRANSFER; + ohci_batch->td_count = (usb_batch->size + OHCI_TD_MAX_TRANSFER - 1) / + OHCI_TD_MAX_TRANSFER; /* Control transfer need Setup and Status stage */ if (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) { @@ -110,7 +110,7 @@ const size_t td_size = ohci_batch->td_count * sizeof(td_t); - const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) - ? USB_SETUP_PACKET_SIZE - : 0; + const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) ? + USB_SETUP_PACKET_SIZE : + 0; if (dma_buffer_alloc(&ohci_batch->ohci_dma_buffer, td_size + setup_size)) { @@ -190,6 +190,6 @@ * we leave the very last(unused) TD behind. */ - usb_batch->transferred_size - -= td_remain_size(ohci_batch->tds[i]); + usb_batch->transferred_size -= + td_remain_size(ohci_batch->tds[i]); } else { usb_log_debug("Batch %p found error TD(%zu):%08x.", @@ -289,5 +289,5 @@ /* Data stage */ size_t td_current = 1; - const char* buffer = ohci_batch->data_buffer; + const char *buffer = ohci_batch->data_buffer; size_t remain_size = ohci_batch->base.size; while (remain_size > 0) { @@ -347,6 +347,6 @@ char *buffer = ohci_batch->data_buffer; while (remain_size > 0) { - const size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER - ? OHCI_TD_MAX_TRANSFER : remain_size; + const size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ? + OHCI_TD_MAX_TRANSFER : remain_size; td_init( @@ -374,6 +374,6 @@ /** Transfer setup table. */ -static void (*const batch_setup[])(ohci_transfer_batch_t*) = -{ +static void (*const batch_setup[])(ohci_transfer_batch_t *) = + { [USB_TRANSFER_CONTROL] = batch_control, [USB_TRANSFER_BULK] = batch_data, Index: uspace/drv/bus/usb/ohci/ohci_bus.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci_bus.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/ohci_bus.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -134,6 +134,6 @@ static void ohci_unregister_ep(endpoint_t *ep) { - ohci_bus_t * const bus = (ohci_bus_t *) endpoint_get_bus(ep); - hc_t * const hc = bus->hc; + ohci_bus_t *const bus = (ohci_bus_t *) endpoint_get_bus(ep); + hc_t *const hc = bus->hc; assert(ep); @@ -151,5 +151,5 @@ endpoint_set_offline_locked(ep); list_remove(&ohci_ep->pending_link); - usb_transfer_batch_t * const batch = ep->active_batch; + usb_transfer_batch_t *const batch = ep->active_batch; endpoint_deactivate_locked(ep); fibril_mutex_unlock(&hc->guard); Index: uspace/drv/bus/usb/ohci/ohci_rh.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci_rh.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/ohci/ohci_rh.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -94,5 +94,5 @@ } else { instance->hub_descriptor.rempow[1] = - ((port_desc >> RHDB_DR_SHIFT) >> 8) & 0xff; + ((port_desc >> RHDB_DR_SHIFT) >> 8) & 0xff; } @@ -224,5 +224,5 @@ } - usb_transfer_batch_t * const batch = ep->active_batch; + usb_transfer_batch_t *const batch = ep->active_batch; endpoint_deactivate_locked(ep); instance->status_change_endpoint = NULL; @@ -347,6 +347,5 @@ const unsigned feature = uint16_usb2host(setup_packet->value); /* Enabled features to clear: see page 269 of USB specs */ - switch (feature) - { + switch (feature) { case USB_HUB_FEATURE_PORT_POWER: /*8*/ rhda = OHCI_RD(hub->registers->rh_desc_a); @@ -418,5 +417,5 @@ /* Ganged power switching, one port powers all */ if (!(rhda & RHDA_PSM_FLAG)) { - OHCI_WR(hub->registers->rh_status,RHS_SET_GLOBAL_POWER); + OHCI_WR(hub->registers->rh_status, RHS_SET_GLOBAL_POWER); return EOK; } @@ -467,6 +466,6 @@ for (unsigned port = 1; port <= hub->port_count; ++port) { /* Write-clean bits are those that indicate change */ - if (OHCI_RD(hub->registers->rh_port_status[port - 1]) - & RHPS_CHANGE_WC_MASK) { + if (OHCI_RD(hub->registers->rh_port_status[port - 1]) & + RHPS_CHANGE_WC_MASK) { mask |= (1 << port); } @@ -542,5 +541,5 @@ /** Virtual OHCI root hub ops */ static usbvirt_device_ops_t ops = { - .control = control_transfer_handlers, - .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler, + .control = control_transfer_handlers, + .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler, }; Index: uspace/drv/bus/usb/uhci/hc.c =================================================================== --- uspace/drv/bus/usb/uhci/hc.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/uhci/hc.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -142,6 +142,6 @@ memcpy(code->cmds, uhci_irq_commands, sizeof(uhci_irq_commands)); uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(regs); - code->cmds[0].addr = (void*)®isters->usbsts; - code->cmds[3].addr = (void*)®isters->usbsts; + code->cmds[0].addr = (void *)®isters->usbsts; + code->cmds[3].addr = (void *)®isters->usbsts; usb_log_debug("I/O regs at %p (size %zu), IRQ %d.", @@ -215,5 +215,5 @@ if (hw_res->io_ranges.count != 1 || hw_res->io_ranges.ranges[0].size < sizeof(uhci_regs_t)) - return EINVAL; + return EINVAL; instance->hw_failures = 0; @@ -224,5 +224,5 @@ if (ret != EOK) { usb_log_error("Failed to gain access to registers: %s.", - str_error(ret)); + str_error(ret)); return ret; } @@ -285,6 +285,7 @@ /* Reset hc, all states and counters. Hope that hw is not broken */ pio_write_16(®isters->usbcmd, UHCI_CMD_HCRESET); - do { async_usleep(10); } - while ((pio_read_16(®isters->usbcmd) & UHCI_CMD_HCRESET) != 0); + do { + async_usleep(10); + } while ((pio_read_16(®isters->usbcmd) & UHCI_CMD_HCRESET) != 0); /* Set frame to exactly 1ms */ @@ -331,5 +332,5 @@ static errno_t endpoint_register(endpoint_t *ep) { - hc_t * const hc = bus_to_hc(endpoint_get_bus(ep)); + hc_t *const hc = bus_to_hc(endpoint_get_bus(ep)); const errno_t err = usb2_bus_endpoint_register(&hc->bus_helper, ep); @@ -353,5 +354,5 @@ static void endpoint_unregister(endpoint_t *ep) { - hc_t * const hc = bus_to_hc(endpoint_get_bus(ep)); + hc_t *const hc = bus_to_hc(endpoint_get_bus(ep)); usb2_bus_endpoint_unregister(&hc->bus_helper, ep); @@ -390,6 +391,6 @@ } - uhci_transfer_batch_t * const batch = - uhci_transfer_batch_get(ep->active_batch); + uhci_transfer_batch_t *const batch = + uhci_transfer_batch_get(ep->active_batch); /* Remove the batch from the schedule to stop it from being finished. */ @@ -412,5 +413,5 @@ static int device_enumerate(device_t *dev) { - hc_t * const hc = bus_to_hc(dev->bus); + hc_t *const hc = bus_to_hc(dev->bus); return usb2_bus_device_enumerate(&hc->bus_helper, dev); } @@ -418,5 +419,5 @@ static void device_gone(device_t *dev) { - hc_t * const hc = bus_to_hc(dev->bus); + hc_t *const hc = bus_to_hc(dev->bus); usb2_bus_device_gone(&hc->bus_helper, dev); } @@ -482,5 +483,5 @@ /* Set all frames to point to the first queue head */ const uint32_t queue = LINK_POINTER_QH( - addr_to_phys(instance->transfers_interrupt.queue_head)); + addr_to_phys(instance->transfers_interrupt.queue_head)); for (unsigned i = 0; i < UHCI_FRAME_LIST_COUNT; ++i) { @@ -524,9 +525,9 @@ /* Connect lists into one schedule */ transfer_list_set_next(&instance->transfers_control_full, - &instance->transfers_bulk_full); + &instance->transfers_bulk_full); transfer_list_set_next(&instance->transfers_control_slow, - &instance->transfers_control_full); + &instance->transfers_control_full); transfer_list_set_next(&instance->transfers_interrupt, - &instance->transfers_control_slow); + &instance->transfers_control_slow); /*FSBR, This feature is not needed (adds no benefit) and is supposedly @@ -539,13 +540,13 @@ /* Assign pointers to be used during scheduling */ instance->transfers[USB_SPEED_FULL][USB_TRANSFER_INTERRUPT] = - &instance->transfers_interrupt; + &instance->transfers_interrupt; instance->transfers[USB_SPEED_LOW][USB_TRANSFER_INTERRUPT] = - &instance->transfers_interrupt; + &instance->transfers_interrupt; instance->transfers[USB_SPEED_FULL][USB_TRANSFER_CONTROL] = - &instance->transfers_control_full; + &instance->transfers_control_full; instance->transfers[USB_SPEED_LOW][USB_TRANSFER_CONTROL] = - &instance->transfers_control_slow; + &instance->transfers_control_slow; instance->transfers[USB_SPEED_FULL][USB_TRANSFER_BULK] = - &instance->transfers_bulk_full; + &instance->transfers_bulk_full; return EOK; @@ -582,5 +583,5 @@ return uhci_rh_schedule(&hc->rh, batch); - transfer_list_t * const list = + transfer_list_t *const list = hc->transfers[ep->device->speed][ep->transfer_type]; @@ -629,6 +630,6 @@ int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff; - uintptr_t expected_pa = instance->frame_list[frnum] - & LINK_POINTER_ADDRESS_MASK; + uintptr_t expected_pa = instance->frame_list[frnum] & + LINK_POINTER_ADDRESS_MASK; uintptr_t real_pa = addr_to_phys(QH(interrupt)); if (expected_pa != real_pa) { @@ -653,5 +654,5 @@ expected_pa = QH(control_full)->next & LINK_POINTER_ADDRESS_MASK; real_pa = addr_to_phys(QH(bulk_full)); - if (expected_pa != real_pa ) { + if (expected_pa != real_pa) { usb_log_debug("Bulk QH: %p vs. %p.", (void *) expected_pa, (void *) real_pa); Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -72,20 +72,20 @@ assert(instance); assert(size < 1024); - assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN) - || (pid == USB_PID_OUT)); + assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN) || + (pid == USB_PID_OUT)); const uint32_t next_pa = addr_to_phys(next); assert((next_pa & LINK_POINTER_ADDRESS_MASK) == next_pa); - instance->next = 0 - | LINK_POINTER_VERTICAL_FLAG - | (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG); + instance->next = 0 | + LINK_POINTER_VERTICAL_FLAG | + (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG); - instance->status = 0 - | ((err_count & TD_STATUS_ERROR_COUNT_MASK) - << TD_STATUS_ERROR_COUNT_POS) - | (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0) - | (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0) - | TD_STATUS_ERROR_ACTIVE; + instance->status = 0 | + ((err_count & TD_STATUS_ERROR_COUNT_MASK) << + TD_STATUS_ERROR_COUNT_POS) | + (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0) | + (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0) | + TD_STATUS_ERROR_ACTIVE; if (pid == USB_PID_IN && !iso) { @@ -93,12 +93,12 @@ } - instance->device = 0 - | (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS) - | (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0) - | ((target.address & TD_DEVICE_ADDRESS_MASK) - << TD_DEVICE_ADDRESS_POS) - | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) - << TD_DEVICE_ENDPOINT_POS) - | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS); + instance->device = 0 | + (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS) | + (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0) | + ((target.address & TD_DEVICE_ADDRESS_MASK) << + TD_DEVICE_ADDRESS_POS) | + ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) << + TD_DEVICE_ENDPOINT_POS) | + ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS); instance->buffer_ptr = addr_to_phys(buffer); @@ -175,6 +175,5 @@ (s & TD_STATUS_ERROR_BIT_STUFF) ? " BIT_STUFF," : "", (s & TD_STATUS_ERROR_RESERVED) ? " RESERVED," : "", - td_act_size(instance) - ); + td_act_size(instance)); } /** Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -129,6 +129,6 @@ const size_t act_size = td_act_size(instance); const size_t max_size = - ((instance->device >> TD_DEVICE_MAXLEN_POS) + 1) - & TD_DEVICE_MAXLEN_MASK; + ((instance->device >> TD_DEVICE_MAXLEN_POS) + 1) & + TD_DEVICE_MAXLEN_MASK; return (instance->status | TD_STATUS_SPD_FLAG) && act_size < max_size; Index: uspace/drv/bus/usb/uhci/transfer_list.c =================================================================== --- uspace/drv/bus/usb/uhci/transfer_list.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/uhci/transfer_list.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -66,5 +66,5 @@ } const uint32_t queue_head_pa = addr_to_phys(instance->queue_head); - usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32" ).", + usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32 " ).", name, instance->queue_head, queue_head_pa); @@ -203,5 +203,5 @@ fibril_mutex_lock(&instance->guard); while (!list_empty(&instance->batch_list)) { - link_t * const current = list_first(&instance->batch_list); + link_t *const current = list_first(&instance->batch_list); uhci_transfer_batch_t *batch = uhci_transfer_batch_from_link(current); transfer_list_remove_batch(instance, batch); @@ -240,6 +240,6 @@ qpos = "NOT FIRST"; } - assert((prev_qh->next & LINK_POINTER_ADDRESS_MASK) - == addr_to_phys(uhci_batch->qh)); + assert((prev_qh->next & LINK_POINTER_ADDRESS_MASK) == + addr_to_phys(uhci_batch->qh)); prev_qh->next = uhci_batch->qh->next; Index: uspace/drv/bus/usb/uhci/uhci_rh.c =================================================================== --- uspace/drv/bus/usb/uhci/uhci_rh.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/uhci/uhci_rh.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -107,5 +107,5 @@ do { batch->error = virthub_base_request(&instance->base, batch->target, - batch->dir, (void*) batch->setup.buffer, + batch->dir, (void *) batch->setup.buffer, batch->dma_buffer.virt, batch->size, &batch->transferred_size); if (batch->error == ENAK) @@ -151,5 +151,6 @@ port_status &= ~STATUS_IN_RESET; pio_write_16(port, port_status); - while ((port_status = pio_read_16(port)) & STATUS_IN_RESET); + while ((port_status = pio_read_16(port)) & STATUS_IN_RESET) + ; /* PIO delay, should not be longer than 3ms as the device might * enter suspend state. */ @@ -201,7 +202,7 @@ const uint16_t value = pio_read_16(hub->ports[port]); - data[0] = ((value & STATUS_LINE_D_MINUS) ? 1 : 0) - | ((value & STATUS_LINE_D_PLUS) ? 2 : 0); - RH_DEBUG(hub, port, "Bus state %" PRIx8 "(source %" PRIx16")", + data[0] = ((value & STATUS_LINE_D_MINUS) ? 1 : 0) | + ((value & STATUS_LINE_D_PLUS) ? 2 : 0); + RH_DEBUG(hub, port, "Bus state %" PRIx8 "(source %" PRIx16 ")", data[0], value); *act_size = 1; @@ -246,6 +247,5 @@ UHCI2USB(val, STATUS_ENABLED_CHANGED, USB2_HUB_PORT_STATUS_C_ENABLE) | // UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_C_SUSPEND) | - (hub->reset_changed[port] ? USB_HUB_PORT_STATUS_C_RESET : 0) - ); + (hub->reset_changed[port] ? USB_HUB_PORT_STATUS_C_RESET : 0)); RH_DEBUG(hub, port, "Port status %" PRIx32 " (source %" PRIx16 "%s)", uint32_usb2host(status), val, @@ -413,7 +413,7 @@ const uint8_t status = ((((status_a & STATUS_CHANGE_BITS) != 0) || hub->reset_changed[0]) ? - 0x2 : 0) | + 0x2 : 0) | ((((status_b & STATUS_CHANGE_BITS) != 0) || hub->reset_changed[1]) ? - 0x4 : 0); + 0x4 : 0); if (status) RH_DEBUG(hub, -1, "Event mask %" PRIx8 @@ -421,5 +421,5 @@ " (status_b %" PRIx16 "%s)", status, status_a, hub->reset_changed[0] ? "-reset" : "", - status_b, hub->reset_changed[1] ? "-reset" : "" ); + status_b, hub->reset_changed[1] ? "-reset" : ""); ((uint8_t *)buffer)[0] = status; *actual_size = 1; @@ -496,5 +496,5 @@ static usbvirt_device_ops_t ops = { - .control = control_transfer_handlers, - .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler, + .control = control_transfer_handlers, + .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler, }; Index: uspace/drv/bus/usb/usbdiag/tests.c =================================================================== --- uspace/drv/bus/usb/usbdiag/tests.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/usbdiag/tests.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -111,6 +111,6 @@ if (beef_buffer[i] != test_data) { usb_log_error("Read of %s IN endpoint returned " - "invalid data at address %zu. [ 0x%X != 0x%X ]", - usb_str_transfer_type(pipe->desc.transfer_type), i * sizeof(test_data), beef_buffer[i], test_data); + "invalid data at address %zu. [ 0x%X != 0x%X ]", + usb_str_transfer_type(pipe->desc.transfer_type), i * sizeof(test_data), beef_buffer[i], test_data); rc = EINVAL; } Index: uspace/drv/bus/usb/usbhub/port.c =================================================================== --- uspace/drv/bus/usb/usbhub/port.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/usbhub/port.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -126,5 +126,5 @@ port_log(debug, port, "Resetting port."); if ((err = usb_hub_set_port_feature(port->hub, port->port_number, - USB_HUB_FEATURE_PORT_RESET))) { + USB_HUB_FEATURE_PORT_RESET))) { port_log(warning, port, "Port reset request failed: %s", str_error(err)); @@ -140,5 +140,5 @@ port_log(debug, port, "Enumerating device."); if ((err = usbhc_device_enumerate(exch, port->port_number, - port->speed))) { + port->speed))) { port_log(error, port, "Failed to enumerate device: %s", str_error(err)); @@ -165,5 +165,5 @@ port_log(debug, port, "Issuing a warm reset."); if ((err = usb_hub_set_port_feature(port->hub, port->port_number, - USB3_HUB_FEATURE_BH_PORT_RESET))) { + USB3_HUB_FEATURE_BH_PORT_RESET))) { port_log(warning, port, "Port reset request failed: %s", str_error(err)); @@ -179,5 +179,5 @@ port_log(debug, port, "Enumerating device."); if ((err = usbhc_device_enumerate(exch, port->port_number, - port->speed))) { + port->speed))) { port_log(error, port, "Failed to enumerate device: %s", str_error(err)); @@ -200,7 +200,7 @@ } - const errno_t err = port->hub->speed == USB_SPEED_SUPER - ? enumerate_device_usb3(port, exch) - : enumerate_device_usb2(port, exch); + const errno_t err = port->hub->speed == USB_SPEED_SUPER ? + enumerate_device_usb3(port, exch) : + enumerate_device_usb2(port, exch); usb_device_bus_exchange_end(exch); @@ -211,6 +211,6 @@ { const bool connected = !!(status & USB_HUB_PORT_STATUS_CONNECTION); - port_log(debug, port, "Connection change: device %s.", connected - ? "attached" : "removed"); + port_log(debug, port, "Connection change: device %s.", connected ? + "attached" : "removed"); if (connected) { Index: uspace/drv/bus/usb/usbhub/status.h =================================================================== --- uspace/drv/bus/usb/usbhub/status.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/usbhub/status.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -59,6 +59,6 @@ if (hub_speed == USB_SPEED_SUPER) return USB_SPEED_SUPER; - if (hub_speed == USB_SPEED_HIGH - && (status & USB2_HUB_PORT_STATUS_HIGH_SPEED)) + if (hub_speed == USB_SPEED_HIGH && + (status & USB2_HUB_PORT_STATUS_HIGH_SPEED)) return USB_SPEED_HIGH; if ((status & USB2_HUB_PORT_STATUS_LOW_SPEED) != 0) Index: uspace/drv/bus/usb/usbhub/usbhub.c =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/usbhub/usbhub.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -83,6 +83,6 @@ */ static const usb_endpoint_description_t - status_change_single_tt_only = HUB_STATUS_CHANGE_EP(0), - status_change_mtt_available = HUB_STATUS_CHANGE_EP(1); + status_change_single_tt_only = HUB_STATUS_CHANGE_EP(0), + status_change_mtt_available = HUB_STATUS_CHANGE_EP(1); const usb_endpoint_description_t *usb_hub_endpoints [] = { @@ -107,5 +107,5 @@ static bool usb_hub_polling_error_callback(usb_device_t *dev, - errno_t err_code, void *arg) + errno_t err_code, void *arg) { assert(dev); @@ -113,5 +113,5 @@ usb_log_error("Device %s polling error: %s", - usb_device_get_name(dev), str_error(err_code)); + usb_device_get_name(dev), str_error(err_code)); return true; @@ -153,10 +153,10 @@ } - const usb_endpoint_description_t *status_change = hub_dev->mtt_available - ? &status_change_mtt_available - : &status_change_single_tt_only; - - usb_endpoint_mapping_t *status_change_mapping - = usb_device_get_mapped_ep_desc(hub_dev->usb_device, status_change); + const usb_endpoint_description_t *status_change = hub_dev->mtt_available ? + &status_change_mtt_available : + &status_change_single_tt_only; + + usb_endpoint_mapping_t *status_change_mapping = + usb_device_get_mapped_ep_desc(hub_dev->usb_device, status_change); if (!status_change_mapping) { usb_log_error("Failed to map the Status Change Endpoint of a hub."); @@ -212,5 +212,5 @@ if (ret != EOK) { usb_log_error("(%p) Failed to unbind '%s' function: %s.", - hub, HUB_FNC_NAME, str_error(ret)); + hub, HUB_FNC_NAME, str_error(ret)); return ret; } @@ -272,5 +272,5 @@ */ static errno_t usb_hub_polling_init(usb_hub_dev_t *hub_dev, - usb_endpoint_mapping_t *mapping) + usb_endpoint_mapping_t *mapping) { errno_t err; @@ -377,6 +377,6 @@ usb_pipe_t *control_pipe = usb_device_get_default_pipe(hub_dev->usb_device); - usb_descriptor_type_t desc_type = hub_dev->speed >= USB_SPEED_SUPER - ? USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB; + usb_descriptor_type_t desc_type = hub_dev->speed >= USB_SPEED_SUPER ? + USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB; /* Get hub descriptor. */ @@ -420,6 +420,5 @@ descriptor.characteristics & HUB_CHAR_POWER_PER_PORT_FLAG; - const uint8_t protocol = usb_device_descriptors(hub_dev->usb_device) - ->device.device_protocol; + const uint8_t protocol = usb_device_descriptors(hub_dev->usb_device)->device.device_protocol; hub_dev->mtt_available = (protocol == 2); @@ -456,7 +455,7 @@ if (config_size < sizeof(usb_standard_configuration_descriptor_t)) { - usb_log_error("Configuration descriptor is not big enough" - " to fit standard configuration descriptor.\n"); - return EOVERFLOW; + usb_log_error("Configuration descriptor is not big enough" + " to fit standard configuration descriptor.\n"); + return EOVERFLOW; } Index: uspace/drv/bus/usb/usbmid/explore.c =================================================================== --- uspace/drv/bus/usb/usbmid/explore.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/usbmid/explore.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -89,12 +89,11 @@ for (; interface_ptr != NULL; interface_ptr = usb_dp_get_sibling_descriptor( - &parser, &data, config_descriptor, interface_ptr)) - { + &parser, &data, config_descriptor, interface_ptr)) { /* The second byte is DESCTYPE byte in all desriptors. */ if (interface_ptr[1] != USB_DESCTYPE_INTERFACE) continue; - const usb_standard_interface_descriptor_t *interface - = (usb_standard_interface_descriptor_t *) interface_ptr; + const usb_standard_interface_descriptor_t *interface = + (usb_standard_interface_descriptor_t *) interface_ptr; /* Skip alternate interfaces. */ @@ -112,5 +111,5 @@ usbmid_interface_t *iface = NULL; const errno_t rc = usbmid_spawn_interface_child(usb_dev, &iface, - &usb_device_descriptors(usb_dev)->device, interface); + &usb_device_descriptors(usb_dev)->device, interface); if (rc != EOK) { //TODO: Do something about that failure. Index: uspace/drv/bus/usb/vhc/hub/virthub.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthub.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/vhc/hub/virthub.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -101,9 +101,8 @@ .descriptor_type = USB_DESCTYPE_CONFIGURATION, .total_length = - sizeof(usb_standard_configuration_descriptor_t) - + sizeof(std_interface_descriptor) - + sizeof(hub_descriptor) - + sizeof(endpoint_descriptor) - , + sizeof(usb_standard_configuration_descriptor_t) + + sizeof(std_interface_descriptor) + + sizeof(hub_descriptor) + + sizeof(endpoint_descriptor), .interface_count = 1, .configuration_number = HUB_CONFIGURATION_ID, @@ -133,5 +132,5 @@ .descriptor = &std_configuration_descriptor, .extra = extra_descriptors, - .extra_count = sizeof(extra_descriptors)/sizeof(extra_descriptors[0]) + .extra_count = sizeof(extra_descriptors) / sizeof(extra_descriptors[0]) }; @@ -148,5 +147,5 @@ * @return Error code. */ -errno_t virthub_init(usbvirt_device_t *dev, const char* name) +errno_t virthub_init(usbvirt_device_t *dev, const char *name) { if (dev == NULL) { Index: uspace/drv/bus/usb/vhc/hub/virthubops.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthubops.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/vhc/hub/virthubops.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -49,12 +49,12 @@ switch (new_state) { - case USBVIRT_STATE_CONFIGURED: - hub_set_port_state_all(hub, HUB_PORT_STATE_POWERED_OFF); - break; - case USBVIRT_STATE_ADDRESS: - hub_set_port_state_all(hub, HUB_PORT_STATE_NOT_CONFIGURED); - break; - default: - break; + case USBVIRT_STATE_CONFIGURED: + hub_set_port_state_all(hub, HUB_PORT_STATE_POWERED_OFF); + break; + case USBVIRT_STATE_ADDRESS: + hub_set_port_state_all(hub, HUB_PORT_STATE_NOT_CONFIGURED); + break; + default: + break; } @@ -137,56 +137,56 @@ switch (feature) { - case USB2_HUB_FEATURE_PORT_ENABLE: - if ((port_state != HUB_PORT_STATE_NOT_CONFIGURED) - && (port_state != HUB_PORT_STATE_POWERED_OFF)) { - hub_set_port_state(hub, port, HUB_PORT_STATE_DISABLED); - } + case USB2_HUB_FEATURE_PORT_ENABLE: + if ((port_state != HUB_PORT_STATE_NOT_CONFIGURED) && + (port_state != HUB_PORT_STATE_POWERED_OFF)) { + hub_set_port_state(hub, port, HUB_PORT_STATE_DISABLED); + } + rc = EOK; + break; + + case USB2_HUB_FEATURE_PORT_SUSPEND: + if (port_state != HUB_PORT_STATE_SUSPENDED) { rc = EOK; break; - - case USB2_HUB_FEATURE_PORT_SUSPEND: - if (port_state != HUB_PORT_STATE_SUSPENDED) { - rc = EOK; - break; - } - hub_set_port_state(hub, port, HUB_PORT_STATE_RESUMING); - rc = EOK; - break; - - case USB_HUB_FEATURE_PORT_POWER: - if (port_state != HUB_PORT_STATE_NOT_CONFIGURED) { - hub_set_port_state(hub, port, HUB_PORT_STATE_POWERED_OFF); - } - rc = EOK; - break; - - case USB_HUB_FEATURE_C_PORT_CONNECTION: - hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_CONNECTION); - rc = EOK; - break; - - case USB2_HUB_FEATURE_C_PORT_ENABLE: - hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_ENABLE); - rc = EOK; - break; - - case USB2_HUB_FEATURE_C_PORT_SUSPEND: - hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_SUSPEND); - rc = EOK; - break; - - case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: - hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_OVER_CURRENT); - rc = EOK; - break; - - case USB_HUB_FEATURE_C_PORT_RESET: - hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_RESET); - rc = EOK; - break; - - default: - rc = ENOTSUP; - break; + } + hub_set_port_state(hub, port, HUB_PORT_STATE_RESUMING); + rc = EOK; + break; + + case USB_HUB_FEATURE_PORT_POWER: + if (port_state != HUB_PORT_STATE_NOT_CONFIGURED) { + hub_set_port_state(hub, port, HUB_PORT_STATE_POWERED_OFF); + } + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_CONNECTION: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_CONNECTION); + rc = EOK; + break; + + case USB2_HUB_FEATURE_C_PORT_ENABLE: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_ENABLE); + rc = EOK; + break; + + case USB2_HUB_FEATURE_C_PORT_SUSPEND: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_SUSPEND); + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_OVER_CURRENT); + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_RESET: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_RESET); + rc = EOK; + break; + + default: + rc = ENOTSUP; + break; } @@ -310,27 +310,27 @@ switch (feature) { - case USB_HUB_FEATURE_PORT_RESET: - if (port_state != HUB_PORT_STATE_POWERED_OFF) { - hub_set_port_state(hub, port, HUB_PORT_STATE_RESETTING); - } - rc = EOK; - break; - - case USB2_HUB_FEATURE_PORT_SUSPEND: - if (port_state == HUB_PORT_STATE_ENABLED) { - hub_set_port_state(hub, port, HUB_PORT_STATE_SUSPENDED); - } - rc = EOK; - break; - - case USB_HUB_FEATURE_PORT_POWER: - if (port_state == HUB_PORT_STATE_POWERED_OFF) { - hub_set_port_state(hub, port, HUB_PORT_STATE_DISCONNECTED); - } - rc = EOK; - break; - - default: - break; + case USB_HUB_FEATURE_PORT_RESET: + if (port_state != HUB_PORT_STATE_POWERED_OFF) { + hub_set_port_state(hub, port, HUB_PORT_STATE_RESETTING); + } + rc = EOK; + break; + + case USB2_HUB_FEATURE_PORT_SUSPEND: + if (port_state == HUB_PORT_STATE_ENABLED) { + hub_set_port_state(hub, port, HUB_PORT_STATE_SUSPENDED); + } + rc = EOK; + break; + + case USB_HUB_FEATURE_PORT_POWER: + if (port_state == HUB_PORT_STATE_POWERED_OFF) { + hub_set_port_state(hub, port, HUB_PORT_STATE_DISCONNECTED); + } + rc = EOK; + break; + + default: + break; } Index: uspace/drv/bus/usb/xhci/commands.c =================================================================== --- uspace/drv/bus/usb/xhci/commands.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/commands.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -159,7 +159,7 @@ } - return cmd_link - ? list_get_instance(cmd_link, xhci_cmd_t, _header.link) - : NULL; + return cmd_link ? + list_get_instance(cmd_link, xhci_cmd_t, _header.link) : + NULL; } Index: uspace/drv/bus/usb/xhci/debug.c =================================================================== --- uspace/drv/bus/usb/xhci/debug.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/debug.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -382,5 +382,5 @@ } -void xhci_dump_input_ctx(const xhci_hc_t * hc, const struct xhci_input_ctx *ictx) +void xhci_dump_input_ctx(const xhci_hc_t *hc, const struct xhci_input_ctx *ictx) { xhci_device_ctx_t *device_ctx = XHCI_GET_DEVICE_CTX(ictx, hc); @@ -400,6 +400,6 @@ for (uint8_t dci = 1; dci <= XHCI_EP_COUNT; dci++) - if (XHCI_INPUT_CTRL_CTX_DROP(*ctrl_ctx, dci) - || XHCI_INPUT_CTRL_CTX_ADD(*ctrl_ctx, dci)) { + if (XHCI_INPUT_CTRL_CTX_DROP(*ctrl_ctx, dci) || + XHCI_INPUT_CTRL_CTX_ADD(*ctrl_ctx, dci)) { usb_log_debug("Endpoint context DCI %u:", dci); xhci_ep_ctx_t *ep_ctx = XHCI_GET_EP_CTX(device_ctx, hc, dci); Index: uspace/drv/bus/usb/xhci/endpoint.c =================================================================== --- uspace/drv/bus/usb/xhci/endpoint.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/endpoint.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -59,5 +59,5 @@ */ static errno_t xhci_endpoint_init(xhci_endpoint_t *xhci_ep, device_t *dev, - const usb_endpoint_descriptors_t *desc) + const usb_endpoint_descriptors_t *desc) { errno_t rc; @@ -88,6 +88,6 @@ if (dev->speed >= USB_SPEED_SUPER) { ep->packets_per_uframe = xhci_ep->max_burst * xhci_ep->mult; - if (ep->transfer_type == USB_TRANSFER_ISOCHRONOUS - || ep->transfer_type == USB_TRANSFER_INTERRUPT) { + if (ep->transfer_type == USB_TRANSFER_ISOCHRONOUS || + ep->transfer_type == USB_TRANSFER_INTERRUPT) { ep->max_transfer_size = ep->max_packet_size * ep->packets_per_uframe; } @@ -100,6 +100,6 @@ * others have 2-based log of it. */ - if (dev->speed >= USB_SPEED_HIGH - || ep->transfer_type != USB_TRANSFER_INTERRUPT) { + if (dev->speed >= USB_SPEED_HIGH || + ep->transfer_type != USB_TRANSFER_INTERRUPT) { xhci_ep->interval = 1 << (xhci_ep->interval - 1); } @@ -141,10 +141,10 @@ */ endpoint_t *xhci_endpoint_create(device_t *dev, - const usb_endpoint_descriptors_t *desc) + const usb_endpoint_descriptors_t *desc) { const usb_transfer_type_t type = USB_ED_GET_TRANSFER_TYPE(desc->endpoint); - xhci_endpoint_t *ep = calloc(1, sizeof(xhci_endpoint_t) - + (type == USB_TRANSFER_ISOCHRONOUS) * sizeof(*ep->isoch)); + xhci_endpoint_t *ep = calloc(1, sizeof(xhci_endpoint_t) + + (type == USB_TRANSFER_ISOCHRONOUS) * sizeof(*ep->isoch)); if (!ep) return NULL; @@ -230,5 +230,5 @@ } - usb_transfer_batch_t * const batch = ep->active_batch; + usb_transfer_batch_t *const batch = ep->active_batch; const errno_t err = hc_stop_endpoint(xhci_ep); @@ -289,14 +289,14 @@ case USB_TRANSFER_ISOCHRONOUS: - return in ? EP_TYPE_ISOCH_IN - : EP_TYPE_ISOCH_OUT; + return in ? EP_TYPE_ISOCH_IN : + EP_TYPE_ISOCH_OUT; case USB_TRANSFER_BULK: - return in ? EP_TYPE_BULK_IN - : EP_TYPE_BULK_OUT; + return in ? EP_TYPE_BULK_IN : + EP_TYPE_BULK_OUT; case USB_TRANSFER_INTERRUPT: - return in ? EP_TYPE_INTERRUPT_IN - : EP_TYPE_INTERRUPT_OUT; + return in ? EP_TYPE_INTERRUPT_IN : + EP_TYPE_INTERRUPT_OUT; } Index: uspace/drv/bus/usb/xhci/hc.c =================================================================== --- uspace/drv/bus/usb/xhci/hc.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/hc.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -87,5 +87,5 @@ xhci_port_speed_t *speeds = hc->speeds; - for (xhci_extcap_t *ec = hc->xecp; ec; ec = xhci_extcap_next(ec)) { + for (xhci_extcap_t * ec = hc->xecp; ec; ec = xhci_extcap_next(ec)) { xhci_dump_extcap(ec); switch (XHCI_REG_RD(ec, XHCI_EC_CAP_ID)) { @@ -151,12 +151,12 @@ * mapping also for devices connected to hubs. */ - if (psiv < ARRAY_SIZE(default_psiv_to_port_speed) - && default_psiv_to_port_speed[psiv].major == major - && default_psiv_to_port_speed[psiv].minor == minor - && default_psiv_to_port_speed[psiv].rx_bps == bps - && default_psiv_to_port_speed[psiv].tx_bps == bps) { + if (psiv < ARRAY_SIZE(default_psiv_to_port_speed) && + default_psiv_to_port_speed[psiv].major == major && + default_psiv_to_port_speed[psiv].minor == minor && + default_psiv_to_port_speed[psiv].rx_bps == bps && + default_psiv_to_port_speed[psiv].tx_bps == bps) { speeds[psiv] = default_psiv_to_port_speed[psiv]; usb_log_debug("Assumed default %s speed of USB %u.", - usb_str_speed(speeds[psiv].usb_speed), major); + usb_str_speed(speeds[psiv].usb_speed), major); continue; } @@ -173,6 +173,6 @@ speeds[psiv].tx_bps = bps; usb_log_debug("Speed %u set up for bps %" PRIu64 - " / %" PRIu64 ".", psiv, speeds[psiv].rx_bps, - speeds[psiv].tx_bps); + " / %" PRIu64 ".", psiv, speeds[psiv].rx_bps, + speeds[psiv].tx_bps); } } @@ -384,6 +384,6 @@ code->rangecount = 1; code->ranges[0] = (irq_pio_range_t) { - .base = RNGABS(hc->mmio_range), - .size = RNGSZ(hc->mmio_range), + .base = RNGABS(hc->mmio_range), + .size = RNGSZ(hc->mmio_range), }; @@ -391,10 +391,10 @@ memcpy(code->cmds, irq_commands, sizeof(irq_commands)); - void *intr0_iman = RNGABSPTR(hc->mmio_range) - + XHCI_REG_RD(hc->cap_regs, XHCI_CAP_RTSOFF) - + offsetof(xhci_rt_regs_t, ir[0]); - void *usbsts = RNGABSPTR(hc->mmio_range) - + XHCI_REG_RD(hc->cap_regs, XHCI_CAP_LENGTH) - + offsetof(xhci_op_regs_t, usbsts); + void *intr0_iman = RNGABSPTR(hc->mmio_range) + + XHCI_REG_RD(hc->cap_regs, XHCI_CAP_RTSOFF) + + offsetof(xhci_rt_regs_t, ir[0]); + void *usbsts = RNGABSPTR(hc->mmio_range) + + XHCI_REG_RD(hc->cap_regs, XHCI_CAP_LENGTH) + + offsetof(xhci_op_regs_t, usbsts); code->cmds[0].addr = intr0_iman; @@ -425,6 +425,6 @@ for (int i = 0; i <= (XHCI_LEGSUP_BIOS_TIMEOUT_US / XHCI_LEGSUP_POLLING_DELAY_1MS); i++) { usb_log_debug("LEGSUP: elapsed: %i ms, bios: %x, os: %x", i, - XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS), - XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS)); + XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS), + XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS)); if (XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS) == 0) { return XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS) == 1 ? EOK : EIO; @@ -559,7 +559,7 @@ const uint32_t usbsts = XHCI_REG_RD_FIELD(&hc->op_regs->usbsts, 32); - return !(usbcmd & XHCI_REG_MASK(XHCI_OP_RS)) - || (usbsts & XHCI_REG_MASK(XHCI_OP_HCE)) - || (usbsts & XHCI_REG_MASK(XHCI_OP_HSE)); + return !(usbcmd & XHCI_REG_MASK(XHCI_OP_RS)) || + (usbsts & XHCI_REG_MASK(XHCI_OP_HCE)) || + (usbsts & XHCI_REG_MASK(XHCI_OP_HSE)); } @@ -589,5 +589,5 @@ struct timeval tv; getuptime(&tv); - usb_log_debug("Microframe index wrapped (@%lu.%li, %"PRIu64" total).", + usb_log_debug("Microframe index wrapped (@%lu.%li, %" PRIu64 " total).", tv.tv_sec, tv.tv_usec, hc->wrap_count); hc->wrap_time = ((uint64_t) tv.tv_sec) * 1000000 + ((uint64_t) tv.tv_usec); @@ -634,5 +634,5 @@ errno_t err; xhci_trb_t trb; - xhci_hc_t * const hc = arg; + xhci_hc_t *const hc = arg; assert(hc); @@ -654,5 +654,5 @@ */ static void hc_run_event_ring(xhci_hc_t *hc, xhci_event_ring_t *event_ring, - xhci_interrupter_regs_t *intr) + xhci_interrupter_regs_t *intr) { errno_t err; @@ -720,5 +720,5 @@ if (status) { usb_log_error("Non-zero status after interrupt handling (%08x) " - " - missing something?", status); + " - missing something?", status); } } @@ -766,12 +766,12 @@ { return (2 * ep->base.endpoint) + - (ep->base.transfer_type == USB_TRANSFER_CONTROL - || ep->base.direction == USB_DIRECTION_IN); + (ep->base.transfer_type == USB_TRANSFER_CONTROL || + ep->base.direction == USB_DIRECTION_IN); } void hc_ring_ep_doorbell(xhci_endpoint_t *ep, uint32_t stream_id) { - xhci_device_t * const dev = xhci_ep_to_dev(ep); - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_device_t *const dev = xhci_ep_to_dev(ep); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); const uint8_t dci = endpoint_dci(ep); const uint32_t target = (stream_id << 16) | (dci & 0x1ff); @@ -786,5 +786,5 @@ { errno_t err; - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); /* Prepare memory for the context */ @@ -821,5 +821,5 @@ { errno_t err; - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); xhci_cmd_t cmd; @@ -846,5 +846,5 @@ static errno_t create_configure_ep_input_ctx(xhci_device_t *dev, dma_buffer_t *dma_buf) { - const xhci_hc_t * hc = bus_to_hc(dev->base.bus); + const xhci_hc_t *hc = bus_to_hc(dev->base.bus); const errno_t err = dma_buffer_alloc(dma_buf, XHCI_INPUT_CTX_SIZE(hc)); if (err) @@ -870,5 +870,5 @@ { errno_t err = ENOMEM; - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); xhci_endpoint_t *ep0 = xhci_endpoint_get(dev->base.endpoints[0]); @@ -920,5 +920,5 @@ errno_t hc_configure_device(xhci_device_t *dev) { - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); xhci_cmd_t cmd; @@ -945,5 +945,5 @@ errno_t hc_deconfigure_device(xhci_device_t *dev) { - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); xhci_cmd_t cmd; errno_t err; @@ -972,5 +972,5 @@ errno_t hc_add_endpoint(xhci_endpoint_t *ep) { - xhci_device_t * const dev = xhci_ep_to_dev(ep); + xhci_device_t *const dev = xhci_ep_to_dev(ep); const unsigned dci = endpoint_dci(ep); xhci_cmd_t cmd; @@ -984,5 +984,5 @@ xhci_input_ctx_t *ictx = ictx_dma_buf.virt; - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); XHCI_INPUT_CTRL_CTX_ADD_SET(*XHCI_GET_CTRL_CTX(ictx, hc), dci); @@ -1007,6 +1007,6 @@ errno_t hc_drop_endpoint(xhci_endpoint_t *ep) { - xhci_device_t * const dev = xhci_ep_to_dev(ep); - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_device_t *const dev = xhci_ep_to_dev(ep); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); const unsigned dci = endpoint_dci(ep); xhci_cmd_t cmd; @@ -1043,10 +1043,10 @@ errno_t hc_update_endpoint(xhci_endpoint_t *ep) { - xhci_device_t * const dev = xhci_ep_to_dev(ep); + xhci_device_t *const dev = xhci_ep_to_dev(ep); const unsigned dci = endpoint_dci(ep); xhci_cmd_t cmd; dma_buffer_t ictx_dma_buf; - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); errno_t err = dma_buffer_alloc(&ictx_dma_buf, XHCI_INPUT_CTX_SIZE(hc)); @@ -1078,7 +1078,7 @@ errno_t hc_stop_endpoint(xhci_endpoint_t *ep) { - xhci_device_t * const dev = xhci_ep_to_dev(ep); + xhci_device_t *const dev = xhci_ep_to_dev(ep); const unsigned dci = endpoint_dci(ep); - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); xhci_cmd_t cmd; errno_t err; @@ -1104,7 +1104,7 @@ errno_t hc_reset_endpoint(xhci_endpoint_t *ep) { - xhci_device_t * const dev = xhci_ep_to_dev(ep); + xhci_device_t *const dev = xhci_ep_to_dev(ep); const unsigned dci = endpoint_dci(ep); - xhci_hc_t * const hc = bus_to_hc(dev->base.bus); + xhci_hc_t *const hc = bus_to_hc(dev->base.bus); xhci_cmd_t cmd; errno_t err; @@ -1126,5 +1126,5 @@ errno_t hc_reset_ring(xhci_endpoint_t *ep, uint32_t stream_id) { - xhci_device_t * const dev = xhci_ep_to_dev(ep); + xhci_device_t *const dev = xhci_ep_to_dev(ep); const unsigned dci = endpoint_dci(ep); uintptr_t addr; @@ -1135,5 +1135,5 @@ xhci_trb_ring_reset_dequeue_state(ring, &addr); - xhci_hc_t * const hc = bus_to_hc(endpoint_get_bus(&ep->base)); + xhci_hc_t *const hc = bus_to_hc(endpoint_get_bus(&ep->base)); xhci_cmd_init(&cmd, XHCI_CMD_SET_TR_DEQUEUE_POINTER); Index: uspace/drv/bus/usb/xhci/hw_struct/regs.h =================================================================== --- uspace/drv/bus/usb/xhci/hw_struct/regs.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/hw_struct/regs.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -235,7 +235,8 @@ #define XHCI_CAP_CIC hccparams2, 32, FLAG, 5 -static inline unsigned xhci_get_max_spbuf(xhci_cap_regs_t *cap_regs) { - return XHCI_REG_RD(cap_regs, XHCI_CAP_MAX_SPBUF_HI) << 5 - | XHCI_REG_RD(cap_regs, XHCI_CAP_MAX_SPBUF_LO); +static inline unsigned xhci_get_max_spbuf(xhci_cap_regs_t *cap_regs) +{ + return XHCI_REG_RD(cap_regs, XHCI_CAP_MAX_SPBUF_HI) << 5 | + XHCI_REG_RD(cap_regs, XHCI_CAP_MAX_SPBUF_LO); } Index: uspace/drv/bus/usb/xhci/hw_struct/trb.h =================================================================== --- uspace/drv/bus/usb/xhci/hw_struct/trb.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/hw_struct/trb.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -166,8 +166,8 @@ return chain_bit && - (type == XHCI_TRB_TYPE_NORMAL - || type == XHCI_TRB_TYPE_DATA_STAGE - || type == XHCI_TRB_TYPE_STATUS_STAGE - || type == XHCI_TRB_TYPE_ISOCH); + (type == XHCI_TRB_TYPE_NORMAL || + type == XHCI_TRB_TYPE_DATA_STAGE || + type == XHCI_TRB_TYPE_STATUS_STAGE || + type == XHCI_TRB_TYPE_ISOCH); } Index: uspace/drv/bus/usb/xhci/isoch.c =================================================================== --- uspace/drv/bus/usb/xhci/isoch.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/isoch.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -49,5 +49,5 @@ { assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; fibril_mutex_initialize(&isoch->guard); @@ -70,5 +70,5 @@ static void isoch_reset(xhci_endpoint_t *ep) { - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; assert(fibril_mutex_is_locked(&isoch->guard)); @@ -87,5 +87,5 @@ static void isoch_reset_no_timer(xhci_endpoint_t *ep) { - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; assert(fibril_mutex_is_locked(&isoch->guard)); /* @@ -97,6 +97,7 @@ } -static void isoch_reset_timer(void *ep) { - xhci_isoch_t * const isoch = xhci_endpoint_get(ep)->isoch; +static void isoch_reset_timer(void *ep) +{ + xhci_isoch_t *const isoch = xhci_endpoint_get(ep)->isoch; fibril_mutex_lock(&isoch->guard); isoch_reset(ep); @@ -109,12 +110,13 @@ */ #define RESET_TIMER_DELAY 100000 -static void timer_schedule_reset(xhci_endpoint_t *ep) { - xhci_isoch_t * const isoch = ep->isoch; - const suseconds_t delay = isoch->buffer_count * ep->interval * 125 - + RESET_TIMER_DELAY; +static void timer_schedule_reset(xhci_endpoint_t *ep) +{ + xhci_isoch_t *const isoch = ep->isoch; + const suseconds_t delay = isoch->buffer_count * ep->interval * 125 + + RESET_TIMER_DELAY; fibril_timer_clear_locked(isoch->reset_timer); fibril_timer_set_locked(isoch->reset_timer, delay, - isoch_reset_timer, ep); + isoch_reset_timer, ep); } @@ -122,5 +124,5 @@ { assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; if (isoch->feeding_timer) { @@ -141,7 +143,8 @@ * Allocate isochronous buffers. Create the feeding timer. */ -errno_t isoch_alloc_transfers(xhci_endpoint_t *ep) { - assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; +errno_t isoch_alloc_transfers(xhci_endpoint_t *ep) +{ + assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); + xhci_isoch_t *const isoch = ep->isoch; isoch->feeding_timer = fibril_timer_create(&isoch->guard); @@ -151,5 +154,5 @@ isoch->transfers = calloc(isoch->buffer_count, sizeof(xhci_isoch_transfer_t)); - if(!isoch->transfers) + if (!isoch->transfers) goto err; @@ -185,5 +188,6 @@ size_t tdpc = it->size / 1024 + ((it->size % 1024) ? 1 : 0); size_t tbc = tdpc / ep->max_burst; - if (!tdpc % ep->max_burst) --tbc; + if (!tdpc % ep->max_burst) + --tbc; size_t bsp = tdpc % ep->max_burst; size_t tlbpc = (bsp ? bsp : ep->max_burst) - 1; @@ -220,6 +224,6 @@ */ uint64_t epoch = hc->wrap_count; - if (reg_mfindex < EPOCH_LOW_MFINDEX - && get_system_time() - hc->wrap_time > EPOCH_DELAY) { + if (reg_mfindex < EPOCH_LOW_MFINDEX && + get_system_time() - hc->wrap_time > EPOCH_DELAY) { ++epoch; } @@ -229,5 +233,5 @@ static inline void calc_next_mfindex(xhci_endpoint_t *ep, xhci_isoch_transfer_t *it) { - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; if (isoch->last_mf == -1U) { const xhci_bus_t *bus = bus_to_xhci_bus(ep->base.device->bus); @@ -270,5 +274,5 @@ */ static inline void window_decide(window_decision_t *res, xhci_hc_t *hc, - uint64_t mfindex) + uint64_t mfindex) { const uint64_t current_mf = get_current_microframe(hc); @@ -300,5 +304,5 @@ { assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; assert(fibril_mutex_is_locked(&isoch->guard)); @@ -309,5 +313,5 @@ while (isoch->transfers[isoch->hw_enqueue].state == ISOCH_FILLED) { - xhci_isoch_transfer_t * const it = &isoch->transfers[isoch->hw_enqueue]; + xhci_isoch_transfer_t *const it = &isoch->transfers[isoch->hw_enqueue]; suseconds_t delay; @@ -321,5 +325,5 @@ delay = wd.offset * 125; usb_log_debug("[isoch] delaying feeding buffer %zu for %ldus", - it - isoch->transfers, delay); + it - isoch->transfers, delay); fibril_timer_set_locked(isoch->feeding_timer, delay, isoch_feed_out_timer, ep); @@ -346,5 +350,5 @@ */ usb_log_debug("[isoch] missed feeding buffer %zu at 0x%llx by " - "%llu uframes", it - isoch->transfers, it->mfindex, wd.offset); + "%llu uframes", it - isoch->transfers, it->mfindex, wd.offset); it->state = ISOCH_COMPLETE; it->error = EOK; @@ -370,5 +374,5 @@ static void isoch_feed_out_timer(void *ep) { - xhci_isoch_t * const isoch = xhci_endpoint_get(ep)->isoch; + xhci_isoch_t *const isoch = xhci_endpoint_get(ep)->isoch; fibril_mutex_lock(&isoch->guard); isoch_feed_out(ep); @@ -386,5 +390,5 @@ { assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; assert(fibril_mutex_is_locked(&isoch->guard)); @@ -395,5 +399,5 @@ while (isoch->transfers[isoch->enqueue].state <= ISOCH_FILLED) { - xhci_isoch_transfer_t * const it = &isoch->transfers[isoch->enqueue]; + xhci_isoch_transfer_t *const it = &isoch->transfers[isoch->enqueue]; suseconds_t delay; @@ -419,5 +423,5 @@ case WINDOW_TOO_LATE: usb_log_debug("[isoch] missed feeding buffer %zu at 0x%llx by" - "%llu uframes", it - isoch->transfers, it->mfindex, wd.offset); + "%llu uframes", it - isoch->transfers, it->mfindex, wd.offset); /* Missed the opportunity to schedule. Schedule ASAP. */ it->mfindex += wd.offset; @@ -458,5 +462,5 @@ static void isoch_feed_in_timer(void *ep) { - xhci_isoch_t * const isoch = xhci_endpoint_get(ep)->isoch; + xhci_isoch_t *const isoch = xhci_endpoint_get(ep)->isoch; fibril_mutex_lock(&isoch->guard); isoch_feed_in(ep); @@ -477,5 +481,5 @@ xhci_endpoint_t *ep = xhci_endpoint_get(transfer->batch.ep); assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; /* This shall be already checked by endpoint */ @@ -541,5 +545,5 @@ xhci_endpoint_t *ep = xhci_endpoint_get(transfer->batch.ep); assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; + xhci_isoch_t *const isoch = ep->isoch; if (transfer->batch.size < ep->base.max_transfer_size) { @@ -585,8 +589,8 @@ void isoch_handle_transfer_event(xhci_hc_t *hc, xhci_endpoint_t *ep, - xhci_trb_t *trb) -{ - assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); - xhci_isoch_t * const isoch = ep->isoch; + xhci_trb_t *trb) +{ + assert(ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS); + xhci_isoch_t *const isoch = ep->isoch; fibril_mutex_lock(&ep->isoch->guard); @@ -632,5 +636,5 @@ } - xhci_isoch_transfer_t * const it = &isoch->transfers[di]; + xhci_isoch_transfer_t *const it = &isoch->transfers[di]; if (it->state == ISOCH_FED && it->interrupt_trb_phys == trb->parameter) { Index: uspace/drv/bus/usb/xhci/rh.c =================================================================== --- uspace/drv/bus/usb/xhci/rh.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/rh.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -54,15 +54,15 @@ /* This mask only lists registers, which imply port change. */ static const uint32_t port_events_mask = - XHCI_REG_MASK(XHCI_PORT_CSC) | - XHCI_REG_MASK(XHCI_PORT_PEC) | - XHCI_REG_MASK(XHCI_PORT_WRC) | - XHCI_REG_MASK(XHCI_PORT_OCC) | - XHCI_REG_MASK(XHCI_PORT_PRC) | - XHCI_REG_MASK(XHCI_PORT_PLC) | - XHCI_REG_MASK(XHCI_PORT_CEC); + XHCI_REG_MASK(XHCI_PORT_CSC) | + XHCI_REG_MASK(XHCI_PORT_PEC) | + XHCI_REG_MASK(XHCI_PORT_WRC) | + XHCI_REG_MASK(XHCI_PORT_OCC) | + XHCI_REG_MASK(XHCI_PORT_PRC) | + XHCI_REG_MASK(XHCI_PORT_PLC) | + XHCI_REG_MASK(XHCI_PORT_CEC); static const uint32_t port_reset_mask = - XHCI_REG_MASK(XHCI_PORT_WRC) | - XHCI_REG_MASK(XHCI_PORT_PRC); + XHCI_REG_MASK(XHCI_PORT_WRC) | + XHCI_REG_MASK(XHCI_PORT_PRC); typedef struct rh_port { @@ -167,6 +167,6 @@ return ENOENT; - unsigned psiv = (status & XHCI_REG_MASK(XHCI_PORT_PS)) - >> XHCI_REG_SHIFT(XHCI_PORT_PS); + unsigned psiv = (status & XHCI_REG_MASK(XHCI_PORT_PS)) >> + XHCI_REG_SHIFT(XHCI_PORT_PS); const usb_speed_t speed = port->rh->hc->speeds[psiv].usb_speed; @@ -233,5 +233,5 @@ static void handle_port_change(xhci_rh_t *rh, uint8_t port_id) { - rh_port_t * const port = &rh->ports[port_id - 1]; + rh_port_t *const port = &rh->ports[port_id - 1]; uint32_t status = XHCI_REG_RD_FIELD(&port->regs->portsc, 32); @@ -280,5 +280,5 @@ void xhci_rh_set_ports_protocol(xhci_rh_t *rh, - unsigned offset, unsigned count, unsigned major) + unsigned offset, unsigned count, unsigned major) { for (unsigned i = offset; i < offset + count; i++) @@ -297,5 +297,5 @@ handle_port_change(rh, i + 1); - rh_port_t * const port = &rh->ports[i]; + rh_port_t *const port = &rh->ports[i]; /* @@ -304,6 +304,6 @@ * such ports. */ - if (XHCI_REG_RD(port->regs, XHCI_PORT_CCS) - && port->base.state == PORT_DISABLED) + if (XHCI_REG_RD(port->regs, XHCI_PORT_CCS) && + port->base.state == PORT_DISABLED) usb_port_connected(&port->base, &rh_enumerate_device); } @@ -320,5 +320,5 @@ for (uint8_t i = 0; i < rh->max_ports; ++i) { - rh_port_t * const port = &rh->ports[i]; + rh_port_t *const port = &rh->ports[i]; usb_port_disabled(&port->base, &rh_remove_device); usb_port_fini(&port->base); @@ -328,5 +328,5 @@ static int rh_worker(void *arg) { - xhci_rh_t * const rh = arg; + xhci_rh_t *const rh = arg; xhci_trb_t trb; Index: uspace/drv/bus/usb/xhci/streams.c =================================================================== --- uspace/drv/bus/usb/xhci/streams.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/streams.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -88,8 +88,8 @@ { usb_log_debug("Allocating primary stream context array of size %u " - "for endpoint " XHCI_EP_FMT, count, XHCI_EP_ARGS(*xhci_ep)); + "for endpoint " XHCI_EP_FMT, count, XHCI_EP_ARGS(*xhci_ep)); if ((dma_buffer_alloc(&xhci_ep->primary_stream_ctx_dma, - count * sizeof(xhci_stream_ctx_t)))) { + count * sizeof(xhci_stream_ctx_t)))) { return ENOMEM; } @@ -110,5 +110,5 @@ { usb_log_debug("Deallocating primary stream structures for " - "endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep)); + "endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep)); dma_buffer_free(&xhci_ep->primary_stream_ctx_dma); @@ -138,5 +138,5 @@ { usb_log_debug("Freeing stream rings and context arrays of endpoint " - XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep)); + XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep)); for (size_t index = 0; index < xhci_ep->primary_stream_data_size; ++index) { @@ -153,5 +153,5 @@ */ static errno_t initialize_primary_stream(xhci_hc_t *hc, xhci_endpoint_t *xhci_ep, - unsigned index) + unsigned index) { xhci_stream_ctx_t *ctx = &xhci_ep->primary_stream_ctx_array[index]; @@ -206,5 +206,5 @@ */ static errno_t initialize_secondary_streams(xhci_hc_t *hc, xhci_endpoint_t *xhci_ep, - unsigned idx, unsigned count) + unsigned idx, unsigned count) { if (count == 0) { @@ -218,5 +218,5 @@ if ((count & (count - 1)) != 0 || count < 8 || count > 256) { usb_log_error("The secondary stream array size must be a power of 2 " - "between 8 and 256."); + "between 8 and 256."); return EINVAL; } @@ -233,5 +233,5 @@ if ((dma_buffer_alloc(&data->secondary_stream_ctx_dma, - count * sizeof(xhci_stream_ctx_t)))) { + count * sizeof(xhci_stream_ctx_t)))) { free(data->secondary_data); return ENOMEM; @@ -275,5 +275,5 @@ */ static void setup_stream_context(xhci_endpoint_t *xhci_ep, xhci_ep_ctx_t *ctx, - unsigned pstreams, unsigned lsa) + unsigned pstreams, unsigned lsa) { XHCI_EP_TYPE_SET(*ctx, xhci_endpoint_type(xhci_ep)); @@ -295,8 +295,8 @@ */ static errno_t verify_stream_conditions(xhci_hc_t *hc, xhci_device_t *dev, - xhci_endpoint_t *xhci_ep, unsigned count) -{ - if (xhci_ep->base.transfer_type != USB_TRANSFER_BULK - || dev->base.speed != USB_SPEED_SUPER) { + xhci_endpoint_t *xhci_ep, unsigned count) +{ + if (xhci_ep->base.transfer_type != USB_TRANSFER_BULK || + dev->base.speed != USB_SPEED_SUPER) { usb_log_error("Streams are only supported by superspeed bulk endpoints."); return EINVAL; @@ -321,5 +321,5 @@ if (count > max_psa_size) { usb_log_error("Host controller only supports " - "%u primary streams.", max_psa_size); + "%u primary streams.", max_psa_size); return EINVAL; } @@ -327,5 +327,5 @@ if (count > xhci_ep->max_streams) { usb_log_error("Endpoint " XHCI_EP_FMT " supports only %" PRIu32 " streams.", - XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams); + XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams); return EINVAL; } @@ -346,5 +346,5 @@ */ errno_t xhci_endpoint_remove_streams(xhci_hc_t *hc, xhci_device_t *dev, - xhci_endpoint_t *xhci_ep) + xhci_endpoint_t *xhci_ep) { if (!xhci_ep->primary_stream_data_size) { @@ -374,5 +374,5 @@ */ errno_t xhci_endpoint_request_primary_streams(xhci_hc_t *hc, xhci_device_t *dev, - xhci_endpoint_t *xhci_ep, unsigned count) + xhci_endpoint_t *xhci_ep, unsigned count) { errno_t err = verify_stream_conditions(hc, dev, xhci_ep, count); @@ -422,5 +422,5 @@ */ errno_t xhci_endpoint_request_secondary_streams(xhci_hc_t *hc, xhci_device_t *dev, - xhci_endpoint_t *xhci_ep, unsigned *sizes, unsigned count) + xhci_endpoint_t *xhci_ep, unsigned *sizes, unsigned count) { /* Check if HC supports secondary indexing */ @@ -454,5 +454,5 @@ if (max * count > xhci_ep->max_streams) { usb_log_error("Endpoint " XHCI_EP_FMT " supports only %" PRIu32 " streams.", - XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams); + XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams); return EINVAL; } Index: uspace/drv/bus/usb/xhci/test/reg-ops.c =================================================================== --- uspace/drv/bus/usb/xhci/test/reg-ops.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/test/reg-ops.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -23,5 +23,6 @@ #define EQ(exp, act) PCUT_ASSERT_INT_EQUALS((exp), (act)) -PCUT_TEST(ops_8_field) { +PCUT_TEST(ops_8_field) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_8_FIELD)); @@ -41,5 +42,6 @@ } -PCUT_TEST(ops_8_range) { +PCUT_TEST(ops_8_range) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_8_RANGE)); @@ -58,5 +60,6 @@ } -PCUT_TEST(ops_8_flag) { +PCUT_TEST(ops_8_flag) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_8_FLAG)); @@ -76,5 +79,6 @@ } -PCUT_TEST(ops_16_field) { +PCUT_TEST(ops_16_field) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_16_FIELD)); @@ -93,5 +97,6 @@ } -PCUT_TEST(ops_16_range) { +PCUT_TEST(ops_16_range) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_16_RANGE)); @@ -110,5 +115,6 @@ } -PCUT_TEST(ops_16_flag) { +PCUT_TEST(ops_16_flag) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_16_FLAG)); @@ -128,5 +134,6 @@ } -PCUT_TEST(ops_32_field) { +PCUT_TEST(ops_32_field) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_32_FIELD)); @@ -145,5 +152,6 @@ } -PCUT_TEST(ops_32_range) { +PCUT_TEST(ops_32_range) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_32_RANGE)); @@ -162,5 +170,6 @@ } -PCUT_TEST(ops_32_flag) { +PCUT_TEST(ops_32_flag) +{ RESET; EQ(0, XHCI_REG_RD(regs, REG_32_FLAG)); Index: uspace/drv/bus/usb/xhci/transfers.c =================================================================== --- uspace/drv/bus/usb/xhci/transfers.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/transfers.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -51,11 +51,11 @@ * See Table 7 of xHCI specification. */ -static inline stage_dir_flag_t get_status_direction_flag(xhci_trb_t* trb, - uint8_t bmRequestType, uint16_t wLength) +static inline stage_dir_flag_t get_status_direction_flag(xhci_trb_t *trb, + uint8_t bmRequestType, uint16_t wLength) { /* See Table 7 of xHCI specification */ - return SETUP_REQUEST_TYPE_IS_DEVICE_TO_HOST(bmRequestType) && (wLength > 0) - ? STAGE_OUT - : STAGE_IN; + return SETUP_REQUEST_TYPE_IS_DEVICE_TO_HOST(bmRequestType) && (wLength > 0) ? + STAGE_OUT : + STAGE_IN; } @@ -69,6 +69,6 @@ * See Table 8 of xHCI specification. */ -static inline data_stage_type_t get_transfer_type(xhci_trb_t* trb, uint8_t - bmRequestType, uint16_t wLength) +static inline data_stage_type_t get_transfer_type(xhci_trb_t *trb, uint8_t + bmRequestType, uint16_t wLength) { if (wLength == 0) @@ -76,7 +76,7 @@ /* See Table 7 of xHCI specification */ - return SETUP_REQUEST_TYPE_IS_DEVICE_TO_HOST(bmRequestType) - ? DATA_STAGE_IN - : DATA_STAGE_NO; + return SETUP_REQUEST_TYPE_IS_DEVICE_TO_HOST(bmRequestType) ? + DATA_STAGE_IN : + DATA_STAGE_NO; } @@ -86,6 +86,6 @@ return request_type == USB_REQUEST_TYPE_STANDARD && - (setup->request == USB_DEVREQ_SET_CONFIGURATION - || setup->request == USB_DEVREQ_SET_INTERFACE); + (setup->request == USB_DEVREQ_SET_CONFIGURATION || + setup->request == USB_DEVREQ_SET_INTERFACE); } @@ -95,5 +95,5 @@ * Bus callback. */ -usb_transfer_batch_t * xhci_transfer_create(endpoint_t* ep) +usb_transfer_batch_t *xhci_transfer_create(endpoint_t *ep) { xhci_transfer_t *transfer = calloc(1, sizeof(xhci_transfer_t)); @@ -108,5 +108,5 @@ * Destroy a xHCI transfer. */ -void xhci_transfer_destroy(usb_transfer_batch_t* batch) +void xhci_transfer_destroy(usb_transfer_batch_t *batch) { xhci_transfer_t *transfer = xhci_transfer_from_batch(batch); @@ -137,6 +137,6 @@ const size_t chunk_mask = dma_policy_chunk_mask(ts->buf.policy); - ts->chunk_size = (chunk_mask > MAX_CHUNK_SIZE + 1) - ? MAX_CHUNK_SIZE : (chunk_mask + 1); + ts->chunk_size = (chunk_mask > MAX_CHUNK_SIZE + 1) ? + MAX_CHUNK_SIZE : (chunk_mask + 1); ts->remaining = transfer->batch.size; @@ -183,10 +183,10 @@ } -static errno_t schedule_control(xhci_hc_t* hc, xhci_transfer_t* transfer) +static errno_t schedule_control(xhci_hc_t *hc, xhci_transfer_t *transfer) { usb_transfer_batch_t *batch = &transfer->batch; xhci_endpoint_t *xhci_ep = xhci_endpoint_get(transfer->batch.ep); - usb_device_request_setup_packet_t* setup = &batch->setup.packet; + usb_device_request_setup_packet_t *setup = &batch->setup.packet; trb_splitter_t splitter; @@ -210,6 +210,6 @@ get_transfer_type(trb_setup, setup->request_type, setup->length)); - stage_dir_flag_t stage_dir = (transfer->batch.dir == USB_DIRECTION_IN) - ? STAGE_IN : STAGE_OUT; + stage_dir_flag_t stage_dir = (transfer->batch.dir == USB_DIRECTION_IN) ? + STAGE_IN : STAGE_OUT; /* Data stage - first TRB is special */ @@ -243,7 +243,7 @@ } -static errno_t schedule_bulk_intr(xhci_hc_t* hc, xhci_transfer_t *transfer) -{ - xhci_trb_ring_t * const ring = get_ring(transfer); +static errno_t schedule_bulk_intr(xhci_hc_t *hc, xhci_transfer_t *transfer) +{ + xhci_trb_ring_t *const ring = get_ring(transfer); if (!ring) return EINVAL; @@ -266,6 +266,5 @@ /* Set the interrupt bit for last TRB */ TRB_CTRL_SET_IOC(trbs[trbs_used - 1], 1); - } - else { + } else { /* Clear the chain bit on the last TRB */ TRB_CTRL_SET_CHAIN(trbs[trbs_used - 1], 1); @@ -280,17 +279,17 @@ return xhci_trb_ring_enqueue_multiple(ring, trbs, trbs_used, - &transfer->interrupt_trb_phys); -} - -static int schedule_isochronous(xhci_transfer_t* transfer) + &transfer->interrupt_trb_phys); +} + +static int schedule_isochronous(xhci_transfer_t *transfer) { endpoint_t *ep = transfer->batch.ep; - return ep->direction == USB_DIRECTION_OUT - ? isoch_schedule_out(transfer) - : isoch_schedule_in(transfer); -} - -errno_t xhci_handle_transfer_event(xhci_hc_t* hc, xhci_trb_t* trb) + return ep->direction == USB_DIRECTION_OUT ? + isoch_schedule_out(transfer) : + isoch_schedule_in(transfer); +} + +errno_t xhci_handle_transfer_event(xhci_hc_t *hc, xhci_trb_t *trb) { uintptr_t addr = trb->parameter; @@ -327,6 +326,5 @@ transfer->interrupt_trb_phys); batch = &transfer->batch; - } - else { + } else { xhci_trb_ring_update_dequeue(&ep->ring, addr); @@ -354,49 +352,49 @@ const xhci_trb_completion_code_t completion_code = TRB_COMPLETION_CODE(*trb); switch (completion_code) { - case XHCI_TRBC_SHORT_PACKET: - case XHCI_TRBC_SUCCESS: - batch->error = EOK; - batch->transferred_size = batch->size - TRB_TRANSFER_LENGTH(*trb); - break; - - case XHCI_TRBC_DATA_BUFFER_ERROR: - usb_log_warning("Transfer ended with data buffer error."); - batch->error = EAGAIN; - batch->transferred_size = 0; - break; - - case XHCI_TRBC_BABBLE_DETECTED_ERROR: - usb_log_warning("Babble detected during the transfer."); - batch->error = EAGAIN; - batch->transferred_size = 0; - break; - - case XHCI_TRBC_USB_TRANSACTION_ERROR: - usb_log_warning("USB Transaction error."); - batch->error = EAGAIN; - batch->transferred_size = 0; - break; - - case XHCI_TRBC_TRB_ERROR: - usb_log_error("Invalid transfer parameters."); - batch->error = EINVAL; - batch->transferred_size = 0; - break; - - case XHCI_TRBC_STALL_ERROR: - usb_log_warning("Stall condition detected."); - batch->error = ESTALL; - batch->transferred_size = 0; - break; - - case XHCI_TRBC_SPLIT_TRANSACTION_ERROR: - usb_log_error("Split transcation error detected."); - batch->error = EAGAIN; - batch->transferred_size = 0; - break; - - default: - usb_log_warning("Transfer not successfull: %u", completion_code); - batch->error = EIO; + case XHCI_TRBC_SHORT_PACKET: + case XHCI_TRBC_SUCCESS: + batch->error = EOK; + batch->transferred_size = batch->size - TRB_TRANSFER_LENGTH(*trb); + break; + + case XHCI_TRBC_DATA_BUFFER_ERROR: + usb_log_warning("Transfer ended with data buffer error."); + batch->error = EAGAIN; + batch->transferred_size = 0; + break; + + case XHCI_TRBC_BABBLE_DETECTED_ERROR: + usb_log_warning("Babble detected during the transfer."); + batch->error = EAGAIN; + batch->transferred_size = 0; + break; + + case XHCI_TRBC_USB_TRANSACTION_ERROR: + usb_log_warning("USB Transaction error."); + batch->error = EAGAIN; + batch->transferred_size = 0; + break; + + case XHCI_TRBC_TRB_ERROR: + usb_log_error("Invalid transfer parameters."); + batch->error = EINVAL; + batch->transferred_size = 0; + break; + + case XHCI_TRBC_STALL_ERROR: + usb_log_warning("Stall condition detected."); + batch->error = ESTALL; + batch->transferred_size = 0; + break; + + case XHCI_TRBC_SPLIT_TRANSACTION_ERROR: + usb_log_error("Split transcation error detected."); + batch->error = EAGAIN; + batch->transferred_size = 0; + break; + + default: + usb_log_warning("Transfer not successfull: %u", completion_code); + batch->error = EIO; } @@ -456,15 +454,15 @@ * the Reset Endpoint command. */ - if (batch->ep->transfer_type == USB_TRANSFER_CONTROL - && batch->dir == USB_DIRECTION_OUT) { + if (batch->ep->transfer_type == USB_TRANSFER_CONTROL && + batch->dir == USB_DIRECTION_OUT) { const usb_device_request_setup_packet_t *request = &batch->setup.packet; - if (request->request == USB_DEVREQ_CLEAR_FEATURE - && request->request_type == USB_REQUEST_RECIPIENT_ENDPOINT - && request->value == USB_FEATURE_ENDPOINT_HALT) { + if (request->request == USB_DEVREQ_CLEAR_FEATURE && + request->request_type == USB_REQUEST_RECIPIENT_ENDPOINT && + request->value == USB_FEATURE_ENDPOINT_HALT) { const uint16_t index = uint16_usb2host(request->index); const usb_endpoint_t ep_num = index & 0xf; - const usb_direction_t dir = (index >> 7) - ? USB_DIRECTION_IN - : USB_DIRECTION_OUT; + const usb_direction_t dir = (index >> 7) ? + USB_DIRECTION_IN : + USB_DIRECTION_OUT; endpoint_t *halted_ep = bus_find_endpoint(&xhci_dev->base, ep_num, dir); if (halted_ep) { @@ -488,6 +486,6 @@ } else { usb_log_warning("Device(%u): Resetting unregistered endpoint" - " %u %s.", xhci_dev->base.address, ep_num, - usb_str_direction(dir)); + " %u %s.", xhci_dev->base.address, ep_num, + usb_str_direction(dir)); } } Index: uspace/drv/bus/usb/xhci/trb_ring.c =================================================================== --- uspace/drv/bus/usb/xhci/trb_ring.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/bus/usb/xhci/trb_ring.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -122,6 +122,6 @@ list_initialize(&ring->segments); - size_t segment_count = (initial_size + SEGMENT_TRB_USEFUL_COUNT - 1) - / SEGMENT_TRB_USEFUL_COUNT; + size_t segment_count = (initial_size + SEGMENT_TRB_USEFUL_COUNT - 1) / + SEGMENT_TRB_USEFUL_COUNT; for (size_t i = 0; i < segment_count; ++i) { @@ -134,5 +134,5 @@ } - trb_segment_t * const segment = get_first_segment(&ring->segments); + trb_segment_t *const segment = get_first_segment(&ring->segments); xhci_trb_t *last = segment_end(segment) - 1; xhci_trb_link_fill(last, segment->phys); @@ -198,6 +198,6 @@ static bool trb_generates_interrupt(xhci_trb_t *trb) { - return TRB_TYPE(*trb) >= XHCI_TRB_TYPE_ENABLE_SLOT_CMD - || TRB_IOC(*trb); + return TRB_TYPE(*trb) >= XHCI_TRB_TYPE_ENABLE_SLOT_CMD || + TRB_IOC(*trb); } @@ -220,5 +220,5 @@ */ errno_t xhci_trb_ring_enqueue_multiple(xhci_trb_ring_t *ring, xhci_trb_t *first_trb, - size_t trbs, uintptr_t *phys) + size_t trbs, uintptr_t *phys) { errno_t err; @@ -230,6 +230,6 @@ fibril_mutex_lock(&ring->guard); - xhci_trb_t * const saved_enqueue_trb = ring->enqueue_trb; - trb_segment_t * const saved_enqueue_segment = ring->enqueue_segment; + xhci_trb_t *const saved_enqueue_trb = ring->enqueue_trb; + trb_segment_t *const saved_enqueue_segment = ring->enqueue_segment; if (phys) *phys = (uintptr_t)NULL; @@ -365,7 +365,7 @@ { list_foreach(ring->segments, segments_link, trb_segment_t, segment) - memset(segment->trb_storage, 0, sizeof(segment->trb_storage)); - - trb_segment_t * const segment = get_first_segment(&ring->segments); + memset(segment->trb_storage, 0, sizeof(segment->trb_storage)); + + trb_segment_t *const segment = get_first_segment(&ring->segments); ring->dequeue_segment = segment; ring->dequeue_trb = segment_begin(segment); Index: uspace/drv/char/i8042/i8042.c =================================================================== --- uspace/drv/char/i8042/i8042.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/char/i8042/i8042.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -115,5 +115,6 @@ { assert(dev); - while (pio_read_8(&dev->regs->status) & i8042_INPUT_FULL); + while (pio_read_8(&dev->regs->status) & i8042_INPUT_FULL) + ; } Index: uspace/drv/char/ns8250/ns8250.c =================================================================== --- uspace/drv/char/ns8250/ns8250.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/char/ns8250/ns8250.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -388,6 +388,6 @@ pio_write_8(&ns->regs->mcr, NS8250_MCR_ALL); - if ((pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS) - != NS8250_MSR_SIGNALS) + if ((pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS) != + NS8250_MSR_SIGNALS) res = false; @@ -450,5 +450,5 @@ ddf_msg(LVL_NOTE, "Device %s was assigned I/O address = " "0x%#" PRIxn ".", ddf_dev_get_name(ns->dev), ns->io_addr); - break; + break; default: @@ -483,6 +483,6 @@ /* Interrupt when data received. */ pio_write_8(®s->ier, NS8250_IER_RXREADY | NS8250_IER_RXSTATUS); - pio_write_8(®s->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS - | NS8250_MCR_OUT2); + pio_write_8(®s->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS | + NS8250_MCR_OUT2); } @@ -714,13 +714,13 @@ * reliability. */ - pio_write_8(&ns->regs->iid, NS8250_FCR_FIFOENABLE - | NS8250_FCR_RXFIFORESET | NS8250_FCR_TXFIFORESET - | NS8250_FCR_RXTRIGGERLOW); + pio_write_8(&ns->regs->iid, NS8250_FCR_FIFOENABLE | + NS8250_FCR_RXFIFORESET | NS8250_FCR_TXFIFORESET | + NS8250_FCR_RXTRIGGERLOW); /* * RTS/DSR set (Request to Send and Data Terminal Ready lines enabled), * Aux Output2 set - needed for interrupts. */ - pio_write_8(&ns->regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS - | NS8250_MCR_OUT2); + pio_write_8(&ns->regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS | + NS8250_MCR_OUT2); } @@ -1014,6 +1014,6 @@ */ static void -ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, unsigned int *parity, - unsigned int *word_length, unsigned int* stop_bits) + ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, unsigned int *parity, + unsigned int *word_length, unsigned int *stop_bits) { ns8250_t *data = dev_ns8250(dev); @@ -1085,5 +1085,5 @@ case SERIAL_SET_COM_PROPS: - baud_rate = IPC_GET_ARG1(*call); + baud_rate = IPC_GET_ARG1(*call); parity = IPC_GET_ARG2(*call); word_length = IPC_GET_ARG3(*call); Index: uspace/drv/char/sun4v-con/sun4v-con.c =================================================================== --- uspace/drv/char/sun4v-con/sun4v-con.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/char/sun4v-con/sun4v-con.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -60,6 +60,7 @@ while (con->output_buffer->write_ptr == - (con->output_buffer->read_ptr + OUTPUT_BUFFER_SIZE - 1) - % OUTPUT_BUFFER_SIZE); + (con->output_buffer->read_ptr + OUTPUT_BUFFER_SIZE - 1) % + OUTPUT_BUFFER_SIZE) + ; con->output_buffer->data[con->output_buffer->write_ptr] = data; Index: uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -126,14 +126,22 @@ visual_t visual = VISUAL_BGR_8_8_8; switch (CONFIG_BFB_BPP) { - case 8: visual = VISUAL_INDIRECT_8; break; - case 16: visual = VISUAL_RGB_5_6_5_LE; break; - case 24: visual = VISUAL_BGR_8_8_8; break; - case 32: visual = VISUAL_RGB_8_8_8_0; break; + case 8: + visual = VISUAL_INDIRECT_8; + break; + case 16: + visual = VISUAL_RGB_5_6_5_LE; + break; + case 24: + visual = VISUAL_BGR_8_8_8; + break; + case 32: + visual = VISUAL_RGB_8_8_8_0; + break; default: return EINVAL; } - errno_t ret = pio_enable((void*)AMDM37x_DISPC_BASE_ADDRESS, - AMDM37x_DISPC_SIZE, (void**)&instance->regs); + errno_t ret = pio_enable((void *)AMDM37x_DISPC_BASE_ADDRESS, + AMDM37x_DISPC_SIZE, (void **)&instance->regs); if (ret != EOK) { return EIO; @@ -170,6 +178,5 @@ uint32_t attrib_pixel_format = 0; uint32_t control_data_lanes = 0; - switch (bpp) - { + switch (bpp) { case 32: attrib_pixel_format = AMDM37X_DISPC_GFX_ATTRIBUTES_FORMAT_RGBX; @@ -190,8 +197,8 @@ /* Prepare sizes */ const uint32_t size_reg = - (((x - 1) & AMDM37X_DISPC_SIZE_WIDTH_MASK) - << AMDM37X_DISPC_SIZE_WIDTH_SHIFT) | - (((y - 1) & AMDM37X_DISPC_SIZE_HEIGHT_MASK) - << AMDM37X_DISPC_SIZE_HEIGHT_SHIFT); + (((x - 1) & AMDM37X_DISPC_SIZE_WIDTH_MASK) << + AMDM37X_DISPC_SIZE_WIDTH_SHIFT) | + (((y - 1) & AMDM37X_DISPC_SIZE_HEIGHT_MASK) << + AMDM37X_DISPC_SIZE_HEIGHT_SHIFT); /* modes taken from u-boot, for 1024x768 */ @@ -212,13 +219,13 @@ /* Setup control register */ uint32_t control = 0 | - AMDM37X_DISPC_CONTROL_PCKFREEENABLE_FLAG | - (control_data_lanes << AMDM37X_DISPC_CONTROL_TFTDATALINES_SHIFT) | - AMDM37X_DISPC_CONTROL_GPOUT0_FLAG | - AMDM37X_DISPC_CONTROL_GPOUT1_FLAG; + AMDM37X_DISPC_CONTROL_PCKFREEENABLE_FLAG | + (control_data_lanes << AMDM37X_DISPC_CONTROL_TFTDATALINES_SHIFT) | + AMDM37X_DISPC_CONTROL_GPOUT0_FLAG | + AMDM37X_DISPC_CONTROL_GPOUT1_FLAG; regs->control = control; /* No gamma stuff only data */ - uint32_t config = (AMDM37X_DISPC_CONFIG_LOADMODE_DATAEVERYFRAME - << AMDM37X_DISPC_CONFIG_LOADMODE_SHIFT); + uint32_t config = (AMDM37X_DISPC_CONFIG_LOADMODE_DATAEVERYFRAME << + AMDM37X_DISPC_CONFIG_LOADMODE_SHIFT); regs->config = config; @@ -272,5 +279,5 @@ const unsigned x = mode.screen_width; const unsigned y = mode.screen_height; - ddf_log_note("Setting mode: %ux%ux%u\n", x, y, bpp*8); + ddf_log_note("Setting mode: %ux%ux%u\n", x, y, bpp * 8); const size_t size = ALIGN_UP(x * y * bpp, PAGE_SIZE); uintptr_t pa; @@ -286,5 +293,5 @@ dispc->fb_data = buffer; - amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp *8, (uint32_t)pa); + amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp * 8, (uint32_t)pa); dispc->active_fb.idx = mode.index; dispc->active_fb.width = x; @@ -326,6 +333,6 @@ dispc->fb_data + FB_POS(x, y), *pixelmap_pixel_at(map, - (x + x_offset) % map->width, - (y + y_offset) % map->height)); + (x + x_offset) % map->width, + (y + y_offset) % map->height)); } } Index: uspace/drv/hid/ps2mouse/ps2mouse.c =================================================================== --- uspace/drv/hid/ps2mouse/ps2mouse.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/hid/ps2mouse/ps2mouse.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -165,5 +165,5 @@ /* Probe IntelliMouse extensions. */ - errno_t (*polling_f)(void*) = polling_ps2; + errno_t (*polling_f)(void *) = polling_ps2; if (probe_intellimouse(mouse, false) == EOK) { ddf_msg(LVL_NOTE, "Enabled IntelliMouse extensions"); @@ -253,7 +253,7 @@ errno_t rc; - bool buttons[PS2_BUTTON_COUNT] = {}; + bool buttons[PS2_BUTTON_COUNT] = { }; while (true) { - uint8_t packet[PS2_BUFSIZE] = {}; + uint8_t packet[PS2_BUFSIZE] = { }; rc = ps2_mouse_read_packet(mouse, packet, PS2_BUFSIZE); if (rc != EOK) @@ -305,7 +305,7 @@ errno_t rc; - bool buttons[INTELLIMOUSE_BUTTON_COUNT] = {}; + bool buttons[INTELLIMOUSE_BUTTON_COUNT] = { }; while (true) { - uint8_t packet[INTELLIMOUSE_BUFSIZE] = {}; + uint8_t packet[INTELLIMOUSE_BUFSIZE] = { }; rc = ps2_mouse_read_packet(mouse, packet, INTELLIMOUSE_BUFSIZE); if (rc != EOK) Index: uspace/drv/hid/usbhid/usbhid.c =================================================================== --- uspace/drv/hid/usbhid/usbhid.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/hid/usbhid/usbhid.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -123,6 +123,6 @@ &usb_device_descriptors(hid_dev->usb_dev)->device; - return (d->vendor_id == mapping->vendor_id) - && (d->product_id == mapping->product_id); + return (d->vendor_id == mapping->vendor_id) && + (d->product_id == mapping->product_id); } @@ -139,6 +139,6 @@ } - for (int i = 0; mapping->usage_path[i].usage != 0 - || mapping->usage_path[i].usage_page != 0; ++i) { + for (int i = 0; mapping->usage_path[i].usage != 0 || + mapping->usage_path[i].usage_page != 0; ++i) { if (usb_hid_report_path_append_item(usage_path, mapping->usage_path[i].usage_page, @@ -159,11 +159,11 @@ if (report_id != 0) { usb_hid_report_path_set_report_id(usage_path, - report_id); + report_id); } const usb_hid_report_field_t *field = usb_hid_report_get_sibling( - &hid_dev->report, NULL, usage_path, mapping->compare, - USB_HID_REPORT_TYPE_INPUT); + &hid_dev->report, NULL, usage_path, mapping->compare, + USB_HID_REPORT_TYPE_INPUT); usb_log_debug("Field: %p", field); @@ -275,9 +275,9 @@ static const struct { const usb_endpoint_description_t *desc; - const char* description; + const char *description; } endpoints[] = { - {&usb_hid_kbd_poll_endpoint_description, "Keyboard endpoint"}, - {&usb_hid_mouse_poll_endpoint_description, "Mouse endpoint"}, - {&usb_hid_generic_poll_endpoint_description, "Generic HID endpoint"}, + { &usb_hid_kbd_poll_endpoint_description, "Keyboard endpoint" }, + { &usb_hid_mouse_poll_endpoint_description, "Mouse endpoint" }, + { &usb_hid_generic_poll_endpoint_description, "Generic HID endpoint" }, }; @@ -305,5 +305,5 @@ const size_t size = usb_hid_report_byte_size(&hid_dev->report, report_id, - USB_HID_REPORT_TYPE_INPUT); + USB_HID_REPORT_TYPE_INPUT); usb_log_debug("Report ID: %u, size: %zu", report_id, size); max_size = (size > max_size) ? size : max_size; @@ -492,5 +492,5 @@ for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) { if (hid_dev->subdrivers[i].init != NULL) { - usb_log_debug("Initializing subdriver %d.",i); + usb_log_debug("Initializing subdriver %d.", i); const errno_t pret = hid_dev->subdrivers[i].init(hid_dev, &hid_dev->subdrivers[i].data); Index: uspace/drv/nic/ar9271/ar9271.c =================================================================== --- uspace/drv/nic/ar9271/ar9271.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/ar9271/ar9271.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -408,5 +408,5 @@ ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev); - if(insert) { + if (insert) { assert(key_conf); Index: uspace/drv/nic/ar9271/hw.c =================================================================== --- uspace/drv/nic/ar9271/hw.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/ar9271/hw.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -158,6 +158,6 @@ uint16_t two_bytes = uint16_t_be2host(value); - ar9271_address.address[2*i] = two_bytes >> 8; - ar9271_address.address[2*i+1] = two_bytes & 0xff; + ar9271_address.address[2 * i] = two_bytes >> 8; + ar9271_address.address[2 * i + 1] = two_bytes & 0xff; } @@ -272,5 +272,5 @@ uint32_t set_bit = 0x10000000; - switch(op_mode) { + switch (op_mode) { case IEEE80211_OPMODE_ADHOC: set_bit |= AR9271_OPMODE_ADHOC_MASK; @@ -545,5 +545,5 @@ wmi_reg_write(ar9271->htc_device, AR9271_PHY_ACTIVE, 0); - if(ar9271->starting_up) { + if (ar9271->starting_up) { wmi_reg_write(ar9271->htc_device, AR9271_RESET_POWER_DOWN_CONTROL, Index: uspace/drv/nic/ar9271/wmi.c =================================================================== --- uspace/drv/nic/ar9271/wmi.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/ar9271/wmi.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -232,5 +232,5 @@ if (command_buffer != NULL) - memcpy(buffer+header_size, command_buffer, command_length); + memcpy(buffer + header_size, command_buffer, command_length); /* Set up WMI header */ @@ -283,5 +283,5 @@ ((void *) response_buffer + sizeof(htc_frame_header_t)); cmd_id = uint16_t_be2host(wmi_hdr->command_id); - } while(cmd_id & WMI_MGMT_CMD_MASK); + } while (cmd_id & WMI_MGMT_CMD_MASK); if (clean_resp_buffer) Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/e1k/e1k.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -555,5 +555,5 @@ */ static void e1000_write_receive_address(e1000_t *e1000, unsigned int position, - const nic_address_t * address, bool set_av_bit) + const nic_address_t *address, bool set_av_bit) { uint8_t *mac0 = (uint8_t *) address->address; Index: uspace/drv/nic/ne2k/dp8390.c =================================================================== --- uspace/drv/nic/ne2k/dp8390.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/ne2k/dp8390.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -439,5 +439,5 @@ static nic_frame_t *ne2k_receive_frame(nic_t *nic_data, uint8_t page, - size_t length) + size_t length) { ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); @@ -451,6 +451,6 @@ if (last >= ne2k->stop_page) { - size_t left = (ne2k->stop_page - page) * DP_PAGE - - sizeof(recv_header_t); + size_t left = (ne2k->stop_page - page) * DP_PAGE - + sizeof(recv_header_t); ne2k_download(ne2k, frame->data, page * DP_PAGE + sizeof(recv_header_t), left); @@ -509,9 +509,9 @@ uint8_t next = header.next; - if ((length < ETH_MIN_PACK_SIZE) - || (length > ETH_MAX_PACK_SIZE_TAGGED)) { + if ((length < ETH_MIN_PACK_SIZE) || + (length > ETH_MAX_PACK_SIZE_TAGGED)) { next = current; - } else if ((header.next < ne2k->start_page) - || (header.next > ne2k->stop_page)) { + } else if ((header.next < ne2k->start_page) || + (header.next > ne2k->stop_page)) { next = current; } else if (header.status & RSR_FO) { @@ -525,5 +525,5 @@ if (frames != NULL) { nic_frame_t *frame = - ne2k_receive_frame(nic_data, boundary, length); + ne2k_receive_frame(nic_data, boundary, length); if (frame != NULL) { nic_frame_list_append(frames, frame); @@ -558,5 +558,5 @@ if (tsr & TSR_COL) { nic_report_collisions(nic_data, - pio_read_8(ne2k->port + DP_NCR) & 15); + pio_read_8(ne2k->port + DP_NCR) & 15); } Index: uspace/drv/nic/ne2k/ne2k.c =================================================================== --- uspace/drv/nic/ne2k/ne2k.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/ne2k/ne2k.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -162,5 +162,5 @@ return register_interrupt_handler(nic_get_ddf_dev(nic_data), - ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle); + ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle); } @@ -288,6 +288,6 @@ static errno_t ne2k_on_unicast_mode_change(nic_t *nic_data, - nic_unicast_mode_t new_mode, - const nic_address_t *address_list, size_t address_count) + nic_unicast_mode_t new_mode, + const nic_address_t *address_list, size_t address_count) { ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); @@ -315,6 +315,6 @@ static errno_t ne2k_on_multicast_mode_change(nic_t *nic_data, - nic_multicast_mode_t new_mode, - const nic_address_t *address_list, size_t address_count) + nic_multicast_mode_t new_mode, + const nic_address_t *address_list, size_t address_count) { ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); @@ -327,5 +327,5 @@ ne2k_set_accept_mcast(ne2k, true); ne2k_set_mcast_hash(ne2k, - nic_mcast_hash(address_list, address_count)); + nic_mcast_hash(address_list, address_count)); nic_report_hw_filtering(nic_data, -1, 0, -1); return EOK; @@ -341,5 +341,5 @@ static errno_t ne2k_on_broadcast_mode_change(nic_t *nic_data, - nic_broadcast_mode_t new_mode) + nic_broadcast_mode_t new_mode) { ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); @@ -367,8 +367,8 @@ nic_set_send_frame_handler(nic_data, ne2k_send); nic_set_state_change_handlers(nic_data, - ne2k_on_activating, NULL, ne2k_on_stopping); + ne2k_on_activating, NULL, ne2k_on_stopping); nic_set_filtering_change_handlers(nic_data, - ne2k_on_unicast_mode_change, ne2k_on_multicast_mode_change, - ne2k_on_broadcast_mode_change, NULL, NULL); + ne2k_on_unicast_mode_change, ne2k_on_multicast_mode_change, + ne2k_on_broadcast_mode_change, NULL, NULL); ne2k_t *ne2k = malloc(sizeof(ne2k_t)); Index: uspace/drv/nic/rtl8139/driver.c =================================================================== --- uspace/drv/nic/rtl8139/driver.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/rtl8139/driver.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -95,9 +95,9 @@ #ifndef RXBUF_SIZE_FLAGS /** Flags for receiver buffer - 16kB default */ - #define RXBUF_SIZE_FLAGS RTL8139_RXFLAGS_SIZE_16 +#define RXBUF_SIZE_FLAGS RTL8139_RXFLAGS_SIZE_16 #endif #if (RXBUF_SIZE_FLAGS > RTL8139_RXFLAGS_SIZE_64) || (RXBUF_SIZE_FLAGS < 0) - #error Bad receiver buffer flags size flags +#error Bad receiver buffer flags size flags #endif @@ -152,7 +152,7 @@ static void rtl8139_hw_update_rcr(rtl8139_t *rtl8139) { - uint32_t rcr = rtl8139->rcr_data.rcr_base | rtl8139->rcr_data.ucast_mask - | rtl8139->rcr_data.mcast_mask | rtl8139->rcr_data.bcast_mask - | rtl8139->rcr_data.defect_mask | + uint32_t rcr = rtl8139->rcr_data.rcr_base | rtl8139->rcr_data.ucast_mask | + rtl8139->rcr_data.mcast_mask | rtl8139->rcr_data.bcast_mask | + rtl8139->rcr_data.defect_mask | (RXBUF_SIZE_FLAGS << RCR_RBLEN_SHIFT); @@ -199,5 +199,5 @@ async_sess_t *pci_sess = - ddf_dev_parent_sess_get(nic_get_ddf_dev(rtl8139->nic_data)); + ddf_dev_parent_sess_get(nic_get_ddf_dev(rtl8139->nic_data)); if (bit_val) { @@ -243,6 +243,6 @@ assert(addr); - const uint32_t *val1 = (const uint32_t*)addr->address; - const uint16_t *val2 = (const uint16_t*)(addr->address + sizeof(uint32_t)); + const uint32_t *val1 = (const uint32_t *)addr->address; + const uint16_t *val2 = (const uint16_t *)(addr->address + sizeof(uint32_t)); rtl8139_regs_unlock(rtl8139->io_port); @@ -258,5 +258,5 @@ * @param bits_add The value to or */ -inline static void rtl8139_hw_reg_add_8(rtl8139_t * rtl8139, size_t reg_offset, +inline static void rtl8139_hw_reg_add_8(rtl8139_t *rtl8139, size_t reg_offset, uint8_t bits_add) { @@ -272,5 +272,5 @@ * @param bits_add The mask of bits to remove */ -inline static void rtl8139_hw_reg_rem_8(rtl8139_t * rtl8139, size_t reg_offset, +inline static void rtl8139_hw_reg_rem_8(rtl8139_t *rtl8139, size_t reg_offset, uint8_t bits_add) { @@ -288,7 +288,7 @@ nic_channel_mode_t duplex, nic_role_t); -static errno_t rtl8139_pause_get(ddf_fun_t*, nic_result_t*, nic_result_t*, +static errno_t rtl8139_pause_get(ddf_fun_t *, nic_result_t *, nic_result_t *, uint16_t *); -static errno_t rtl8139_pause_set(ddf_fun_t*, int, int, uint16_t); +static errno_t rtl8139_pause_set(ddf_fun_t *, int, int, uint16_t); static errno_t rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement); @@ -303,7 +303,7 @@ static errno_t rtl8139_wol_virtue_add(nic_t *nic_data, - const nic_wol_virtue_t *virtue); + const nic_wol_virtue_t *virtue); static void rtl8139_wol_virtue_rem(nic_t *nic_data, - const nic_wol_virtue_t *virtue); + const nic_wol_virtue_t *virtue); static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode, @@ -434,5 +434,5 @@ pio_write_8(io_base + CR, CR_RST); memory_barrier(); - while(pio_read_8(io_base + CR) & CR_RST) { + while (pio_read_8(io_base + CR) & CR_RST) { async_usleep(1); read_barrier(); @@ -481,5 +481,5 @@ { nic_frame_t *frame = nic_alloc_frame(nic_data, frame_size); - if (! frame) { + if (!frame) { ddf_msg(LVL_ERROR, "Can not allocate frame for received frame."); return NULL; @@ -560,5 +560,5 @@ while (!rtl8139_hw_buffer_empty(rtl8139)) { void *rx_ptr = rx_buffer + rx_offset % RxBUF_SIZE; - uint32_t frame_header = uint32_t_le2host( *((uint32_t*)rx_ptr) ); + uint32_t frame_header = uint32_t_le2host(*((uint32_t *)rx_ptr)); uint16_t size = frame_header >> 16; uint16_t frame_size = size - RTL8139_CRC_SIZE; @@ -580,5 +580,5 @@ } if (size < RTL8139_RUNT_MAX_SIZE && !(rcs & RSR_RUNT)) { - ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (%"PRIx16")", size); + ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (%" PRIx16 ")", size); goto rx_err; } @@ -680,6 +680,6 @@ while (tx_used != tx_next) { size_t desc_to_check = tx_used % TX_BUFF_COUNT; - void * tsd_to_check = rtl8139->io_port + TSD0 - + desc_to_check * sizeof(uint32_t); + void *tsd_to_check = rtl8139->io_port + TSD0 + + desc_to_check * sizeof(uint32_t); uint32_t tsd_value = pio_read_32(tsd_to_check); @@ -757,5 +757,5 @@ pio_write_32(rtl8139->io_port + TIMERINT, timer_val); pio_write_32(rtl8139->io_port + TCTR, 0x0); - ddf_msg(LVL_DEBUG, "rtl8139 timer: %"PRIu32"\treceive: %d", timer_val, receive); + ddf_msg(LVL_DEBUG, "rtl8139 timer: %" PRIu32 "\treceive: %d", timer_val, receive); return receive; } @@ -784,5 +784,5 @@ receive = rtl8139_poll_interrupt(nic_data); } - if (! receive) + if (!receive) return; } @@ -883,7 +883,7 @@ /* Write transmittion buffer addresses */ - for(i = 0; i < TX_BUFF_COUNT; ++i) { - uint32_t addr = PTR2U32(rtl8139->tx_buff_phys + i*TX_BUFF_SIZE); - pio_write_32(io_base + TSAD0 + 4*i, addr); + for (i = 0; i < TX_BUFF_COUNT; ++i) { + uint32_t addr = PTR2U32(rtl8139->tx_buff_phys + i * TX_BUFF_SIZE); + pio_write_32(io_base + TSAD0 + 4 * i, addr); } rtl8139->tx_next = 0; @@ -988,10 +988,10 @@ nic_set_send_frame_handler(nic_data, rtl8139_send_frame); nic_set_state_change_handlers(nic_data, - rtl8139_on_activated, NULL, rtl8139_on_stopped); + rtl8139_on_activated, NULL, rtl8139_on_stopped); nic_set_filtering_change_handlers(nic_data, - rtl8139_unicast_set, rtl8139_multicast_set, rtl8139_broadcast_set, - NULL, NULL); + rtl8139_unicast_set, rtl8139_multicast_set, rtl8139_broadcast_set, + NULL, NULL); nic_set_wol_virtue_change_handlers(nic_data, - rtl8139_wol_virtue_add, rtl8139_wol_virtue_rem); + rtl8139_wol_virtue_add, rtl8139_wol_virtue_rem); nic_set_poll_handlers(nic_data, rtl8139_poll_mode_change, rtl8139_poll); @@ -1347,5 +1347,5 @@ assert(addr); - nic_t *nic_data =nic_get_from_ddf_fun((fun)); + nic_t *nic_data = nic_get_from_ddf_fun((fun)); rtl8139_t *rtl8139 = nic_get_specific(nic_data); assert(rtl8139); @@ -1354,5 +1354,5 @@ errno_t rc = nic_report_address(nic_data, addr); - if ( rc != EOK) { + if (rc != EOK) { rtl8139_unlock_all(rtl8139); return rc; @@ -1817,6 +1817,6 @@ break; case NIC_UNICAST_LIST: - rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH - | RCR_ACCEPT_ALL_PHYS; + rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH | + RCR_ACCEPT_ALL_PHYS; if (mcast_mode == NIC_MULTICAST_PROMISC) @@ -1826,6 +1826,6 @@ break; case NIC_UNICAST_PROMISC: - rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH - | RCR_ACCEPT_ALL_PHYS; + rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH | + RCR_ACCEPT_ALL_PHYS; if (mcast_mode == NIC_MULTICAST_PROMISC) @@ -1981,5 +1981,5 @@ */ static errno_t rtl8139_wol_virtue_add(nic_t *nic_data, - const nic_wol_virtue_t *virtue) + const nic_wol_virtue_t *virtue) { assert(nic_data); @@ -1989,5 +1989,5 @@ assert(rtl8139); - switch(virtue->type) { + switch (virtue->type) { case NIC_WV_BROADCAST: rtl8139_hw_reg_add_8(rtl8139, CONFIG5, CONFIG5_BROADCAST_WAKEUP); @@ -2008,5 +2008,5 @@ return EINVAL; } - if(rtl8139->pm.active++ == 0) + if (rtl8139->pm.active++ == 0) rtl8139_hw_pmen_set(rtl8139, 1); return EOK; @@ -2019,5 +2019,5 @@ */ static void rtl8139_wol_virtue_rem(nic_t *nic_data, - const nic_wol_virtue_t *virtue) + const nic_wol_virtue_t *virtue) { assert(nic_data); @@ -2027,5 +2027,5 @@ assert(rtl8139); - switch(virtue->type) { + switch (virtue->type) { case NIC_WV_BROADCAST: rtl8139_hw_reg_rem_8(rtl8139, CONFIG5, CONFIG5_BROADCAST_WAKEUP); @@ -2070,5 +2070,5 @@ fibril_mutex_lock(&rtl8139->rx_lock); - switch(mode) { + switch (mode) { case NIC_POLL_IMMEDIATE: rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS; Index: uspace/drv/nic/rtl8169/driver.c =================================================================== --- uspace/drv/nic/rtl8169/driver.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/drv/nic/rtl8169/driver.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -313,8 +313,8 @@ nic_set_send_frame_handler(nic_data, rtl8169_send_frame); nic_set_state_change_handlers(nic_data, - rtl8169_on_activated, NULL, rtl8169_on_stopped); + rtl8169_on_activated, NULL, rtl8169_on_stopped); nic_set_filtering_change_handlers(nic_data, - rtl8169_unicast_set, rtl8169_multicast_set, rtl8169_broadcast_set, - NULL, NULL); + rtl8169_unicast_set, rtl8169_multicast_set, rtl8169_broadcast_set, + NULL, NULL); fibril_mutex_initialize(&rtl8169->rx_lock); @@ -550,6 +550,6 @@ uint8_t phystatus = pio_read_8(rtl8169->regs + PHYSTATUS); - *duplex = phystatus & PHYSTATUS_FDX - ? NIC_CM_FULL_DUPLEX : NIC_CM_HALF_DUPLEX; + *duplex = phystatus & PHYSTATUS_FDX ? + NIC_CM_FULL_DUPLEX : NIC_CM_HALF_DUPLEX; if (phystatus & PHYSTATUS_10M) @@ -575,5 +575,5 @@ return EINVAL; - if (duplex != NIC_CM_HALF_DUPLEX && duplex != NIC_CM_FULL_DUPLEX) + if (duplex != NIC_CM_HALF_DUPLEX && duplex != NIC_CM_FULL_DUPLEX) return EINVAL; @@ -939,5 +939,5 @@ pio_write_32(rtl8169->regs + RCR, rcr); - ddf_msg(LVL_DEBUG," new RCR value: 0x%08x", rcr); + ddf_msg(LVL_DEBUG, " new RCR value: 0x%08x", rcr); return EOK; @@ -1173,6 +1173,6 @@ uint32_t phyar; - phyar = PHYAR_RW_READ - | ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT); + phyar = PHYAR_RW_READ | + ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT); pio_write_32(rtl8169->regs + PHYAR, phyar); @@ -1190,7 +1190,7 @@ uint32_t phyar; - phyar = PHYAR_RW_WRITE - | ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT) - | (value & PHYAR_DATA_MASK); + phyar = PHYAR_RW_WRITE | + ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT) | + (value & PHYAR_DATA_MASK); pio_write_32(rtl8169->regs + PHYAR, phyar); @@ -1215,5 +1215,5 @@ return rc; nic_driver_implement( - &rtl8169_driver_ops, &rtl8169_dev_ops, &rtl8169_nic_iface); + &rtl8169_driver_ops, &rtl8169_dev_ops, &rtl8169_nic_iface); ddf_log_init(NAME); Index: uspace/lib/bithenge/src/print.c =================================================================== --- uspace/lib/bithenge/src/print.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/bithenge/src/print.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -101,6 +101,6 @@ newline(state); state->first = false; - bool add_quotes = state->type == BITHENGE_PRINT_JSON - && bithenge_node_type(key) != BITHENGE_NODE_STRING; + bool add_quotes = state->type == BITHENGE_PRINT_JSON && + bithenge_node_type(key) != BITHENGE_NODE_STRING; if (add_quotes) state_printf(state, "\""); @@ -225,5 +225,5 @@ errno_t bithenge_print_node(bithenge_print_type_t type, bithenge_node_t *tree) { - state_t state = {type, true, 0, NULL, 0}; + state_t state = { type, true, 0, NULL, 0 }; return print_node(&state, tree); } @@ -240,5 +240,5 @@ bithenge_print_type_t type, bithenge_node_t *tree) { - state_t state = {type, true, 0, *str, *size}; + state_t state = { type, true, 0, *str, *size }; errno_t rc = print_node(&state, tree); *str = state.buffer; Index: uspace/lib/bithenge/src/script.c =================================================================== --- uspace/lib/bithenge/src/script.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/bithenge/src/script.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -206,6 +206,6 @@ state->token = TOKEN_EOF; } else if (ch == '#') { - while (state->buffer[state->buffer_pos] != '\n' - && state->buffer[state->buffer_pos] != '\0') { + while (state->buffer[state->buffer_pos] != '\n' && + state->buffer[state->buffer_pos] != '\0') { state->buffer_pos++; fill_buffer(state); @@ -225,6 +225,6 @@ return; } else if (isalpha(ch)) { - while (isalnum(state->buffer[state->buffer_pos]) - || state->buffer[state->buffer_pos] == '_') + while (isalnum(state->buffer[state->buffer_pos]) || + state->buffer[state->buffer_pos] == '_') state->buffer_pos++; char *value = str_ndup(state->buffer + state->old_buffer_pos, @@ -401,5 +401,5 @@ const char *name) { - for (transform_list_t *e = state->transform_list; e; e = e->next) { + for (transform_list_t * e = state->transform_list; e; e = e->next) { if (!str_cmp(e->name, name)) { bithenge_transform_inc_ref(e->transform); @@ -774,5 +774,5 @@ expect(state, ','); params = state_realloc(state, params, - (num_params + 1)*sizeof(*params)); + (num_params + 1) * sizeof(*params)); if (state->error != EOK) break; @@ -784,6 +784,6 @@ /* TODO: show correct error position */ - if (state->error == EOK - && bithenge_transform_num_params(result) != num_params) + if (state->error == EOK && + bithenge_transform_num_params(result) != num_params) syntax_error(state, "incorrect number of parameters before"); @@ -1115,5 +1115,5 @@ num++; subxforms = state_realloc(state, subxforms, - (num + 1)*sizeof(*subxforms)); + (num + 1) * sizeof(*subxforms)); } @@ -1233,5 +1233,5 @@ state->parameter_names = state_realloc(state, state->parameter_names, - (state->num_params + 1)*sizeof(*state->parameter_names)); + (state->num_params + 1) * sizeof(*state->parameter_names)); if (state->error != EOK) break; Index: uspace/lib/c/arch/arm32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/tls.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/arch/arm32/include/libarch/tls.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -63,7 +63,7 @@ tls += sizeof(tcb_t) + ARM_TP_OFFSET; asm volatile ( - "mov r9, %0" - : - : "r" (tls) + "mov r9, %0" + : + : "r" (tls) ); } @@ -79,6 +79,6 @@ void *ret; asm volatile ( - "mov %0, r9" - : "=r"(ret) + "mov %0, r9" + : "=r" (ret) ); return (tcb_t *) (ret - ARM_TP_OFFSET - sizeof(tcb_t)); Index: uspace/lib/c/arch/ia32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/tls.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/arch/ia32/include/libarch/tls.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -51,5 +51,5 @@ } -static inline tcb_t * __tcb_get(void) +static inline tcb_t *__tcb_get(void) { void *retval; Index: uspace/lib/c/arch/ia64/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/elf_linux.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/arch/ia64/include/libarch/elf_linux.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -47,5 +47,6 @@ { /* TODO */ - (void) istate; (void) elf_regs; + (void) istate; + (void) elf_regs; } Index: uspace/lib/c/arch/sparc64/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/tls.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/arch/sparc64/include/libarch/tls.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -51,5 +51,5 @@ } -static inline tcb_t * __tcb_get(void) +static inline tcb_t *__tcb_get(void) { void *retval; Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/generic/async.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -943,6 +943,6 @@ link_t *tmp = timeout_list.head.next; while (tmp != &timeout_list.head) { - awaiter_t *cur - = list_get_instance(tmp, awaiter_t, to_event.link); + awaiter_t *cur = + list_get_instance(tmp, awaiter_t, to_event.link); if (tv_gteq(&cur->to_event.expires, &wd->to_event.expires)) @@ -1255,6 +1255,6 @@ */ futex_down(&async_futex); - if ((usecs) && (conn->wdata.to_event.occurred) - && (list_empty(&conn->msg_queue))) { + if ((usecs) && (conn->wdata.to_event.occurred) && + (list_empty(&conn->msg_queue))) { /* If we timed out -> exit */ futex_up(&async_futex); Index: uspace/lib/c/generic/double_to_str.c =================================================================== --- uspace/lib/c/generic/double_to_str.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/generic/double_to_str.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -56,5 +56,5 @@ static bool is_normalized(fp_num_t num) { - assert(8*sizeof(num.significand) == significand_width); + assert(8 * sizeof(num.significand) == significand_width); /* Normalized == most significant bit of the significand is set. */ @@ -147,5 +147,5 @@ /** Returns the interval [low, high] of numbers that convert to binary val. */ static void get_normalized_bounds(ieee_double_t val, fp_num_t *high, - fp_num_t *low, fp_num_t *val_dist) + fp_num_t *low, fp_num_t *val_dist) { /* @@ -181,5 +181,5 @@ val_dist->significand = - val_dist->significand << (val_dist->exponent - high->exponent); + val_dist->significand << (val_dist->exponent - high->exponent); val_dist->exponent = high->exponent; } @@ -198,5 +198,5 @@ */ static void calc_scaled_bounds(ieee_double_t val, fp_num_t *scaled_upper_bound, - fp_num_t *bounds_delta, fp_num_t *val_dist, int *scale) + fp_num_t *bounds_delta, fp_num_t *val_dist, int *scale) { fp_num_t upper_bound, lower_bound; @@ -251,5 +251,5 @@ /** Rounds the last digit of buf so that it is closest to the converted number.*/ static void round_last_digit(uint64_t rest, uint64_t w_dist, uint64_t delta, - uint64_t digit_val_diff, char *buf, int len) + uint64_t digit_val_diff, char *buf, int len) { /* @@ -277,6 +277,6 @@ bool next_in_val_rng = cur_greater_w && (rest + digit_val_diff < delta); /* Rounding down by one would bring buf closer to the processed number. */ - bool next_closer = next_in_val_rng - && (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest); + bool next_closer = next_in_val_rng && + (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest); /* Of the shortest strings pick the one that is closest to the actual @@ -291,6 +291,6 @@ cur_greater_w = rest < w_dist; next_in_val_rng = cur_greater_w && (rest + digit_val_diff < delta); - next_closer = next_in_val_rng - && (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest); + next_closer = next_in_val_rng && + (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest); } } @@ -326,5 +326,5 @@ */ static int gen_dec_digits(fp_num_t scaled_upper, fp_num_t delta, - fp_num_t val_dist, int scale, char *buf, size_t buf_size, int *dec_exponent) + fp_num_t val_dist, int scale, char *buf, size_t buf_size, int *dec_exponent) { /* @@ -411,5 +411,5 @@ /* Of the shortest representations choose the numerically closest. */ round_last_digit(remainder, val_dist.significand, delta.significand, - (uint64_t)div << (-one.exponent), buf, len); + (uint64_t)div << (-one.exponent), buf, len); return len; } @@ -457,5 +457,5 @@ /* Of the shortest representations choose the numerically closest one. */ round_last_digit(frac_part, val_dist.significand, delta.significand, - one.significand, buf, len); + one.significand, buf, len); return len; @@ -504,5 +504,5 @@ */ int double_to_short_str(ieee_double_t ieee_val, char *buf, size_t buf_size, - int *dec_exponent) + int *dec_exponent) { /* The whole computation assumes 64bit significand. */ @@ -524,8 +524,8 @@ calc_scaled_bounds(ieee_val, &scaled_upper_bound, - &delta, &val_dist, &scale); + &delta, &val_dist, &scale); int len = gen_dec_digits(scaled_upper_bound, delta, val_dist, scale, - buf, buf_size, dec_exponent); + buf, buf_size, dec_exponent); assert(len <= MAX_DOUBLE_STR_LEN); @@ -554,5 +554,5 @@ */ static int gen_fixed_dec_digits(fp_num_t w_scaled, int scale, int signif_d_cnt, - int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent) + int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent) { /* We'll produce at least one digit and a null terminator. */ @@ -608,5 +608,5 @@ int rem_signif_d_cnt = signif_d_cnt; int rem_frac_d_cnt = - (frac_d_cnt >= 0) ? (kappa - scale + frac_d_cnt) : INT_MAX; + (frac_d_cnt >= 0) ? (kappa - scale + frac_d_cnt) : INT_MAX; /* Produce decimal digits for the integral part of w_scaled. */ @@ -752,5 +752,5 @@ */ int double_to_fixed_str(ieee_double_t ieee_val, int signif_d_cnt, - int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent) + int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent) { /* The whole computation assumes 64bit significand. */ @@ -780,5 +780,5 @@ /* Produce decimal digits from the scaled number. */ int len = gen_fixed_dec_digits(w_scaled, scale, signif_d_cnt, frac_d_cnt, - buf, buf_size, dec_exponent); + buf, buf_size, dec_exponent); assert(len <= MAX_DOUBLE_STR_LEN); Index: uspace/lib/c/generic/elf/elf_mod.c =================================================================== --- uspace/lib/c/generic/elf/elf_mod.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/generic/elf/elf_mod.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -273,5 +273,5 @@ // FIXME: This actually won't work, because the text segment is // not loaded yet. - #if 0 +#if 0 if (elf->info->interp[entry->p_filesz - 1] != '\0') { DPRINTF("Unterminated ELF interp string.\n"); @@ -279,5 +279,5 @@ } DPRINTF("interpreter: \"%s\"\n", elf->info->interp); - #endif +#endif break; case PT_DYNAMIC: @@ -286,5 +286,5 @@ (void *)((uint8_t *)entry->p_vaddr + elf->bias); DPRINTF("dynamic section found at %p\n", - (void *)elf->info->dynamic); + (void *)elf->info->dynamic); break; case 0x70000000: @@ -334,5 +334,5 @@ DPRINTF("Load segment at addr %p, size 0x%zx\n", (void *) seg_addr, - entry->p_memsz); + entry->p_memsz); if (entry->p_align > 1) { @@ -394,5 +394,6 @@ * need to set the right access mode and ensure SMC coherence. */ - if ((elf->flags & ELDF_RW) != 0) return EE_OK; + if ((elf->flags & ELDF_RW) != 0) + return EE_OK; // printf("set area flags to %d\n", flags); Index: uspace/lib/c/generic/getopt.c =================================================================== --- uspace/lib/c/generic/getopt.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/generic/getopt.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -132,5 +132,5 @@ for (i = 0; i < ncycle; i++) { - cstart = panonopt_end+i; + cstart = panonopt_end + i; pos = cstart; for (j = 0; j < cyclelen; j++) { @@ -181,6 +181,5 @@ optind, nargv); optind -= nonopt_end - nonopt_start; - } - else if (nonopt_start != -1) { + } else if (nonopt_start != -1) { /* * If we skipped non-options, set optind @@ -192,6 +191,6 @@ return -1; } - if ((*(place = nargv[optind]) != '-') - || (place[1] == '\0')) { /* found non-option */ + if ((*(place = nargv[optind]) != '-') || + (place[1] == '\0')) { /* found non-option */ place = EMSG; if (IN_ORDER) { @@ -289,5 +288,5 @@ * Parse argc/argv argument vector. */ -int getopt(int nargc, char * const *nargv, const char *options) +int getopt(int nargc, char *const *nargv, const char *options) { int retval; @@ -305,5 +304,5 @@ if (nonopt_end != -1) { permute_args(nonopt_start, nonopt_end, optind, - (char **)nargv); + (char **)nargv); optind -= nonopt_end - nonopt_start; } @@ -318,5 +317,5 @@ * Parse argc/argv argument vector. */ -int getopt_long(int nargc, char * const *nargv, const char *options, +int getopt_long(int nargc, char *const *nargv, const char *options, const struct option *long_options, int *idx) { @@ -389,14 +388,14 @@ if (PRINT_ERROR) printf(ambig, (int)current_argv_len, - current_argv); + current_argv); optopt = 0; return BADCH; } if (match != -1) { /* option found */ - if (long_options[match].has_arg == no_argument - && has_equal) { + if (long_options[match].has_arg == no_argument && + has_equal) { if (PRINT_ERROR) printf(noarg, (int)current_argv_len, - current_argv); + current_argv); /* * XXX: GNU sets optopt to val regardless of @@ -422,6 +421,6 @@ } } - if ((long_options[match].has_arg == required_argument) - && (optarg == NULL)) { + if ((long_options[match].has_arg == required_argument) && + (optarg == NULL)) { /* * Missing argument; leading ':' Index: uspace/lib/c/generic/io/io.c =================================================================== --- uspace/lib/c/generic/io/io.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/generic/io/io.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -388,7 +388,7 @@ int rc = _fclose_nofree(stream); - if ((stream != &stdin_null) - && (stream != &stdout_kio) - && (stream != &stderr_kio)) + if ((stream != &stdin_null) && + (stream != &stdout_kio) && + (stream != &stderr_kio)) free(stream); Index: uspace/lib/c/generic/io/output.c =================================================================== --- uspace/lib/c/generic/io/output.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/generic/io/output.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -89,6 +89,6 @@ ipc_call_t answer; aid_t req = async_send_0(exch, OUTPUT_FRONTBUF_CREATE, &answer); - errno_t rc = async_share_out_start(exch, frontbuf, AS_AREA_READ - | AS_AREA_WRITE | AS_AREA_CACHEABLE); + errno_t rc = async_share_out_start(exch, frontbuf, AS_AREA_READ | + AS_AREA_WRITE | AS_AREA_CACHEABLE); async_exchange_end(exch); Index: uspace/lib/c/generic/tls.c =================================================================== --- uspace/lib/c/generic/tls.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/generic/tls.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -154,5 +154,5 @@ * @return Pointer to TCB structure. */ -tcb_t * tls_alloc_variant_2(void **data, size_t size) +tcb_t *tls_alloc_variant_2(void **data, size_t size) { tcb_t *tcb; Index: uspace/lib/c/include/adt/hash.h =================================================================== --- uspace/lib/c/include/adt/hash.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/include/adt/hash.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -106,6 +106,6 @@ * http://burtleburtle.net/bob/c/lookup3.c */ - seed ^= hash + 0x9e3779b9 - + ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5))); + seed ^= hash + 0x9e3779b9 + + ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5))); return seed; } Index: uspace/lib/c/include/io/charfield.h =================================================================== --- uspace/lib/c/include/io/charfield.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/include/io/charfield.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -91,10 +91,10 @@ return (a1.val.style == a2.val.style); case CHAR_ATTR_INDEX: - return (a1.val.index.bgcolor == a2.val.index.bgcolor) - && (a1.val.index.fgcolor == a2.val.index.fgcolor) - && (a1.val.index.attr == a2.val.index.attr); + return (a1.val.index.bgcolor == a2.val.index.bgcolor) && + (a1.val.index.fgcolor == a2.val.index.fgcolor) && + (a1.val.index.attr == a2.val.index.attr); case CHAR_ATTR_RGB: - return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor) - && (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor); + return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor) && + (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor); } Index: uspace/lib/c/test/io/table.c =================================================================== --- uspace/lib/c/test/io/table.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/test/io/table.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -34,5 +34,6 @@ PCUT_TEST_SUITE(table); -PCUT_TEST(smoke) { +PCUT_TEST(smoke) +{ table_t *table; errno_t rc; Index: uspace/lib/c/test/odict.c =================================================================== --- uspace/lib/c/test/odict.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/test/odict.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -226,5 +226,6 @@ PCUT_ASSERT_EQUALS(true, odict_empty(&odict)); - v = 1; ep = NULL; + v = 1; + ep = NULL; for (i = 0; i < test_seq_len; i++) { e = calloc(1, sizeof(test_entry_t)); Index: uspace/lib/c/test/sprintf.c =================================================================== --- uspace/lib/c/test/sprintf.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/test/sprintf.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -48,5 +48,6 @@ static char buffer[BUFFER_SIZE]; -PCUT_TEST_BEFORE { +PCUT_TEST_BEFORE +{ memset(buffer, 0, BUFFER_SIZE); } Index: uspace/lib/c/test/str.c =================================================================== --- uspace/lib/c/test/str.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/c/test/str.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -44,10 +44,12 @@ static char buffer[BUFFER_SIZE]; -PCUT_TEST_BEFORE { +PCUT_TEST_BEFORE +{ memset(buffer, 0, BUFFER_SIZE); } -PCUT_TEST(rtrim) { +PCUT_TEST(rtrim) +{ SET_BUFFER("foobar"); str_rtrim(buffer, ' '); @@ -67,5 +69,6 @@ } -PCUT_TEST(ltrim) { +PCUT_TEST(ltrim) +{ SET_BUFFER("foobar"); str_ltrim(buffer, ' '); Index: uspace/lib/compress/inflate.c =================================================================== --- uspace/lib/compress/inflate.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/compress/inflate.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -418,6 +418,6 @@ * */ -static errno_t inflate_codes(inflate_state_t *state, huffman_t* len_code, - huffman_t* dist_code) +static errno_t inflate_codes(inflate_state_t *state, huffman_t *len_code, + huffman_t *dist_code) { uint16_t symbol; @@ -460,6 +460,6 @@ while (len > 0) { /* Copy len bytes from distance bytes back */ - state->dest[state->destcnt] - = state->dest[state->destcnt - dist]; + state->dest[state->destcnt] = + state->dest[state->destcnt - dist]; state->destcnt++; len--; @@ -527,6 +527,6 @@ CHECK_OVERRUN(*state); - if ((nlen > MAX_LITLEN) || (ndist > MAX_DIST) - || (ncode > MAX_ORDER)) + if ((nlen > MAX_LITLEN) || (ndist > MAX_DIST) || + (ncode > MAX_ORDER)) return EINVAL; Index: uspace/lib/draw/drawctx.c =================================================================== --- uspace/lib/draw/drawctx.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/draw/drawctx.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -155,6 +155,6 @@ for (sysarg_t _x = x; _x < x + width; ++_x) { if (context->shall_clip) { - clipped = _x < context->clip_x && _x >= context->clip_width - && _y < context->clip_y && _y >= context->clip_height; + clipped = _x < context->clip_x && _x >= context->clip_width && + _y < context->clip_y && _y >= context->clip_height; } Index: uspace/lib/draw/font/bitmap_backend.c =================================================================== --- uspace/lib/draw/font/bitmap_backend.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/draw/font/bitmap_backend.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -244,6 +244,5 @@ data->scale = false; data->scale_ratio = 1.0; - } - else { + } else { data->scale = true; data->scale_ratio = ((double) points) / ((double) line_height); Index: uspace/lib/draw/font/pcf.c =================================================================== --- uspace/lib/draw/font/pcf.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/draw/font/pcf.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -113,6 +113,5 @@ if (format & PCF_FORMAT_MSBYTE_FIRST) { return uint32_t_be2host(val); - } - else { + } else { return uint32_t_le2host(val); } @@ -123,6 +122,5 @@ if (format & PCF_FORMAT_MSBYTE_FIRST) { return uint16_t_be2host(val); - } - else { + } else { return uint16_t_le2host(val); } @@ -201,5 +199,5 @@ pcf_compressed_metrics_t compressed_metrics; records_read = fread(&compressed_metrics, - sizeof(pcf_compressed_metrics_t), 1,data->file); + sizeof(pcf_compressed_metrics_t), 1, data->file); if (records_read != 1) return EINVAL; @@ -216,6 +214,5 @@ compressed2int(compressed_metrics.character_descent); metrics->character_attributes = 0; - } - else { + } else { offset = table->offset + 2 * sizeof(uint32_t) + glyph_id * sizeof(pcf_default_metrics_t); @@ -227,5 +224,5 @@ pcf_default_metrics_t uncompressed_metrics; records_read = fread(&uncompressed_metrics, - sizeof(pcf_default_metrics_t), 1,data->file); + sizeof(pcf_default_metrics_t), 1, data->file); if (records_read != 1) return EINVAL; @@ -281,6 +278,6 @@ offset = data->bitmap_table.offset + (2 * sizeof(uint32_t)) + - (data->glyph_count * sizeof(uint32_t)) + (4 * sizeof(uint32_t)) - + bitmap_offset; + (data->glyph_count * sizeof(uint32_t)) + (4 * sizeof(uint32_t)) + + bitmap_offset; if (fseek(data->file, offset, SEEK_SET) < 0) @@ -314,10 +311,9 @@ size_t column_offset1 = word_index * word_size_bytes; size_t byte_index_within_word = - (x % (word_size_bytes * 8)) / 8; + (x % (word_size_bytes * 8)) / 8; size_t column_offset2; if (data->bitmap_table.format & PCF_FORMAT_MSBYTE_FIRST) { column_offset2 = (word_size_bytes - 1) - byte_index_within_word; - } - else { + } else { column_offset2 = byte_index_within_word; } @@ -326,6 +322,5 @@ if (data->bitmap_table.format & PCF_FORMAT_MSBIT_FIRST) { set = (b >> (7 - (x % 8))) & 1; - } - else { + } else { set = (b >> (x % 8)) & 1; } @@ -433,18 +428,15 @@ found_bitmap_table = true; data->bitmap_table = toc_entry; - } - else if (toc_entry.type == PCF_TABLE_METRICS) { + } else if (toc_entry.type == PCF_TABLE_METRICS) { if (found_metrics_table) return EINVAL; found_metrics_table = true; data->metrics_table = toc_entry; - } - else if (toc_entry.type == PCF_TABLE_ENCODINGS) { + } else if (toc_entry.type == PCF_TABLE_ENCODINGS) { if (found_encodings_table) return EINVAL; found_encodings_table = true; data->encodings_table = toc_entry; - } - else if (toc_entry.type == PCF_TABLE_ACCELERATORS) { + } else if (toc_entry.type == PCF_TABLE_ACCELERATORS) { if (found_accelerators_table) return EINVAL; @@ -516,6 +508,5 @@ data->metrics_table.format); metrics_count = metrics_count_16; - } - else { + } else { records_read = fread(&metrics_count, sizeof(uint32_t), 1, data->file); Index: uspace/lib/drv/generic/remote_ahci.c =================================================================== --- uspace/lib/drv/generic/remote_ahci.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/drv/generic/remote_ahci.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -59,5 +59,5 @@ ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) >> 32)) -async_sess_t* ahci_get_sess(devman_handle_t funh, char **name) +async_sess_t *ahci_get_sess(devman_handle_t funh, char **name) { // FIXME: Use a better way than substring match @@ -116,6 +116,6 @@ if (rc == EOK) { - *blocks = (((uint64_t) blocks_hi) << 32) - | (((uint64_t) blocks_lo) & 0xffffffff); + *blocks = (((uint64_t) blocks_hi) << 32) | + (((uint64_t) blocks_lo) & 0xffffffff); } @@ -163,5 +163,5 @@ errno_t ahci_write_blocks(async_sess_t *sess, uint64_t blocknum, size_t count, - void* buf) + void *buf) { async_exch_t *exch = async_exchange_begin(sess); @@ -222,5 +222,5 @@ (size_t) DEV_IPC_GET_ARG1(*call); - char* sata_dev_name = malloc(sata_dev_name_length); + char *sata_dev_name = malloc(sata_dev_name_length); if (sata_dev_name == NULL) { async_answer_0(chandle, ENOMEM); Index: uspace/lib/drv/generic/remote_audio_pcm.c =================================================================== --- uspace/lib/drv/generic/remote_audio_pcm.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/drv/generic/remote_audio_pcm.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -198,5 +198,5 @@ /* Make the other side fail * as it waits for read request */ - async_data_read_start(exch, (void*)-1, 0); + async_data_read_start(exch, (void *)-1, 0); async_exchange_end(exch); return ENOMEM; @@ -288,8 +288,8 @@ /* All OK or something has changed. Verify that it was not one of the * params we care about */ - if ((ret == EOK || ret == ELIMIT) - && (!channels || *channels == channels_arg) - && (!rate || *rate == rate_arg) - && (!format || *format == format_arg)) + if ((ret == EOK || ret == ELIMIT) && + (!channels || *channels == channels_arg) && + (!rate || *rate == rate_arg) && + (!format || *format == format_arg)) return EOK; if (channels) @@ -781,6 +781,6 @@ ddf_msg(LVL_DEBUG2, "Calling share finalize."); - ret = async_share_in_finalize(share_id, buffer, AS_AREA_WRITE - | AS_AREA_READ); + ret = async_share_in_finalize(share_id, buffer, AS_AREA_WRITE | + AS_AREA_READ); if (ret != EOK) { ddf_msg(LVL_DEBUG, "Failed to share buffer."); @@ -812,7 +812,7 @@ const pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call) & UINT16_MAX; - const errno_t ret = pcm_iface->start_playback - ? pcm_iface->start_playback(fun, frames, channels, rate, format) - : ENOTSUP; + const errno_t ret = pcm_iface->start_playback ? + pcm_iface->start_playback(fun, frames, channels, rate, format) : + ENOTSUP; async_answer_0(chandle, ret); } @@ -839,7 +839,7 @@ const pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call) & UINT16_MAX; - const errno_t ret = pcm_iface->start_capture - ? pcm_iface->start_capture(fun, frames, channels, rate, format) - : ENOTSUP; + const errno_t ret = pcm_iface->start_capture ? + pcm_iface->start_capture(fun, frames, channels, rate, format) : + ENOTSUP; async_answer_0(chandle, ret); } Index: uspace/lib/drv/generic/remote_ieee80211.c =================================================================== --- uspace/lib/drv/generic/remote_ieee80211.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/drv/generic/remote_ieee80211.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -78,5 +78,5 @@ async_wait_for(aid, &res); - if(res != EOK) + if (res != EOK) return (errno_t) res; Index: uspace/lib/drv/generic/remote_nic.c =================================================================== --- uspace/lib/drv/generic/remote_nic.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/drv/generic/remote_nic.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -339,5 +339,5 @@ */ errno_t nic_get_operation_mode(async_sess_t *dev_sess, int *speed, - nic_channel_mode_t *duplex, nic_role_t *role) + nic_channel_mode_t *duplex, nic_role_t *role) { sysarg_t _speed; @@ -872,5 +872,5 @@ if (address_count) rc = async_data_write_start(exch, address_list, - address_count * sizeof(nic_address_t)); + address_count * sizeof(nic_address_t)); else rc = EOK; Index: uspace/lib/drv/generic/remote_usbdiag.c =================================================================== --- uspace/lib/drv/generic/remote_usbdiag.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/drv/generic/remote_usbdiag.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -169,6 +169,6 @@ usbdiag_test_results_t results; - const errno_t ret = !diag_iface->test_in ? ENOTSUP - : diag_iface->test_in(fun, ¶ms, &results); + const errno_t ret = !diag_iface->test_in ? ENOTSUP : + diag_iface->test_in(fun, ¶ms, &results); if (ret != EOK) { @@ -223,6 +223,6 @@ usbdiag_test_results_t results; - const errno_t ret = !diag_iface->test_out ? ENOTSUP - : diag_iface->test_out(fun, ¶ms, &results); + const errno_t ret = !diag_iface->test_out ? ENOTSUP : + diag_iface->test_out(fun, ¶ms, &results); if (ret != EOK) { Index: uspace/lib/drv/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/drv/generic/remote_usbhc.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -159,5 +159,5 @@ aid_t opening_request = async_send_1(exch, - DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_UNREGISTER_ENDPOINT, NULL); + DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_UNREGISTER_ENDPOINT, NULL); if (opening_request == 0) { @@ -207,6 +207,6 @@ /* Share the data, if any. */ if (req->size > 0) { - unsigned flags = (req->dir == USB_DIRECTION_IN) - ? AS_AREA_WRITE : AS_AREA_READ; + unsigned flags = (req->dir == USB_DIRECTION_IN) ? + AS_AREA_WRITE : AS_AREA_READ; const errno_t ret = async_share_out_start(exch, req->buffer.virt, flags); @@ -321,6 +321,6 @@ size_t len; - if (!async_data_write_receive(&data_chandle, &len) - || len != sizeof(ep_desc)) { + if (!async_data_write_receive(&data_chandle, &len) || + len != sizeof(ep_desc)) { async_answer_0(chandle, EINVAL); return; @@ -333,6 +333,6 @@ async_answer_0(chandle, rc); - if (!async_data_read_receive(&data_chandle, &len) - || len != sizeof(pipe_desc)) { + if (!async_data_read_receive(&data_chandle, &len) || + len != sizeof(pipe_desc)) { return; } @@ -358,6 +358,6 @@ size_t len; - if (!async_data_write_receive(&data_chandle, &len) - || len != sizeof(pipe_desc)) { + if (!async_data_write_receive(&data_chandle, &len) || + len != sizeof(pipe_desc)) { async_answer_0(chandle, EINVAL); return; @@ -406,6 +406,6 @@ const size_t required_size = trans->request.offset + trans->request.size; const unsigned required_flags = - (trans->request.dir == USB_DIRECTION_IN) - ? AS_AREA_WRITE : AS_AREA_READ; + (trans->request.dir == USB_DIRECTION_IN) ? + AS_AREA_WRITE : AS_AREA_READ; errno_t err; @@ -468,6 +468,6 @@ cap_call_handle_t data_chandle; size_t len; - if (!async_data_write_receive(&data_chandle, &len) - || len != sizeof(trans->request)) { + if (!async_data_write_receive(&data_chandle, &len) || + len != sizeof(trans->request)) { async_answer_0(data_chandle, EINVAL); goto err; @@ -475,5 +475,5 @@ if ((err = async_data_write_finalize(data_chandle, - &trans->request, sizeof(trans->request)))) + &trans->request, sizeof(trans->request)))) goto err; Index: uspace/lib/ext4/src/directory.c =================================================================== --- uspace/lib/ext4/src/directory.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/ext4/src/directory.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -314,5 +314,5 @@ /* Ensure the name length is not too large */ if (ext4_directory_entry_ll_get_name_length( - it->inode_ref->fs->superblock, entry) > length-8) + it->inode_ref->fs->superblock, entry) > length - 8) return EIO; Index: uspace/lib/ext4/src/directory_index.c =================================================================== --- uspace/lib/ext4/src/directory_index.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/ext4/src/directory_index.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -834,5 +834,5 @@ /* Check hash collision */ uint32_t continued = 0; - if (new_hash == sort_array[mid-1].hash) + if (new_hash == sort_array[mid - 1].hash) continued = 1; @@ -898,5 +898,5 @@ */ static errno_t ext4_directory_dx_split_index(ext4_inode_ref_t *inode_ref, - ext4_directory_dx_block_t *dx_blocks, ext4_directory_dx_block_t *dx_block) + ext4_directory_dx_block_t *dx_blocks, ext4_directory_dx_block_t *dx_block) { ext4_directory_dx_entry_t *entries; Index: uspace/lib/ext4/src/extent.c =================================================================== --- uspace/lib/ext4/src/extent.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/ext4/src/extent.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -420,5 +420,5 @@ /* Search extent in the leaf block */ - ext4_extent_t* extent = NULL; + ext4_extent_t *extent = NULL; ext4_extent_binsearch(header, &extent, iblock); @@ -565,9 +565,9 @@ */ static errno_t ext4_extent_release_branch(ext4_inode_ref_t *inode_ref, - ext4_extent_index_t *index) + ext4_extent_index_t *index) { uint32_t fblock = ext4_extent_index_get_leaf(index); - block_t* block; + block_t *block; errno_t rc = block_get(&block, inode_ref->fs->device, fblock, BLOCK_FLAGS_NONE); if (rc != EOK) Index: uspace/lib/ext4/src/ops.c =================================================================== --- uspace/lib/ext4/src/ops.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/ext4/src/ops.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -71,5 +71,5 @@ static errno_t ext4_node_get(fs_node_t **, service_id_t, fs_index_t); static errno_t ext4_node_open(fs_node_t *); - errno_t ext4_node_put(fs_node_t *); +errno_t ext4_node_put(fs_node_t *); static errno_t ext4_create_node(fs_node_t **, service_id_t, int); static errno_t ext4_destroy_node(fs_node_t *); @@ -118,6 +118,6 @@ ext4_node_t *enode = hash_table_get_inst(item, ext4_node_t, link); - return key->service_id == enode->instance->service_id - && key->index == enode->inode_ref->index; + return key->service_id == enode->instance->service_id && + key->index == enode->inode_ref->index; } @@ -1141,5 +1141,5 @@ break; -skip: + skip: rc = ext4_directory_iterator_next(&it); if (rc != EOK) { Index: uspace/lib/ieee80211/src/ieee80211.c =================================================================== --- uspace/lib/ieee80211/src/ieee80211.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/ieee80211/src/ieee80211.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -1557,7 +1557,7 @@ memcpy(crypt_data + ETH_ADDR, max_sequence(dest_addr, src_addr, ETH_ADDR), ETH_ADDR); - memcpy(crypt_data + 2*ETH_ADDR, + memcpy(crypt_data + 2 * ETH_ADDR, min_sequence(anonce, snonce, 32), 32); - memcpy(crypt_data + 2*ETH_ADDR + 32, + memcpy(crypt_data + 2 * ETH_ADDR + 32, max_sequence(anonce, snonce, 32), 32); ieee80211_prf(pmk, crypt_data, ptk, ptk_key_length); @@ -1664,5 +1664,5 @@ nic_frame_t *frame = nic_alloc_frame(nic, frame_size); - if(frame == NULL) + if (frame == NULL) return ENOMEM; Index: uspace/lib/ieee80211/src/ieee80211_impl.c =================================================================== --- uspace/lib/ieee80211/src/ieee80211_impl.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/ieee80211/src/ieee80211_impl.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -204,5 +204,5 @@ hmac(key, PBKDF2_KEY_LENGTH, work_arr, data_size, temp, HASH_SHA1); - memcpy(result + i*HASH_SHA1, temp, HASH_SHA1); + memcpy(result + i * HASH_SHA1, temp, HASH_SHA1); } Index: uspace/lib/label/test/label.c =================================================================== --- uspace/lib/label/test/label.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/label/test/label.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -140,5 +140,6 @@ } -PCUT_TEST(open_empty) { +PCUT_TEST(open_empty) +{ label_t *label; label_bd_t lbd; @@ -175,5 +176,6 @@ } -PCUT_TEST(create_destroy_mbr) { +PCUT_TEST(create_destroy_mbr) +{ label_t *label; label_bd_t lbd; @@ -236,5 +238,6 @@ } -PCUT_TEST(create_destroy_gpt) { +PCUT_TEST(create_destroy_gpt) +{ label_t *label; label_bd_t lbd; @@ -295,5 +298,6 @@ } -PCUT_TEST(mbr_primary_part) { +PCUT_TEST(mbr_primary_part) +{ label_t *label; label_bd_t lbd; @@ -384,5 +388,6 @@ } -PCUT_TEST(mbr_logical_part) { +PCUT_TEST(mbr_logical_part) +{ label_t *label; label_bd_t lbd; @@ -522,5 +527,6 @@ -PCUT_TEST(gpt_part) { +PCUT_TEST(gpt_part) +{ label_t *label; label_bd_t lbd; Index: uspace/lib/nic/src/nic_addr_db.c =================================================================== --- uspace/lib/nic/src/nic_addr_db.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/nic/src/nic_addr_db.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -66,5 +66,5 @@ static bool nic_addr_key_equal(void *key_arg, const ht_link_t *item) { - addr_key_t *key = (addr_key_t*)key_arg; + addr_key_t *key = (addr_key_t *)key_arg; nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link); @@ -85,5 +85,5 @@ static size_t nic_addr_key_hash(void *k) { - addr_key_t *key = (addr_key_t*)k; + addr_key_t *key = (addr_key_t *)k; return addr_hash(key->len, key->addr); } @@ -263,8 +263,8 @@ */ void nic_addr_db_foreach(const nic_addr_db_t *db, - void (*func)(const uint8_t *, void *), void *arg) + void (*func)(const uint8_t *, void *), void *arg) { nic_addr_db_fe_arg_t hs = { .func = func, .arg = arg }; - hash_table_apply((hash_table_t*)&db->set, nic_addr_db_fe_helper, &hs); + hash_table_apply((hash_table_t *)&db->set, nic_addr_db_fe_helper, &hs); } Index: uspace/lib/nic/src/nic_impl.c =================================================================== --- uspace/lib/nic/src/nic_impl.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/nic/src/nic_impl.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -118,8 +118,8 @@ /* Notify upper layers that we are reseting the MAC */ errno_t rc = nic_ev_addr_changed(nic_data->client_session, - &nic_data->default_mac); + &nic_data->default_mac); nic_data->poll_mode = nic_data->default_poll_mode; memcpy(&nic_data->poll_period, &nic_data->default_poll_period, - sizeof (struct timeval)); + sizeof(struct timeval)); if (rc != EOK) { /* We have already ran the on stopped handler, even if we @@ -136,5 +136,5 @@ /* Reinsert device's default MAC */ nic_rxc_set_addr(&nic_data->rx_control, NULL, - &nic_data->default_mac); + &nic_data->default_mac); fibril_rwlock_write_unlock(&nic_data->rxc_lock); memcpy(&nic_data->mac, &nic_data->default_mac, sizeof (nic_address_t)); @@ -258,10 +258,10 @@ */ errno_t nic_unicast_get_mode_impl(ddf_fun_t *fun, nic_unicast_mode_t *mode, - size_t max_count, nic_address_t *addr_list, size_t *addr_count) + size_t max_count, nic_address_t *addr_list, size_t *addr_count) { nic_t *nic_data = nic_get_from_ddf_fun(fun); fibril_rwlock_read_lock(&nic_data->rxc_lock); nic_rxc_unicast_get_mode(&nic_data->rx_control, mode, max_count, - addr_list, addr_count); + addr_list, addr_count); fibril_rwlock_read_unlock(&nic_data->rxc_lock); return EOK; @@ -282,8 +282,8 @@ */ errno_t nic_unicast_set_mode_impl(ddf_fun_t *fun, - nic_unicast_mode_t mode, const nic_address_t *addr_list, size_t addr_count) -{ - assert((addr_count == 0 && addr_list == NULL) - || (addr_count != 0 && addr_list != NULL)); + nic_unicast_mode_t mode, const nic_address_t *addr_list, size_t addr_count) +{ + assert((addr_count == 0 && addr_list == NULL) || + (addr_count != 0 && addr_list != NULL)); size_t i; for (i = 0; i < addr_count; ++i) { @@ -297,9 +297,9 @@ if (nic_data->on_unicast_mode_change) { rc = nic_data->on_unicast_mode_change(nic_data, - mode, addr_list, addr_count); + mode, addr_list, addr_count); } if (rc == EOK) { rc = nic_rxc_unicast_set_mode(&nic_data->rx_control, mode, - addr_list, addr_count); + addr_list, addr_count); /* After changing the mode the addr db gets cleared, therefore we have * to reinsert also the physical address of NIC. @@ -325,10 +325,10 @@ */ errno_t nic_multicast_get_mode_impl(ddf_fun_t *fun, nic_multicast_mode_t *mode, - size_t max_count, nic_address_t *addr_list, size_t *addr_count) + size_t max_count, nic_address_t *addr_list, size_t *addr_count) { nic_t *nic_data = nic_get_from_ddf_fun(fun); fibril_rwlock_read_lock(&nic_data->rxc_lock); nic_rxc_multicast_get_mode(&nic_data->rx_control, mode, max_count, - addr_list, addr_count); + addr_list, addr_count); fibril_rwlock_read_unlock(&nic_data->rxc_lock); return EOK; @@ -349,8 +349,8 @@ */ errno_t nic_multicast_set_mode_impl(ddf_fun_t *fun, nic_multicast_mode_t mode, - const nic_address_t *addr_list, size_t addr_count) -{ - assert((addr_count == 0 && addr_list == NULL) - || (addr_count != 0 && addr_list != NULL)); + const nic_address_t *addr_list, size_t addr_count) +{ + assert((addr_count == 0 && addr_list == NULL) || + (addr_count != 0 && addr_list != NULL)); size_t i; for (i = 0; i < addr_count; ++i) { @@ -367,5 +367,5 @@ if (rc == EOK) { rc = nic_rxc_multicast_set_mode(&nic_data->rx_control, mode, - addr_list, addr_count); + addr_list, addr_count); } fibril_rwlock_write_unlock(&nic_data->rxc_lock); @@ -428,10 +428,10 @@ */ errno_t nic_blocked_sources_get_impl(ddf_fun_t *fun, - size_t max_count, nic_address_t *addr_list, size_t *addr_count) + size_t max_count, nic_address_t *addr_list, size_t *addr_count) { nic_t *nic_data = nic_get_from_ddf_fun(fun); fibril_rwlock_read_lock(&nic_data->rxc_lock); nic_rxc_blocked_sources_get(&nic_data->rx_control, - max_count, addr_list, addr_count); + max_count, addr_list, addr_count); fibril_rwlock_read_unlock(&nic_data->rxc_lock); return EOK; @@ -451,5 +451,5 @@ */ errno_t nic_blocked_sources_set_impl(ddf_fun_t *fun, - const nic_address_t *addr_list, size_t addr_count) + const nic_address_t *addr_list, size_t addr_count) { nic_t *nic_data = nic_get_from_ddf_fun(fun); @@ -459,5 +459,5 @@ } errno_t rc = nic_rxc_blocked_sources_set(&nic_data->rx_control, - addr_list, addr_count); + addr_list, addr_count); fibril_rwlock_write_unlock(&nic_data->rxc_lock); return rc; @@ -519,9 +519,9 @@ */ errno_t nic_wol_virtue_add_impl(ddf_fun_t *fun, nic_wv_type_t type, - const void *data, size_t length, nic_wv_id_t *new_id) -{ - nic_t *nic_data = nic_get_from_ddf_fun(fun); - if (nic_data->on_wol_virtue_add == NULL - || nic_data->on_wol_virtue_remove == NULL) { + const void *data, size_t length, nic_wv_id_t *new_id) +{ + nic_t *nic_data = nic_get_from_ddf_fun(fun); + if (nic_data->on_wol_virtue_add == NULL || + nic_data->on_wol_virtue_remove == NULL) { return ENOTSUP; } @@ -555,5 +555,5 @@ } if ((int) nic_data->wol_virtues.lists_sizes[type] >= - nic_data->wol_virtues.caps_max[type]) { + nic_data->wol_virtues.caps_max[type]) { fibril_rwlock_write_unlock(&nic_data->wv_lock); return ELIMIT; @@ -596,11 +596,11 @@ { nic_t *nic_data = nic_get_from_ddf_fun(fun); - if (nic_data->on_wol_virtue_add == NULL - || nic_data->on_wol_virtue_remove == NULL) { + if (nic_data->on_wol_virtue_add == NULL || + nic_data->on_wol_virtue_remove == NULL) { return ENOTSUP; } fibril_rwlock_write_lock(&nic_data->wv_lock); nic_wol_virtue_t *virtue = - nic_wol_virtues_remove(&nic_data->wol_virtues, id); + nic_wol_virtues_remove(&nic_data->wol_virtues, id); if (virtue == NULL) { fibril_rwlock_write_unlock(&nic_data->wv_lock); @@ -630,10 +630,10 @@ */ errno_t nic_wol_virtue_probe_impl(ddf_fun_t *fun, nic_wv_id_t id, - nic_wv_type_t *type, size_t max_length, void *data, size_t *length) + nic_wv_type_t *type, size_t max_length, void *data, size_t *length) { nic_t *nic_data = nic_get_from_ddf_fun(fun); fibril_rwlock_read_lock(&nic_data->wv_lock); const nic_wol_virtue_t *virtue = - nic_wol_virtues_find(&nic_data->wol_virtues, id); + nic_wol_virtues_find(&nic_data->wol_virtues, id); if (virtue == NULL) { *type = NIC_WV_NONE; @@ -668,10 +668,10 @@ */ errno_t nic_wol_virtue_list_impl(ddf_fun_t *fun, nic_wv_type_t type, - size_t max_count, nic_wv_id_t *id_list, size_t *id_count) + size_t max_count, nic_wv_id_t *id_list, size_t *id_count) { nic_t *nic_data = nic_get_from_ddf_fun(fun); fibril_rwlock_read_lock(&nic_data->wv_lock); errno_t rc = nic_wol_virtues_list(&nic_data->wol_virtues, type, - max_count, id_list, id_count); + max_count, id_list, id_count); fibril_rwlock_read_unlock(&nic_data->wv_lock); return rc; @@ -692,6 +692,6 @@ nic_t *nic_data = nic_get_from_ddf_fun(fun); fibril_rwlock_read_lock(&nic_data->wv_lock); - *count = nic_data->wol_virtues.caps_max[type] - - (int) nic_data->wol_virtues.lists_sizes[type]; + *count = nic_data->wol_virtues.caps_max[type] - + (int) nic_data->wol_virtues.lists_sizes[type]; fibril_rwlock_read_unlock(&nic_data->wv_lock); return EOK; @@ -711,10 +711,10 @@ */ errno_t nic_poll_get_mode_impl(ddf_fun_t *fun, - nic_poll_mode_t *mode, struct timeval *period) + nic_poll_mode_t *mode, struct timeval *period) { nic_t *nic_data = nic_get_from_ddf_fun(fun); fibril_rwlock_read_lock(&nic_data->main_lock); *mode = nic_data->poll_mode; - memcpy(period, &nic_data->poll_period, sizeof (struct timeval)); + memcpy(period, &nic_data->poll_period, sizeof(struct timeval)); fibril_rwlock_read_unlock(&nic_data->main_lock); return EOK; @@ -734,5 +734,5 @@ */ errno_t nic_poll_set_mode_impl(ddf_fun_t *fun, - nic_poll_mode_t mode, const struct timeval *period) + nic_poll_mode_t mode, const struct timeval *period) { nic_t *nic_data = nic_get_from_ddf_fun(fun); @@ -757,5 +757,5 @@ assert(rc == EOK || rc == ENOTSUP || rc == EINVAL); if (rc == ENOTSUP && (nic_data->on_poll_request != NULL) && - (mode == NIC_POLL_PERIODIC || mode == NIC_POLL_SOFTWARE_PERIODIC) ) { + (mode == NIC_POLL_PERIODIC || mode == NIC_POLL_SOFTWARE_PERIODIC)) { rc = nic_data->on_poll_mode_change(nic_data, NIC_POLL_ON_DEMAND, NULL); Index: uspace/lib/nic/src/nic_rx_control.c =================================================================== --- uspace/lib/nic/src/nic_rx_control.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/nic/src/nic_rx_control.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -145,5 +145,5 @@ */ void nic_rxc_unicast_get_mode(const nic_rxc_t *rxc, nic_unicast_mode_t *mode, - size_t max_count, nic_address_t *address_list, size_t *address_count) + size_t max_count, nic_address_t *address_list, size_t *address_count) { *mode = rxc->unicast_mode; @@ -174,5 +174,5 @@ */ errno_t nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode, - const nic_address_t *address_list, size_t address_count) + const nic_address_t *address_list, size_t address_count) { if (mode == NIC_UNICAST_LIST && address_list == NULL) { @@ -189,5 +189,5 @@ for (i = 0; i < address_count; ++i) { errno_t rc = nic_addr_db_insert(&rxc->unicast_addrs, - (const uint8_t *) &address_list[i].address); + (const uint8_t *) &address_list[i].address); if (rc == ENOMEM) { return ENOMEM; @@ -208,6 +208,6 @@ */ void nic_rxc_multicast_get_mode(const nic_rxc_t *rxc, - nic_multicast_mode_t *mode, size_t max_count, nic_address_t *address_list, - size_t *address_count) + nic_multicast_mode_t *mode, size_t max_count, nic_address_t *address_list, + size_t *address_count) { *mode = rxc->multicast_mode; @@ -238,5 +238,5 @@ */ errno_t nic_rxc_multicast_set_mode(nic_rxc_t *rxc, nic_multicast_mode_t mode, - const nic_address_t *address_list, size_t address_count) + const nic_address_t *address_list, size_t address_count) { if (mode == NIC_MULTICAST_LIST && address_list == NULL) @@ -252,5 +252,5 @@ for (i = 0; i < address_count; ++i) { errno_t rc = nic_addr_db_insert(&rxc->multicast_addrs, - (const uint8_t *)&address_list[i].address); + (const uint8_t *)&address_list[i].address); if (rc == ENOMEM) { return ENOMEM; @@ -295,5 +295,5 @@ */ void nic_rxc_blocked_sources_get(const nic_rxc_t *rxc, - size_t max_count, nic_address_t *address_list, size_t *address_count) + size_t max_count, nic_address_t *address_list, size_t *address_count) { nic_rxc_add_addr_t hs = { @@ -321,8 +321,8 @@ */ errno_t nic_rxc_blocked_sources_set(nic_rxc_t *rxc, - const nic_address_t *address_list, size_t address_count) -{ - assert((address_count == 0 && address_list == NULL) - || (address_count != 0 && address_list != NULL)); + const nic_address_t *address_list, size_t address_count) +{ + assert((address_count == 0 && address_list == NULL) || + (address_count != 0 && address_list != NULL)); nic_addr_db_clear(&rxc->blocked_sources); @@ -331,5 +331,5 @@ for (i = 0; i < address_count; ++i) { errno_t rc = nic_addr_db_insert(&rxc->blocked_sources, - (const uint8_t *) &address_list[i].address); + (const uint8_t *) &address_list[i].address); if (rc == ENOMEM) { return ENOMEM; @@ -395,5 +395,5 @@ */ bool nic_rxc_check(const nic_rxc_t *rxc, const void *data, size_t size, - nic_frame_type_t *frame_type) + nic_frame_type_t *frame_type) { assert(frame_type != NULL); @@ -449,7 +449,7 @@ if (!rxc->vlan_exact && rxc->vlan_mask != NULL) { vlan_header_t *vlan_header = (vlan_header_t *) - ((uint8_t *) data + 2 * ETH_ADDR); + ((uint8_t *) data + 2 * ETH_ADDR); if (vlan_header->tpid_upper == VLAN_TPID_UPPER && - vlan_header->tpid_lower == VLAN_TPID_LOWER) { + vlan_header->tpid_lower == VLAN_TPID_LOWER) { int index = ((int) (vlan_header->vid_upper & 0xF) << 5) | (vlan_header->vid_lower >> 3); @@ -476,5 +476,5 @@ */ void nic_rxc_hw_filtering(nic_rxc_t *rxc, - int unicast_exact, int multicast_exact, int vlan_exact) + int unicast_exact, int multicast_exact, int vlan_exact) { if (unicast_exact >= 0) @@ -505,21 +505,21 @@ { uint32_t crc; - int carry, i, j; - uint8_t b; - - crc = 0xffffffff; - for (i = 0; i < 6; i++) { - b = addr[i]; - for (j = 0; j < 8; j++) { - carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01); - crc <<= 1; - b >>= 1; - if (carry) - crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry); - } - } - - uint64_t one64 = 1; - return one64 << (crc >> 26); + int carry, i, j; + uint8_t b; + + crc = 0xffffffff; + for (i = 0; i < 6; i++) { + b = addr[i]; + for (j = 0; j < 8; j++) { + carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01); + crc <<= 1; + b >>= 1; + if (carry) + crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry); + } + } + + uint64_t one64 = 1; + return one64 << (crc >> 26); } @@ -571,5 +571,5 @@ break; case NIC_MULTICAST_PROMISC: - return ~ (uint64_t) 0; + return ~(uint64_t) 0; } uint64_t hash; Index: uspace/lib/pcut/src/os/helenos.c =================================================================== --- uspace/lib/pcut/src/os/helenos.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/src/os/helenos.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -46,27 +46,33 @@ /* String functions. */ -int pcut_str_equals(const char *a, const char *b) { +int pcut_str_equals(const char *a, const char *b) +{ return str_cmp(a, b) == 0; } -int pcut_str_start_equals(const char *a, const char *b, int len) { +int pcut_str_start_equals(const char *a, const char *b, int len) +{ return str_lcmp(a, b, len) == 0; } -int pcut_str_size(const char *s) { +int pcut_str_size(const char *s) +{ return str_size(s); } -int pcut_str_to_int(const char *s) { +int pcut_str_to_int(const char *s) +{ int result = strtol(s, NULL, 10); return result; } -char *pcut_str_find_char(const char *haystack, const char needle) { +char *pcut_str_find_char(const char *haystack, const char needle) +{ return str_chr(haystack, needle); } -void pcut_str_error(errno_t error, char *buffer, int size) { +void pcut_str_error(errno_t error, char *buffer, int size) +{ const char *str = str_error(error); if (str == NULL) { @@ -101,5 +107,6 @@ * @param test Test that is about to be run. */ -static void before_test_start(pcut_item_t *test) { +static void before_test_start(pcut_item_t *test) +{ pcut_report_test_start(test); @@ -109,10 +116,10 @@ /** Mutex guard for forced_termination_cv. */ -static fibril_mutex_t forced_termination_mutex - = FIBRIL_MUTEX_INITIALIZER(forced_termination_mutex); +static fibril_mutex_t forced_termination_mutex = + FIBRIL_MUTEX_INITIALIZER(forced_termination_mutex); /** Condition-variable for checking whether test timed-out. */ -static fibril_condvar_t forced_termination_cv - = FIBRIL_CONDVAR_INITIALIZER(forced_termination_cv); +static fibril_condvar_t forced_termination_cv = + FIBRIL_CONDVAR_INITIALIZER(forced_termination_cv); /** Spawned task id. */ @@ -130,5 +137,6 @@ * @return EOK Always. */ -static errno_t test_timeout_handler_fibril(void *arg) { +static errno_t test_timeout_handler_fibril(void *arg) +{ pcut_item_t *test = arg; int timeout_sec = pcut_get_test_timeout(test); @@ -140,5 +148,5 @@ } errno_t rc = fibril_condvar_wait_timeout(&forced_termination_cv, - &forced_termination_mutex, timeout_us); + &forced_termination_mutex, timeout_us); if (rc == ETIMEOUT) { task_kill(test_task_id); @@ -154,5 +162,6 @@ * @param test Test to be run. */ -int pcut_run_test_forking(const char *self_path, pcut_item_t *test) { +int pcut_run_test_forking(const char *self_path, pcut_item_t *test) +{ before_test_start(test); @@ -226,5 +235,6 @@ } -void pcut_hook_before_test(pcut_item_t *test) { +void pcut_hook_before_test(pcut_item_t *test) +{ PCUT_UNUSED(test); Index: uspace/lib/pcut/tests/abort.c =================================================================== --- uspace/lib/pcut/tests/abort.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/abort.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -32,5 +32,6 @@ PCUT_INIT; -PCUT_TEST(access_null_pointer) { +PCUT_TEST(access_null_pointer) +{ abort(); } Index: uspace/lib/pcut/tests/asserts.c =================================================================== --- uspace/lib/pcut/tests/asserts.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/asserts.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -32,41 +32,50 @@ PCUT_INIT; -PCUT_TEST(int_equals) { +PCUT_TEST(int_equals) +{ PCUT_ASSERT_INT_EQUALS(1, 1); PCUT_ASSERT_INT_EQUALS(1, 0); } -PCUT_TEST(double_equals) { +PCUT_TEST(double_equals) +{ PCUT_ASSERT_DOUBLE_EQUALS(1., 1., 0.001); PCUT_ASSERT_DOUBLE_EQUALS(1., 0.5, 0.4); } -PCUT_TEST(str_equals) { +PCUT_TEST(str_equals) +{ PCUT_ASSERT_STR_EQUALS("xyz", "xyz"); PCUT_ASSERT_STR_EQUALS("abc", "xyz"); } -PCUT_TEST(str_equals_or_null_base) { +PCUT_TEST(str_equals_or_null_base) +{ PCUT_ASSERT_STR_EQUALS_OR_NULL("xyz", "xyz"); } -PCUT_TEST(str_equals_or_null_different) { +PCUT_TEST(str_equals_or_null_different) +{ PCUT_ASSERT_STR_EQUALS_OR_NULL("abc", "xyz"); } -PCUT_TEST(str_equals_or_null_one_null) { +PCUT_TEST(str_equals_or_null_one_null) +{ PCUT_ASSERT_STR_EQUALS_OR_NULL(NULL, "xyz"); } -PCUT_TEST(str_equals_or_null_both) { +PCUT_TEST(str_equals_or_null_both) +{ PCUT_ASSERT_STR_EQUALS_OR_NULL(NULL, NULL); } -PCUT_TEST(assert_true) { +PCUT_TEST(assert_true) +{ PCUT_ASSERT_TRUE(42); PCUT_ASSERT_TRUE(0); } -PCUT_TEST(assert_false) { +PCUT_TEST(assert_false) +{ PCUT_ASSERT_FALSE(0); PCUT_ASSERT_FALSE(42); Index: uspace/lib/pcut/tests/beforeafter.c =================================================================== --- uspace/lib/pcut/tests/beforeafter.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/beforeafter.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -49,15 +49,18 @@ PCUT_TEST_SUITE(suite_with_setup_and_teardown); -PCUT_TEST_BEFORE { +PCUT_TEST_BEFORE +{ buffer = malloc(BUFFER_SIZE); PCUT_ASSERT_NOT_NULL(buffer); } -PCUT_TEST_AFTER { +PCUT_TEST_AFTER +{ free(buffer); buffer = NULL; } -PCUT_TEST(test_with_setup_and_teardown) { +PCUT_TEST(test_with_setup_and_teardown) +{ snprintf(buffer, BUFFER_SIZE - 1, "%d-%s", 56, "abcd"); PCUT_ASSERT_STR_EQUALS("56-abcd", buffer); @@ -66,5 +69,6 @@ PCUT_TEST_SUITE(another_without_setup); -PCUT_TEST(test_without_any_setup_or_teardown) { +PCUT_TEST(test_without_any_setup_or_teardown) +{ PCUT_ASSERT_NULL(buffer); } Index: uspace/lib/pcut/tests/errno.c =================================================================== --- uspace/lib/pcut/tests/errno.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/errno.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -37,5 +37,6 @@ PCUT_INIT; -PCUT_TEST(errno_value) { +PCUT_TEST(errno_value) +{ errno_t value = EOK; PCUT_ASSERT_ERRNO_VAL(EOK, value); @@ -47,5 +48,6 @@ } -PCUT_TEST(errno_variable) { +PCUT_TEST(errno_variable) +{ errno = ENOENT; PCUT_ASSERT_ERRNO(ENOENT); Index: uspace/lib/pcut/tests/inithook.c =================================================================== --- uspace/lib/pcut/tests/inithook.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/inithook.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -34,24 +34,26 @@ static int init_counter = 0; -static void init_hook(void) { +static void init_hook(void) +{ init_counter++; } -PCUT_TEST_BEFORE { +PCUT_TEST_BEFORE +{ PCUT_ASSERT_INT_EQUALS(1, init_counter); init_counter++; } -PCUT_TEST(check_init_counter) { +PCUT_TEST(check_init_counter) +{ PCUT_ASSERT_INT_EQUALS(2, init_counter); } -PCUT_TEST(check_init_counter_2) { +PCUT_TEST(check_init_counter_2) +{ PCUT_ASSERT_INT_EQUALS(2, init_counter); } -PCUT_CUSTOM_MAIN( - PCUT_MAIN_SET_INIT_HOOK(init_hook) -); +PCUT_CUSTOM_MAIN(PCUT_MAIN_SET_INIT_HOOK(init_hook)); Index: uspace/lib/pcut/tests/manytests.c =================================================================== --- uspace/lib/pcut/tests/manytests.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/manytests.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -36,84 +36,244 @@ PCUT_INIT; -PCUT_TEST(my_test_001) { } -PCUT_TEST(my_test_002) { } -PCUT_TEST(my_test_003) { } -PCUT_TEST(my_test_004) { } -PCUT_TEST(my_test_005) { } -PCUT_TEST(my_test_006) { } -PCUT_TEST(my_test_007) { } -PCUT_TEST(my_test_008) { } -PCUT_TEST(my_test_009) { } -PCUT_TEST(my_test_010) { } -PCUT_TEST(my_test_011) { } -PCUT_TEST(my_test_012) { } -PCUT_TEST(my_test_013) { } -PCUT_TEST(my_test_014) { } -PCUT_TEST(my_test_015) { } -PCUT_TEST(my_test_016) { } -PCUT_TEST(my_test_017) { } -PCUT_TEST(my_test_018) { } -PCUT_TEST(my_test_019) { } -PCUT_TEST(my_test_020) { } -PCUT_TEST(my_test_021) { } -PCUT_TEST(my_test_022) { } -PCUT_TEST(my_test_023) { } -PCUT_TEST(my_test_024) { } -PCUT_TEST(my_test_025) { } -PCUT_TEST(my_test_026) { } -PCUT_TEST(my_test_027) { } -PCUT_TEST(my_test_028) { } -PCUT_TEST(my_test_029) { } -PCUT_TEST(my_test_030) { } -PCUT_TEST(my_test_031) { } -PCUT_TEST(my_test_032) { } -PCUT_TEST(my_test_033) { } -PCUT_TEST(my_test_034) { } -PCUT_TEST(my_test_035) { } -PCUT_TEST(my_test_036) { } -PCUT_TEST(my_test_037) { } -PCUT_TEST(my_test_038) { } -PCUT_TEST(my_test_039) { } -PCUT_TEST(my_test_040) { } -PCUT_TEST(my_test_041) { } -PCUT_TEST(my_test_042) { } -PCUT_TEST(my_test_043) { } -PCUT_TEST(my_test_044) { } -PCUT_TEST(my_test_045) { } -PCUT_TEST(my_test_046) { } -PCUT_TEST(my_test_047) { } -PCUT_TEST(my_test_048) { } -PCUT_TEST(my_test_049) { } -PCUT_TEST(my_test_050) { } -PCUT_TEST(my_test_051) { } -PCUT_TEST(my_test_052) { } -PCUT_TEST(my_test_053) { } -PCUT_TEST(my_test_054) { } -PCUT_TEST(my_test_055) { } -PCUT_TEST(my_test_056) { } -PCUT_TEST(my_test_057) { } -PCUT_TEST(my_test_058) { } -PCUT_TEST(my_test_059) { } -PCUT_TEST(my_test_060) { } -PCUT_TEST(my_test_061) { } -PCUT_TEST(my_test_062) { } -PCUT_TEST(my_test_063) { } -PCUT_TEST(my_test_064) { } -PCUT_TEST(my_test_065) { } -PCUT_TEST(my_test_066) { } -PCUT_TEST(my_test_067) { } -PCUT_TEST(my_test_068) { } -PCUT_TEST(my_test_069) { } -PCUT_TEST(my_test_070) { } -PCUT_TEST(my_test_071) { } -PCUT_TEST(my_test_072) { } -PCUT_TEST(my_test_073) { } -PCUT_TEST(my_test_074) { } -PCUT_TEST(my_test_075) { } -PCUT_TEST(my_test_076) { } -PCUT_TEST(my_test_077) { } -PCUT_TEST(my_test_078) { } -PCUT_TEST(my_test_079) { } -PCUT_TEST(my_test_080) { } +PCUT_TEST(my_test_001) +{ +} +PCUT_TEST(my_test_002) +{ +} +PCUT_TEST(my_test_003) +{ +} +PCUT_TEST(my_test_004) +{ +} +PCUT_TEST(my_test_005) +{ +} +PCUT_TEST(my_test_006) +{ +} +PCUT_TEST(my_test_007) +{ +} +PCUT_TEST(my_test_008) +{ +} +PCUT_TEST(my_test_009) +{ +} +PCUT_TEST(my_test_010) +{ +} +PCUT_TEST(my_test_011) +{ +} +PCUT_TEST(my_test_012) +{ +} +PCUT_TEST(my_test_013) +{ +} +PCUT_TEST(my_test_014) +{ +} +PCUT_TEST(my_test_015) +{ +} +PCUT_TEST(my_test_016) +{ +} +PCUT_TEST(my_test_017) +{ +} +PCUT_TEST(my_test_018) +{ +} +PCUT_TEST(my_test_019) +{ +} +PCUT_TEST(my_test_020) +{ +} +PCUT_TEST(my_test_021) +{ +} +PCUT_TEST(my_test_022) +{ +} +PCUT_TEST(my_test_023) +{ +} +PCUT_TEST(my_test_024) +{ +} +PCUT_TEST(my_test_025) +{ +} +PCUT_TEST(my_test_026) +{ +} +PCUT_TEST(my_test_027) +{ +} +PCUT_TEST(my_test_028) +{ +} +PCUT_TEST(my_test_029) +{ +} +PCUT_TEST(my_test_030) +{ +} +PCUT_TEST(my_test_031) +{ +} +PCUT_TEST(my_test_032) +{ +} +PCUT_TEST(my_test_033) +{ +} +PCUT_TEST(my_test_034) +{ +} +PCUT_TEST(my_test_035) +{ +} +PCUT_TEST(my_test_036) +{ +} +PCUT_TEST(my_test_037) +{ +} +PCUT_TEST(my_test_038) +{ +} +PCUT_TEST(my_test_039) +{ +} +PCUT_TEST(my_test_040) +{ +} +PCUT_TEST(my_test_041) +{ +} +PCUT_TEST(my_test_042) +{ +} +PCUT_TEST(my_test_043) +{ +} +PCUT_TEST(my_test_044) +{ +} +PCUT_TEST(my_test_045) +{ +} +PCUT_TEST(my_test_046) +{ +} +PCUT_TEST(my_test_047) +{ +} +PCUT_TEST(my_test_048) +{ +} +PCUT_TEST(my_test_049) +{ +} +PCUT_TEST(my_test_050) +{ +} +PCUT_TEST(my_test_051) +{ +} +PCUT_TEST(my_test_052) +{ +} +PCUT_TEST(my_test_053) +{ +} +PCUT_TEST(my_test_054) +{ +} +PCUT_TEST(my_test_055) +{ +} +PCUT_TEST(my_test_056) +{ +} +PCUT_TEST(my_test_057) +{ +} +PCUT_TEST(my_test_058) +{ +} +PCUT_TEST(my_test_059) +{ +} +PCUT_TEST(my_test_060) +{ +} +PCUT_TEST(my_test_061) +{ +} +PCUT_TEST(my_test_062) +{ +} +PCUT_TEST(my_test_063) +{ +} +PCUT_TEST(my_test_064) +{ +} +PCUT_TEST(my_test_065) +{ +} +PCUT_TEST(my_test_066) +{ +} +PCUT_TEST(my_test_067) +{ +} +PCUT_TEST(my_test_068) +{ +} +PCUT_TEST(my_test_069) +{ +} +PCUT_TEST(my_test_070) +{ +} +PCUT_TEST(my_test_071) +{ +} +PCUT_TEST(my_test_072) +{ +} +PCUT_TEST(my_test_073) +{ +} +PCUT_TEST(my_test_074) +{ +} +PCUT_TEST(my_test_075) +{ +} +PCUT_TEST(my_test_076) +{ +} +PCUT_TEST(my_test_077) +{ +} +PCUT_TEST(my_test_078) +{ +} +PCUT_TEST(my_test_079) +{ +} +PCUT_TEST(my_test_080) +{ +} Index: uspace/lib/pcut/tests/preinithook.c =================================================================== --- uspace/lib/pcut/tests/preinithook.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/preinithook.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -34,9 +34,11 @@ static int init_counter = 1; -static void init_hook(void) { +static void init_hook(void) +{ init_counter++; } -static void pre_init_hook(int *argc, char **argv[]) { +static void pre_init_hook(int *argc, char **argv[]) +{ (void) argc; (void) argv; @@ -44,21 +46,22 @@ } -PCUT_TEST_BEFORE { +PCUT_TEST_BEFORE +{ PCUT_ASSERT_INT_EQUALS(4, init_counter); init_counter++; } -PCUT_TEST(check_init_counter) { +PCUT_TEST(check_init_counter) +{ PCUT_ASSERT_INT_EQUALS(5, init_counter); } -PCUT_TEST(check_init_counter_2) { +PCUT_TEST(check_init_counter_2) +{ PCUT_ASSERT_INT_EQUALS(5, init_counter); } -PCUT_CUSTOM_MAIN( - PCUT_MAIN_SET_INIT_HOOK(init_hook), - PCUT_MAIN_SET_PREINIT_HOOK(pre_init_hook) -); +PCUT_CUSTOM_MAIN(PCUT_MAIN_SET_INIT_HOOK(init_hook), + PCUT_MAIN_SET_PREINIT_HOOK(pre_init_hook)); Index: uspace/lib/pcut/tests/printing.c =================================================================== --- uspace/lib/pcut/tests/printing.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/printing.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -33,13 +33,16 @@ PCUT_INIT; -PCUT_TEST(print_to_stdout) { +PCUT_TEST(print_to_stdout) +{ printf("Printed from a test to stdout!\n"); } -PCUT_TEST(print_to_stderr) { +PCUT_TEST(print_to_stderr) +{ fprintf(stderr, "Printed from a test to stderr!\n"); } -PCUT_TEST(print_to_stdout_and_fail) { +PCUT_TEST(print_to_stdout_and_fail) +{ printf("Printed from a test to stdout!\n"); PCUT_ASSERT_NOT_NULL(0); Index: uspace/lib/pcut/tests/simple.c =================================================================== --- uspace/lib/pcut/tests/simple.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/simple.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -32,14 +32,17 @@ PCUT_INIT; -PCUT_TEST(zero_exponent) { +PCUT_TEST(zero_exponent) +{ PCUT_ASSERT_INT_EQUALS(1, intpow(2, 0)); } -PCUT_TEST(one_exponent) { +PCUT_TEST(one_exponent) +{ PCUT_ASSERT_INT_EQUALS(2, intpow(2, 1)); PCUT_ASSERT_INT_EQUALS(39, intpow(39, 1)); } -PCUT_TEST(same_strings) { +PCUT_TEST(same_strings) +{ const char *p = "xyz"; PCUT_ASSERT_STR_EQUALS("xyz", p); Index: uspace/lib/pcut/tests/skip.c =================================================================== --- uspace/lib/pcut/tests/skip.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/skip.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -32,13 +32,16 @@ PCUT_INIT; -PCUT_TEST(normal_test) { +PCUT_TEST(normal_test) +{ PCUT_ASSERT_INT_EQUALS(1, 1); } -PCUT_TEST(skipped, PCUT_TEST_SKIP) { +PCUT_TEST(skipped, PCUT_TEST_SKIP) +{ PCUT_ASSERT_STR_EQUALS("skip", "not skipped"); } -PCUT_TEST(again_normal_test) { +PCUT_TEST(again_normal_test) +{ PCUT_ASSERT_INT_EQUALS(1, 1); } Index: uspace/lib/pcut/tests/suite1.c =================================================================== --- uspace/lib/pcut/tests/suite1.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/suite1.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -34,9 +34,11 @@ PCUT_TEST_SUITE(intpow); -PCUT_TEST(zero_exponent) { +PCUT_TEST(zero_exponent) +{ PCUT_ASSERT_INT_EQUALS(1, intpow(2, 0)); } -PCUT_TEST(one_exponent) { +PCUT_TEST(one_exponent) +{ PCUT_ASSERT_INT_EQUALS(2, intpow(2, 1)); PCUT_ASSERT_INT_EQUALS(39, intpow(39, 1)); Index: uspace/lib/pcut/tests/suite2.c =================================================================== --- uspace/lib/pcut/tests/suite2.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/suite2.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -34,5 +34,6 @@ PCUT_TEST_SUITE(intmin); -PCUT_TEST(test_min) { +PCUT_TEST(test_min) +{ PCUT_ASSERT_INT_EQUALS(5, intmin(5, 654)); PCUT_ASSERT_INT_EQUALS(5, intmin(654, 5)); @@ -41,5 +42,6 @@ } -PCUT_TEST(test_same_numbers) { +PCUT_TEST(test_same_numbers) +{ PCUT_ASSERT_INT_EQUALS(5, intmin(5, 5)); PCUT_ASSERT_INT_EQUALS(719, intmin(719, 719)); Index: uspace/lib/pcut/tests/suites.c =================================================================== --- uspace/lib/pcut/tests/suites.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/suites.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -34,9 +34,11 @@ PCUT_TEST_SUITE(intpow); -PCUT_TEST(zero_exponent) { +PCUT_TEST(zero_exponent) +{ PCUT_ASSERT_INT_EQUALS(1, intpow(2, 0)); } -PCUT_TEST(one_exponent) { +PCUT_TEST(one_exponent) +{ PCUT_ASSERT_INT_EQUALS(2, intpow(2, 1)); PCUT_ASSERT_INT_EQUALS(39, intpow(39, 1)); @@ -45,5 +47,6 @@ PCUT_TEST_SUITE(intmin); -PCUT_TEST(test_min) { +PCUT_TEST(test_min) +{ PCUT_ASSERT_INT_EQUALS(5, intmin(5, 654)); PCUT_ASSERT_INT_EQUALS(5, intmin(654, 5)); Index: uspace/lib/pcut/tests/teardown.c =================================================================== --- uspace/lib/pcut/tests/teardown.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/teardown.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -37,12 +37,15 @@ PCUT_TEST_SUITE(with_teardown); -PCUT_TEST_AFTER { +PCUT_TEST_AFTER +{ printf("This is teardown-function.\n"); } -PCUT_TEST(empty) { +PCUT_TEST(empty) +{ } -PCUT_TEST(failing) { +PCUT_TEST(failing) +{ PCUT_ASSERT_INT_EQUALS(10, intmin(1, 2)); } @@ -52,18 +55,22 @@ PCUT_TEST_SUITE(with_failing_teardown); -PCUT_TEST_AFTER { +PCUT_TEST_AFTER +{ printf("This is failing teardown-function.\n"); PCUT_ASSERT_INT_EQUALS(42, intmin(10, 20)); } -PCUT_TEST(empty2) { +PCUT_TEST(empty2) +{ } -PCUT_TEST(printing2) { +PCUT_TEST(printing2) +{ printf("Printed before test failure.\n"); PCUT_ASSERT_INT_EQUALS(0, intmin(-17, -19)); } -PCUT_TEST(failing2) { +PCUT_TEST(failing2) +{ PCUT_ASSERT_INT_EQUALS(12, intmin(3, 5)); } Index: uspace/lib/pcut/tests/teardownaborts.c =================================================================== --- uspace/lib/pcut/tests/teardownaborts.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/teardownaborts.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -33,9 +33,11 @@ PCUT_INIT; -PCUT_TEST_AFTER { +PCUT_TEST_AFTER +{ abort(); } -PCUT_TEST(print_and_fail) { +PCUT_TEST(print_and_fail) +{ printf("Tear-down will cause null pointer access...\n"); PCUT_ASSERT_NOT_NULL(NULL); Index: uspace/lib/pcut/tests/testlist.c =================================================================== --- uspace/lib/pcut/tests/testlist.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/testlist.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -38,5 +38,6 @@ }; -static void pre_init_hook(int *argc, char **argv[]) { +static void pre_init_hook(int *argc, char **argv[]) +{ argv_patched[0] = (*argv)[0]; *argc = 2; @@ -44,11 +45,10 @@ } -PCUT_TEST(unreachable) { +PCUT_TEST(unreachable) +{ PCUT_ASSERT_TRUE(0 && "unreachable code"); } -PCUT_CUSTOM_MAIN( - PCUT_MAIN_SET_PREINIT_HOOK(pre_init_hook) -); +PCUT_CUSTOM_MAIN(PCUT_MAIN_SET_PREINIT_HOOK(pre_init_hook)); Index: uspace/lib/pcut/tests/timeout.c =================================================================== --- uspace/lib/pcut/tests/timeout.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/timeout.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -43,5 +43,6 @@ #include "tested.h" -static void my_sleep(int sec) { +static void my_sleep(int sec) +{ #ifdef __helenos__ thread_sleep(sec); @@ -58,5 +59,6 @@ PCUT_INIT; -PCUT_TEST(shall_time_out) { +PCUT_TEST(shall_time_out) +{ printf("Text before sleeping.\n"); my_sleep(PCUT_DEFAULT_TEST_TIMEOUT * 5); @@ -65,5 +67,6 @@ PCUT_TEST(custom_time_out, - PCUT_TEST_SET_TIMEOUT(PCUT_DEFAULT_TEST_TIMEOUT * 3)) { + PCUT_TEST_SET_TIMEOUT(PCUT_DEFAULT_TEST_TIMEOUT * 3)) +{ printf("Text before sleeping.\n"); my_sleep(PCUT_DEFAULT_TEST_TIMEOUT * 2); Index: uspace/lib/pcut/tests/xmlreport.c =================================================================== --- uspace/lib/pcut/tests/xmlreport.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/pcut/tests/xmlreport.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -35,14 +35,17 @@ PCUT_INIT; -PCUT_TEST(zero_exponent) { +PCUT_TEST(zero_exponent) +{ PCUT_ASSERT_INT_EQUALS(1, intpow(2, 0)); } -PCUT_TEST(one_exponent) { +PCUT_TEST(one_exponent) +{ PCUT_ASSERT_INT_EQUALS(2, intpow(2, 1)); PCUT_ASSERT_INT_EQUALS(39, intpow(39, 1)); } -PCUT_TEST(same_strings) { +PCUT_TEST(same_strings) +{ const char *p = "xyz"; PCUT_ASSERT_STR_EQUALS("xyz", p); @@ -50,5 +53,3 @@ } -PCUT_CUSTOM_MAIN( - PCUT_MAIN_SET_XML_REPORT -); +PCUT_CUSTOM_MAIN(PCUT_MAIN_SET_XML_REPORT); Index: uspace/lib/posix/test/scanf.c =================================================================== --- uspace/lib/posix/test/scanf.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/posix/test/scanf.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -49,5 +49,6 @@ */ -PCUT_TEST(int_decimal) { +PCUT_TEST(int_decimal) +{ int number; int rc = sscanf("4242", "%d", &number); @@ -56,5 +57,6 @@ } -PCUT_TEST(int_negative_decimal) { +PCUT_TEST(int_negative_decimal) +{ int number; int rc = sscanf("-53", "%d", &number); @@ -69,5 +71,6 @@ */ -PCUT_TEST(int_misc) { +PCUT_TEST(int_misc) +{ unsigned char uhh; signed char shh; @@ -83,7 +86,7 @@ int rc = sscanf( - "\n j tt % \t -121314 98765 aqw 0765 0x77 0xABCDEF88 -99 884", - " j tt %%%3hhd%1hhu%3hd %3hu%u aqw%n %lo%llx %p %li %lld", - &shh, &uhh, &sh, &uh, &udef, &sdef, &ul, &ull, &p, &sl, &sll); + "\n j tt % \t -121314 98765 aqw 0765 0x77 0xABCDEF88 -99 884", + " j tt %%%3hhd%1hhu%3hd %3hu%u aqw%n %lo%llx %p %li %lld", + &shh, &uhh, &sh, &uh, &udef, &sdef, &ul, &ull, &p, &sl, &sll); PCUT_ASSERT_INT_EQUALS(10, rc); @@ -102,5 +105,6 @@ } -PCUT_TEST(double_misc) { +PCUT_TEST(double_misc) +{ float f; double d; @@ -108,7 +112,7 @@ int rc = sscanf( - "\n \t\t1.0 -0x555.AP10 1234.5678e12", - "%f %lf %Lf", - &f, &d, &ld); + "\n \t\t1.0 -0x555.AP10 1234.5678e12", + "%f %lf %Lf", + &f, &d, &ld); PCUT_ASSERT_INT_EQUALS(3, rc); @@ -119,12 +123,13 @@ } -PCUT_TEST(str_misc) { +PCUT_TEST(str_misc) +{ char str[20]; char *pstr; int rc = sscanf( - "\n\n\thello world \n", - "%5s %ms", - str, &pstr); + "\n\n\thello world \n", + "%5s %ms", + str, &pstr); PCUT_ASSERT_INT_EQUALS(2, rc); @@ -136,12 +141,13 @@ } -PCUT_TEST(str_matchers) { +PCUT_TEST(str_matchers) +{ char scanset[20]; char *pscanset; int rc = sscanf( - "\n\n\th-e-l-l-o world-] \n", - " %9[-eh-o] %m[^]-]", - scanset, &pscanset); + "\n\n\th-e-l-l-o world-] \n", + " %9[-eh-o] %m[^]-]", + scanset, &pscanset); PCUT_ASSERT_INT_EQUALS(2, rc); @@ -153,12 +159,13 @@ } -PCUT_TEST(char_misc) { +PCUT_TEST(char_misc) +{ char seq[20]; char *pseq; int rc = sscanf( - "\n\n\thello world \n", - " %5c %mc", - seq, &pseq); + "\n\n\thello world \n", + " %5c %mc", + seq, &pseq); PCUT_ASSERT_INT_EQUALS(2, rc); Index: uspace/lib/softint/generic/bits.c =================================================================== --- uspace/lib/softint/generic/bits.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/softint/generic/bits.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -82,5 +82,6 @@ * If the number is zero, zero is returned. */ -int __ffsdi2(long a) { +int __ffsdi2(long a) +{ if (a == 0) { return 0; Index: uspace/lib/softint/generic/division.c =================================================================== --- uspace/lib/softint/generic/division.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/softint/generic/division.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -61,5 +61,5 @@ for (; steps > 0; steps--) { /* shift one bit to remainder */ - *remainder = ((*remainder) << 1) | (( a >> 31) & 0x1); + *remainder = ((*remainder) << 1) | ((a >> 31) & 0x1); result <<= 1; Index: uspace/lib/trackmod/xm.c =================================================================== --- uspace/lib/trackmod/xm.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/trackmod/xm.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -461,6 +461,6 @@ module->ord_list_len = uint16_t_le2host(xm_hdr.song_len); - hdr_size = (size_t)uint32_t_le2host(xm_hdr.hdr_size) - + offsetof(xm_hdr_t, hdr_size); + hdr_size = (size_t)uint32_t_le2host(xm_hdr.hdr_size) + + offsetof(xm_hdr_t, hdr_size); module->def_bpm = uint16_t_le2host(xm_hdr.def_bpm); Index: uspace/lib/uri/test/parser.c =================================================================== --- uspace/lib/uri/test/parser.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/uri/test/parser.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -74,5 +74,6 @@ PCUT_TEST_SUITE(uri_parse); -PCUT_TEST_BEFORE { +PCUT_TEST_BEFORE +{ parsed_uri = NULL; expected_uri.scheme = NULL; @@ -86,5 +87,6 @@ } -PCUT_TEST_AFTER { +PCUT_TEST_AFTER +{ if (parsed_uri != NULL) { uri_destroy(parsed_uri); @@ -93,5 +95,6 @@ } -PCUT_TEST(only_hostname) { +PCUT_TEST(only_hostname) +{ expected_uri.scheme = "http"; expected_uri.host = "localhost"; @@ -100,5 +103,6 @@ } -PCUT_TEST(hostname_with_user) { +PCUT_TEST(hostname_with_user) +{ expected_uri.scheme = "http"; expected_uri.host = "localhost"; @@ -108,5 +112,6 @@ } -PCUT_TEST(hostname_with_user_and_password) { +PCUT_TEST(hostname_with_user_and_password) +{ expected_uri.scheme = "https"; expected_uri.host = "localhost"; @@ -117,5 +122,6 @@ } -PCUT_TEST(path_specification) { +PCUT_TEST(path_specification) +{ expected_uri.scheme = "http"; expected_uri.host = "localhost"; @@ -125,5 +131,6 @@ } -PCUT_TEST(with_fragment) { +PCUT_TEST(with_fragment) +{ expected_uri.scheme = "http"; expected_uri.host = "localhost"; Index: uspace/lib/uri/uri.c =================================================================== --- uspace/lib/uri/uri.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/uri/uri.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -59,5 +59,6 @@ /* scheme ":" */ const char *scheme = str; - while (*str != 0 && *str != ':') str++; + while (*str != 0 && *str != ':') + str++; if (*str == 0) { uri_destroy(uri); @@ -78,6 +79,6 @@ char *port_or_user_credential = NULL; - while (*str != 0 && *str != '?' && *str != '#' && *str != '@' - && *str != ':' && *str != '/') + while (*str != 0 && *str != '?' && *str != '#' && *str != '@' && + *str != ':' && *str != '/') str++; @@ -87,5 +88,6 @@ const char *second_part = str; while (*str != 0 && *str != '?' && *str != '#' && - *str != '@' && *str != '/') str++; + *str != '@' && *str != '/') + str++; port_or_user_credential = cut_str(second_part, str); } @@ -97,6 +99,7 @@ str++; const char *host_start = str; - while (*str != 0 && *str != '?' && *str != '#' - && *str != ':' && *str != '/') str++; + while (*str != 0 && *str != '?' && *str != '#' && + *str != ':' && *str != '/') + str++; uri->host = cut_str(host_start, str); @@ -108,6 +111,5 @@ uri->port = cut_str(port_start, str); } - } - else { + } else { uri->host = host_or_user_info; uri->port = port_or_user_credential; @@ -116,5 +118,6 @@ const char *path_start = str; - while (*str != 0 && *str != '?' && *str != '#') str++; + while (*str != 0 && *str != '?' && *str != '#') + str++; uri->path = cut_str(path_start, str); @@ -122,5 +125,6 @@ str++; const char *query_start = str; - while (*str != 0 && *str != '#') str++; + while (*str != 0 && *str != '#') + str++; uri->query = cut_str(query_start, str); } @@ -129,5 +133,6 @@ str++; const char *fragment_start = str; - while (*str != 0) str++; + while (*str != 0) + str++; uri->fragment = cut_str(fragment_start, str); } @@ -198,5 +203,6 @@ { while (*str != 0) { - while (is_unreserved(*str) || is_subdelim(*str) || *str == ':') str++; + while (is_unreserved(*str) || is_subdelim(*str) || *str == ':') + str++; if (*str == 0) break; @@ -226,5 +232,6 @@ if (!isdigit(*str)) return EINVAL; - while (isdigit(*str)) str++; + while (isdigit(*str)) + str++; *endptr = str; return EOK; Index: uspace/lib/usb/src/dma_buffer.c =================================================================== --- uspace/lib/usb/src/dma_buffer.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usb/src/dma_buffer.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -44,6 +44,6 @@ assert(chunk_size >= PAGE_SIZE || chunk_size == 0); - return ((chunk_size - 1) & DMA_POLICY_CHUNK_SIZE_MASK) - | (flags & DMA_POLICY_FLAGS_MASK); + return ((chunk_size - 1) & DMA_POLICY_CHUNK_SIZE_MASK) | + (flags & DMA_POLICY_FLAGS_MASK); } Index: uspace/lib/usb/src/dump.c =================================================================== --- uspace/lib/usb/src/dump.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usb/src/dump.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -140,6 +140,6 @@ const uint8_t *descriptor, size_t descriptor_length) { - usb_standard_device_descriptor_t *d - = (usb_standard_device_descriptor_t *) descriptor; + usb_standard_device_descriptor_t *d = + (usb_standard_device_descriptor_t *) descriptor; if (descriptor_length < sizeof(*d)) { return; @@ -167,6 +167,6 @@ const uint8_t *descriptor, size_t descriptor_length) { - usb_standard_configuration_descriptor_t *d - = (usb_standard_configuration_descriptor_t *) descriptor; + usb_standard_configuration_descriptor_t *d = + (usb_standard_configuration_descriptor_t *) descriptor; if (descriptor_length < sizeof(*d)) { return; @@ -194,6 +194,6 @@ const uint8_t *descriptor, size_t descriptor_length) { - usb_standard_interface_descriptor_t *d - = (usb_standard_interface_descriptor_t *) descriptor; + usb_standard_interface_descriptor_t *d = + (usb_standard_interface_descriptor_t *) descriptor; if (descriptor_length < sizeof(*d)) { return; @@ -205,6 +205,6 @@ PRINTLINE("bAlternateSetting = %d", d->alternate_setting); PRINTLINE("bNumEndpoints = %d", d->endpoint_count); - PRINTLINE("bInterfaceClass = %s", d->interface_class == 0 - ? "reserved (0)" : usb_str_class(d->interface_class)); + PRINTLINE("bInterfaceClass = %s", d->interface_class == 0 ? + "reserved (0)" : usb_str_class(d->interface_class)); PRINTLINE("bInterfaceSubClass = %d", d->interface_subclass); PRINTLINE("bInterfaceProtocol = %d", d->interface_protocol); @@ -222,6 +222,6 @@ const uint8_t *descriptor, size_t descriptor_length) { - usb_standard_endpoint_descriptor_t *d - = (usb_standard_endpoint_descriptor_t *) descriptor; + usb_standard_endpoint_descriptor_t *d = + (usb_standard_endpoint_descriptor_t *) descriptor; if (descriptor_length < sizeof(*d)) { return; @@ -229,6 +229,6 @@ int endpoint = d->endpoint_address & 15; - usb_direction_t direction = d->endpoint_address & 128 - ? USB_DIRECTION_IN : USB_DIRECTION_OUT; + usb_direction_t direction = d->endpoint_address & 128 ? + USB_DIRECTION_IN : USB_DIRECTION_OUT; usb_transfer_type_t transfer_type = d->attributes & 3; @@ -248,6 +248,6 @@ const uint8_t *descriptor, size_t descriptor_length) { - usb_superspeed_endpoint_companion_descriptor_t *d - = (usb_superspeed_endpoint_companion_descriptor_t *) descriptor; + usb_superspeed_endpoint_companion_descriptor_t *d = + (usb_superspeed_endpoint_companion_descriptor_t *) descriptor; if (descriptor_length < sizeof(*d)) { return; @@ -265,6 +265,6 @@ const uint8_t *descriptor, size_t descriptor_length) { - usb_standard_hid_descriptor_t *d - = (usb_standard_hid_descriptor_t *) descriptor; + usb_standard_hid_descriptor_t *d = + (usb_standard_hid_descriptor_t *) descriptor; if (descriptor_length < sizeof(*d)) { return; @@ -282,8 +282,8 @@ /* Print info about report descriptors. */ size_t i; - size_t count = (descriptor_length - sizeof(*d)) - / sizeof(usb_standard_hid_class_descriptor_info_t); - usb_standard_hid_class_descriptor_info_t *d2 - = (usb_standard_hid_class_descriptor_info_t *) + size_t count = (descriptor_length - sizeof(*d)) / + sizeof(usb_standard_hid_class_descriptor_info_t); + usb_standard_hid_class_descriptor_info_t *d2 = + (usb_standard_hid_class_descriptor_info_t *) (descriptor + sizeof(*d)); for (i = 0; i < count; i++, d2++) { @@ -308,15 +308,14 @@ d->characteristics_reserved, d->characteristics, (d->characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG) ? - "No Power Switching" : - ((d->characteristics & HUB_CHAR_POWER_PER_PORT_FLAG) ? - "Per-Port Switching" : "Ganged Power Switching"), + "No Power Switching" : + ((d->characteristics & HUB_CHAR_POWER_PER_PORT_FLAG) ? + "Per-Port Switching" : "Ganged Power Switching"), (d->characteristics & HUB_CHAR_COMPOUND_DEVICE) ? - "Compound Device;" : "", + "Compound Device;" : "", (d->characteristics & HUB_CHAR_NO_OC_FLAG) ? - "No OC Protection" : - ((d->characteristics & HUB_CHAR_OC_PER_PORT_FLAG) ? - "Individual Port OC Protection" : - "Global OC Protection") - ); + "No OC Protection" : + ((d->characteristics & HUB_CHAR_OC_PER_PORT_FLAG) ? + "Individual Port OC Protection" : + "Global OC Protection")); PRINTLINE("bPwrOn2PwrGood = %d (%d ms)", d->power_good_time, d->power_good_time * 2); @@ -327,6 +326,6 @@ const uint8_t *powered_mask = descriptor + sizeof(*d) + port_bytes; - if (port_bytes == 0 - || port_bytes > (((d->port_count / (unsigned)8) + 1) * 2)) { + if (port_bytes == 0 || + port_bytes > (((d->port_count / (unsigned)8) + 1) * 2)) { PRINTLINE("::CORRUPTED DESCRIPTOR:: (%zu bytes remain)", port_bytes * 2); Index: uspace/lib/usbdev/src/altiface.c =================================================================== --- uspace/lib/usbdev/src/altiface.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbdev/src/altiface.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -69,6 +69,6 @@ while (iface_ptr != NULL) { const usb_standard_interface_descriptor_t *iface = iface_ptr; - if (iface->descriptor_type == USB_DESCTYPE_INTERFACE - && iface->interface_number == interface_no) { + if (iface->descriptor_type == USB_DESCTYPE_INTERFACE && + iface->interface_number == interface_no) { ++alternate_count; } @@ -134,6 +134,6 @@ const usb_standard_interface_descriptor_t *iface = iface_ptr; - if ((iface->descriptor_type != USB_DESCTYPE_INTERFACE) - || (iface->interface_number != interface_number)) { + if ((iface->descriptor_type != USB_DESCTYPE_INTERFACE) || + (iface->interface_number != interface_number)) { /* This is not a valid alternate interface descriptor * for interface with number == interface_number. */ Index: uspace/lib/usbdev/src/devdrv.c =================================================================== --- uspace/lib/usbdev/src/devdrv.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbdev/src/devdrv.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -394,5 +394,5 @@ } -const usb_alternate_interfaces_t * usb_device_get_alternative_ifaces( +const usb_alternate_interfaces_t *usb_device_get_alternative_ifaces( usb_device_t *usb_dev) { @@ -547,5 +547,5 @@ } -usb_device_t * usb_device_create(devman_handle_t handle) +usb_device_t *usb_device_create(devman_handle_t handle) { usb_device_t *usb_dev = malloc(sizeof(usb_device_t)); @@ -562,5 +562,5 @@ } - const char* dummy = NULL; + const char *dummy = NULL; ret = usb_device_init(usb_dev, NULL, NULL, &dummy); if (ret != EOK) { @@ -588,5 +588,5 @@ ddf_fun_t *usb_device_ddf_fun_create(usb_device_t *usb_dev, fun_type_t ftype, - const char* name) + const char *name) { assert(usb_dev); @@ -596,5 +596,5 @@ } -async_exch_t * usb_device_bus_exchange_begin(usb_device_t *usb_dev) +async_exch_t *usb_device_bus_exchange_begin(usb_device_t *usb_dev) { assert(usb_dev); @@ -612,5 +612,5 @@ * @return Pointer to the newly allocated space, NULL on failure. */ -void * usb_device_data_alloc(usb_device_t *usb_dev, size_t size) +void *usb_device_data_alloc(usb_device_t *usb_dev, size_t size) { assert(usb_dev); @@ -620,5 +620,5 @@ } -void * usb_device_data_get(usb_device_t *usb_dev) +void *usb_device_data_get(usb_device_t *usb_dev) { assert(usb_dev); Index: uspace/lib/usbdev/src/devpoll.c =================================================================== --- uspace/lib/usbdev/src/devpoll.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbdev/src/devpoll.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -139,11 +139,11 @@ polling, usb_debug_str_buffer(polling->buffer, - actual_size, 16), + actual_size, 16), actual_size); } } else { - usb_log_debug( - "Poll%p: polling failed: %s.\n", - polling, str_error(rc)); + usb_log_debug( + "Poll%p: polling failed: %s.\n", + polling, str_error(rc)); } @@ -241,6 +241,6 @@ return EINVAL; - if (!polling->ep_mapping || (polling->ep_mapping->pipe.desc.transfer_type != USB_TRANSFER_INTERRUPT) - || (polling->ep_mapping->pipe.desc.direction != USB_DIRECTION_IN)) + if (!polling->ep_mapping || (polling->ep_mapping->pipe.desc.transfer_type != USB_TRANSFER_INTERRUPT) || + (polling->ep_mapping->pipe.desc.direction != USB_DIRECTION_IN)) return EINVAL; Index: uspace/lib/usbdev/src/dp.c =================================================================== --- uspace/lib/usbdev/src/dp.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbdev/src/dp.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -246,6 +246,6 @@ const uint8_t *parent, const uint8_t *sibling) { - if (!is_valid_descriptor_pointer(data, parent) - || !is_valid_descriptor_pointer(data, sibling)) { + if (!is_valid_descriptor_pointer(data, parent) || + !is_valid_descriptor_pointer(data, sibling)) { return NULL; } @@ -260,5 +260,5 @@ int possible_sibling_type = get_descriptor_type(data, possible_sibling); if (is_nested_descriptor_type(parser, - possible_sibling_type, parent_type)) { + possible_sibling_type, parent_type)) { return possible_sibling; } else { @@ -313,6 +313,6 @@ walk_callback_t callback, void *arg) { - if ((descriptors == NULL) || (descriptors_size == 0) - || (descriptor_nesting == NULL) || (callback == NULL)) { + if ((descriptors == NULL) || (descriptors_size == 0) || + (descriptor_nesting == NULL) || (callback == NULL)) { return; } Index: uspace/lib/usbdev/src/pipesinit.c =================================================================== --- uspace/lib/usbdev/src/pipesinit.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbdev/src/pipesinit.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -136,17 +136,17 @@ { while (mapping_count > 0) { - bool interface_number_fits = (mapping->interface_no < 0) - || (mapping->interface_no == interface_number); - - bool interface_setting_fits = (mapping->interface_setting < 0) - || (mapping->interface_setting == interface_setting); + bool interface_number_fits = (mapping->interface_no < 0) || + (mapping->interface_no == interface_number); + + bool interface_setting_fits = (mapping->interface_setting < 0) || + (mapping->interface_setting == interface_setting); bool endpoint_descriptions_fits = endpoint_fits_description( mapping->description, found_endpoint); - if (interface_number_fits - && interface_setting_fits - && endpoint_descriptions_fits - && !mapping->present) { + if (interface_number_fits && + interface_setting_fits && + endpoint_descriptions_fits && + !mapping->present) { return mapping; } @@ -240,5 +240,5 @@ /* Check if companion descriptor is present too, it should immediatelly follow. */ const uint8_t *companion_desc = usb_dp_get_nested_descriptor(parser, - parser_data, descriptor); + parser_data, descriptor); if (companion_desc && !is_superspeed_companion_descriptor(companion_desc)) { /* Not what we wanted, don't pass it further. */ @@ -248,9 +248,9 @@ (void) process_endpoint(mapping, mapping_count, (usb_standard_interface_descriptor_t *) - interface_descriptor, + interface_descriptor, (usb_standard_endpoint_descriptor_t *) - descriptor, + descriptor, (usb_superspeed_endpoint_companion_descriptor_t *) - companion_desc, + companion_desc, bus_session); } Index: uspace/lib/usbdev/src/request.c =================================================================== --- uspace/lib/usbdev/src/request.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbdev/src/request.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -151,6 +151,6 @@ const usb_device_request_setup_packet_t setup_packet = { - .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST - | (request_type << 5) | recipient, + .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST | + (request_type << 5) | recipient, .request = request, .value = uint16_host2usb(value), @@ -299,5 +299,5 @@ * @return */ -errno_t usb_request_get_descriptor_alloc(usb_pipe_t * pipe, +errno_t usb_request_get_descriptor_alloc(usb_pipe_t *pipe, usb_request_type_t request_type, usb_request_recipient_t recipient, uint8_t descriptor_type, uint8_t descriptor_index, @@ -599,6 +599,6 @@ uint8_t configuration_value) { - const uint16_t config_value - = uint16_host2usb((uint16_t) configuration_value); + const uint16_t config_value = + uint16_host2usb((uint16_t) configuration_value); return usb_control_request_set(pipe, @@ -709,6 +709,6 @@ /* FIXME: is this really correct? */ const uint16_t lang_code = - (string_descriptor[2 + 2 * i + 1] << 8) - + string_descriptor[2 + 2 * i]; + (string_descriptor[2 + 2 * i + 1] << 8) + + string_descriptor[2 + 2 * i]; langs[i] = uint16_usb2host(lang_code); } @@ -717,5 +717,5 @@ *languages_ptr = langs; - *languages_count =langs_count; + *languages_count = langs_count; return EOK; @@ -795,6 +795,6 @@ */ for (size_t i = 0; i < string_char_count; i++) { - const uint16_t uni_char = (string[2 + 2 * i + 1] << 8) - + string[2 + 2 * i]; + const uint16_t uni_char = (string[2 + 2 * i + 1] << 8) + + string[2 + 2 * i]; string_chars[i] = uni_char; } Index: uspace/lib/usbhid/src/hiddescriptor.c =================================================================== --- uspace/lib/usbhid/src/hiddescriptor.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbhid/src/hiddescriptor.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -96,21 +96,21 @@ usb_hid_report_path_t *path = NULL; - if((report == NULL) || (cmp_path == NULL)) { + if ((report == NULL) || (cmp_path == NULL)) { return NULL; } - while(path_it != &report->collection_paths.head) { + while (path_it != &report->collection_paths.head) { path = list_get_instance(path_it, usb_hid_report_path_t, - cpath_link); - - if(usb_hid_report_compare_usage_path(path, cmp_path, - USB_HID_PATH_COMPARE_STRICT) == 0){ + cpath_link); + + if (usb_hid_report_compare_usage_path(path, cmp_path, + USB_HID_PATH_COMPARE_STRICT) == 0) { break; } path_it = path_it->next; } - if(path_it == &report->collection_paths.head) { + if (path_it == &report->collection_paths.head) { path = usb_hid_report_path_clone(cmp_path); - if(path == NULL) { + if (path == NULL) { return NULL; } @@ -119,8 +119,7 @@ return path; - } - else { + } else { return list_get_instance(path_it, usb_hid_report_path_t, - cpath_link); + cpath_link); } } @@ -146,5 +145,5 @@ report->use_report_ids = 0; - return EOK; + return EOK; } @@ -164,5 +163,6 @@ */ errno_t usb_hid_report_append_fields(usb_hid_report_t *report, - usb_hid_report_item_t *report_item) { + usb_hid_report_item_t *report_item) +{ usb_hid_report_field_t *field; @@ -170,24 +170,23 @@ uint32_t *usages; - int usages_used=0; - - if((report == NULL) || (report_item == NULL)) { + int usages_used = 0; + + if ((report == NULL) || (report_item == NULL)) { return EINVAL; } - if(report_item->usages_count > 0){ + if (report_item->usages_count > 0) { usages = malloc(sizeof(uint32_t) * report_item->usages_count); memcpy(usages, report_item->usages, sizeof(int32_t) * - report_item->usages_count); - } - else { + report_item->usages_count); + } else { usages = NULL; } usb_hid_report_path_t *path = report_item->usage_path; - for(i=0; icount; i++){ + for (i = 0; i < report_item->count; i++) { field = malloc(sizeof(usb_hid_report_field_t)); - if(field == NULL) { + if (field == NULL) { return ENOMEM; } @@ -202,5 +201,5 @@ field->physical_maximum = report_item->physical_maximum; - if(USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) == 0){ + if (USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) == 0) { /* Store usage array. The Correct Usage Page and Usage is @@ -213,23 +212,19 @@ field->usages = usages; usages_used = 1; - } - else { + } else { /* Fill the correct Usage and Usage Page */ int32_t usage; - if(i < report_item->usages_count) { + if (i < report_item->usages_count) { usage = report_item->usages[i]; + } else { + usage = report_item->usages[report_item->usages_count - 1]; } - else { - usage = report_item->usages[ - report_item->usages_count- 1]; - } - - if(USB_HID_IS_EXTENDED_USAGE(usage)){ + + if (USB_HID_IS_EXTENDED_USAGE(usage)) { field->usage = USB_HID_EXTENDED_USAGE(usage); field->usage_page = - USB_HID_EXTENDED_USAGE_PAGE(usage); - } - else { + USB_HID_EXTENDED_USAGE_PAGE(usage); + } else { // should not occur field->usage = usage; @@ -239,10 +234,10 @@ usb_hid_report_set_last_item(path, USB_HID_TAG_CLASS_GLOBAL, - field->usage_page); + field->usage_page); usb_hid_report_set_last_item(path, USB_HID_TAG_CLASS_LOCAL, - field->usage); + field->usage); field->collection_path = - usb_hid_report_path_try_insert(report, path); + usb_hid_report_path_try_insert(report, path); field->size = report_item->size; @@ -250,5 +245,5 @@ field->offset = report_item->offset + (i * report_item->size); - if(report->use_report_ids != 0) { + if (report->use_report_ids != 0) { field->offset += 8; report->use_report_ids = 1; @@ -260,19 +255,19 @@ usb_hid_report_description_t *report_des; report_des = usb_hid_report_find_description(report, - report_item->id, report_item->type); - - if(report_des == NULL){ + report_item->id, report_item->type); + + if (report_des == NULL) { report_des = malloc( - sizeof(usb_hid_report_description_t)); - if(report_des == NULL) { + sizeof(usb_hid_report_description_t)); + if (report_des == NULL) { return ENOMEM; } memset(report_des, 0, - sizeof(usb_hid_report_description_t)); + sizeof(usb_hid_report_description_t)); report_des->type = report_item->type; report_des->report_id = report_item->id; - if(report_des->report_id != 0) { + if (report_des->report_id != 0) { /* set up the bit length by report_id field */ report_des->bit_length = 8; @@ -296,5 +291,5 @@ // free only when not used!!! - if(usages && usages_used == 0) { + if (usages && usages_used == 0) { free(usages); } @@ -313,9 +308,10 @@ * @retval NULL If no description is founded */ -usb_hid_report_description_t * usb_hid_report_find_description( - const usb_hid_report_t *report, uint8_t report_id, - usb_hid_report_type_t type) { - - if(report == NULL) { +usb_hid_report_description_t *usb_hid_report_find_description( + const usb_hid_report_t *report, uint8_t report_id, + usb_hid_report_type_t type) +{ + + if (report == NULL) { return NULL; } @@ -324,6 +320,6 @@ usb_hid_report_description_t, report_des) { // if report id not set, return the first of the type - if(((report_des->report_id == report_id) || (report_id == 0)) && - (report_des->type == type)) { + if (((report_des->report_id == report_id) || (report_id == 0)) && + (report_des->type == type)) { return report_des; } @@ -346,16 +342,16 @@ const uint8_t *data, size_t size) { - size_t i=0; - uint8_t tag=0; - uint8_t item_size=0; - int class=0; + size_t i = 0; + uint8_t tag = 0; + uint8_t item_size = 0; + int class = 0; int ret; - usb_hid_report_item_t *report_item=0; + usb_hid_report_item_t *report_item = 0; usb_hid_report_item_t *new_report_item; usb_hid_report_path_t *usage_path; - size_t offset_input=0; - size_t offset_output=0; - size_t offset_feature=0; + size_t offset_input = 0; + size_t offset_output = 0; + size_t offset_feature = 0; link_t *item_link; @@ -365,10 +361,10 @@ /* parser structure initialization*/ - if(usb_hid_report_init(report) != EOK) { + if (usb_hid_report_init(report) != EOK) { return EINVAL; } /*report item initialization*/ - if(!(report_item=malloc(sizeof(usb_hid_report_item_t)))){ + if (!(report_item = malloc(sizeof(usb_hid_report_item_t)))) { return ENOMEM; } @@ -377,13 +373,13 @@ /* usage path context initialization */ - if(!(usage_path=usb_hid_report_path())){ + if (!(usage_path = usb_hid_report_path())) { return ENOMEM; } usb_hid_report_path_append_item(usage_path, 0, 0); - while(i= size){ + while (i < size) { + if (!USB_HID_ITEM_IS_LONG(data[i])) { + + if ((i + USB_HID_ITEM_SIZE(data[i])) >= size) { return EINVAL; } @@ -393,8 +389,8 @@ class = USB_HID_ITEM_TAG_CLASS(data[i]); - ret = usb_hid_report_parse_tag(tag,class,data+i+1, - item_size,report_item, usage_path); - - switch(ret){ + ret = usb_hid_report_parse_tag(tag, class, data + i + 1, + item_size, report_item, usage_path); + + switch (ret) { case USB_HID_NEW_REPORT_ITEM: /* store report item to report and create the @@ -404,11 +400,11 @@ usb_hid_report_path_set_report_id( - report_item->usage_path, report_item->id); - - if(report_item->id != 0){ + report_item->usage_path, report_item->id); + + if (report_item->id != 0) { report->use_report_ids = 1; } - switch(tag) { + switch (tag) { case USB_HID_REPORT_TAG_INPUT: report_item->type = @@ -435,5 +431,5 @@ report_item->offset = offset_feature; offset_feature += report_item->count * - report_item->size; + report_item->size; break; @@ -441,5 +437,5 @@ usb_log_debug2( "\tjump over - tag %X\n", tag); - break; + break; } @@ -508,8 +504,7 @@ /* jump over the processed block */ i += 1 + USB_HID_ITEM_SIZE(data[i]); - } - else{ + } else { // TBD - i += 3 + USB_HID_ITEM_SIZE(data[i+1]); + i += 3 + USB_HID_ITEM_SIZE(data[i + 1]); } @@ -532,18 +527,18 @@ */ int usb_hid_report_parse_tag(uint8_t tag, uint8_t class, const uint8_t *data, - size_t item_size, usb_hid_report_item_t *report_item, - usb_hid_report_path_t *usage_path) { + size_t item_size, usb_hid_report_item_t *report_item, + usb_hid_report_path_t *usage_path) +{ int ret; - switch(class){ + switch (class) { case USB_HID_TAG_CLASS_MAIN: - if((ret=usb_hid_report_parse_main_tag(tag, data, item_size, - report_item, usage_path)) == 0) { + if ((ret = usb_hid_report_parse_main_tag(tag, data, item_size, + report_item, usage_path)) == 0) { return USB_HID_NEW_REPORT_ITEM; - } - else { + } else { return ret; } @@ -552,10 +547,10 @@ case USB_HID_TAG_CLASS_GLOBAL: return usb_hid_report_parse_global_tag(tag, data, item_size, - report_item, usage_path); + report_item, usage_path); break; case USB_HID_TAG_CLASS_LOCAL: return usb_hid_report_parse_local_tag(tag, data, item_size, - report_item, usage_path); + report_item, usage_path); break; @@ -576,11 +571,10 @@ int usb_hid_report_parse_main_tag(uint8_t tag, const uint8_t *data, - size_t item_size, usb_hid_report_item_t *report_item, - usb_hid_report_path_t *usage_path) + size_t item_size, usb_hid_report_item_t *report_item, + usb_hid_report_path_t *usage_path) { usb_hid_report_usage_path_t *path_item; - switch(tag) - { + switch (tag) { case USB_HID_REPORT_TAG_INPUT: case USB_HID_REPORT_TAG_OUTPUT: @@ -594,23 +588,21 @@ /* store collection atributes */ path_item = list_get_instance(list_first(&usage_path->items), - usb_hid_report_usage_path_t, rpath_items_link); + usb_hid_report_usage_path_t, rpath_items_link); path_item->flags = *data; /* set last item */ usb_hid_report_set_last_item(usage_path, - USB_HID_TAG_CLASS_GLOBAL, - USB_HID_EXTENDED_USAGE_PAGE(report_item->usages[ - report_item->usages_count-1])); + USB_HID_TAG_CLASS_GLOBAL, + USB_HID_EXTENDED_USAGE_PAGE(report_item->usages[report_item->usages_count - 1])); usb_hid_report_set_last_item(usage_path, - USB_HID_TAG_CLASS_LOCAL, - USB_HID_EXTENDED_USAGE(report_item->usages[ - report_item->usages_count-1])); + USB_HID_TAG_CLASS_LOCAL, + USB_HID_EXTENDED_USAGE(report_item->usages[report_item->usages_count - 1])); /* append the new one which will be set by common usage/usage * page */ usb_hid_report_path_append_item(usage_path, - report_item->usage_page, - report_item->usages[report_item->usages_count-1]); + report_item->usage_page, + report_item->usages[report_item->usages_count - 1]); usb_hid_report_reset_local_items (report_item); @@ -640,61 +632,61 @@ */ int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, - size_t item_size, usb_hid_report_item_t *report_item, - usb_hid_report_path_t *usage_path) { - - switch(tag) - { + size_t item_size, usb_hid_report_item_t *report_item, + usb_hid_report_path_t *usage_path) +{ + + switch (tag) { case USB_HID_REPORT_TAG_USAGE_PAGE: report_item->usage_page = - usb_hid_report_tag_data_uint32(data, item_size); + usb_hid_report_tag_data_uint32(data, item_size); break; case USB_HID_REPORT_TAG_LOGICAL_MINIMUM: report_item->logical_minimum = USB_HID_UINT32_TO_INT32( - usb_hid_report_tag_data_uint32(data,item_size), - item_size * 8); + usb_hid_report_tag_data_uint32(data, item_size), + item_size * 8); break; case USB_HID_REPORT_TAG_LOGICAL_MAXIMUM: report_item->logical_maximum = USB_HID_UINT32_TO_INT32( - usb_hid_report_tag_data_uint32(data,item_size), - item_size * 8); + usb_hid_report_tag_data_uint32(data, item_size), + item_size * 8); break; case USB_HID_REPORT_TAG_PHYSICAL_MINIMUM: report_item->physical_minimum = USB_HID_UINT32_TO_INT32( - usb_hid_report_tag_data_uint32(data,item_size), - item_size * 8); + usb_hid_report_tag_data_uint32(data, item_size), + item_size * 8); break; case USB_HID_REPORT_TAG_PHYSICAL_MAXIMUM: report_item->physical_maximum = USB_HID_UINT32_TO_INT32( - usb_hid_report_tag_data_uint32(data,item_size), - item_size * 8); + usb_hid_report_tag_data_uint32(data, item_size), + item_size * 8); break; case USB_HID_REPORT_TAG_UNIT_EXPONENT: report_item->unit_exponent = usb_hid_report_tag_data_uint32( - data,item_size); + data, item_size); break; case USB_HID_REPORT_TAG_UNIT: report_item->unit = usb_hid_report_tag_data_uint32( - data,item_size); + data, item_size); break; case USB_HID_REPORT_TAG_REPORT_SIZE: report_item->size = usb_hid_report_tag_data_uint32( - data,item_size); + data, item_size); break; case USB_HID_REPORT_TAG_REPORT_COUNT: report_item->count = usb_hid_report_tag_data_uint32( - data,item_size); + data, item_size); break; case USB_HID_REPORT_TAG_REPORT_ID: report_item->id = usb_hid_report_tag_data_uint32(data, - item_size); + item_size); return USB_HID_RESET_OFFSET; break; @@ -785,12 +777,12 @@ report_item->extended_usage_page = USB_HID_EXTENDED_USAGE_PAGE( - usb_hid_report_tag_data_uint32(data,item_size)); + usb_hid_report_tag_data_uint32(data, item_size)); report_item->usage_maximum = USB_HID_EXTENDED_USAGE( - usb_hid_report_tag_data_uint32(data,item_size)); + usb_hid_report_tag_data_uint32(data, item_size)); } else { report_item->usage_maximum = - usb_hid_report_tag_data_uint32(data,item_size); + usb_hid_report_tag_data_uint32(data, item_size); } @@ -866,6 +858,6 @@ result = 0; - for(i=0; ioffset); usb_log_debug("\t\tSIZE: %zu", report_item->size); usb_log_debug("\t\tLOGMIN: %d", - report_item->logical_minimum); + report_item->logical_minimum); usb_log_debug("\t\tLOGMAX: %d", - report_item->logical_maximum); + report_item->logical_maximum); usb_log_debug("\t\tPHYMIN: %d", - report_item->physical_minimum); + report_item->physical_minimum); usb_log_debug("\t\tPHYMAX: %d", - report_item->physical_maximum); + report_item->physical_maximum); usb_log_debug("\t\ttUSAGEMIN: %X", - report_item->usage_minimum); + report_item->usage_minimum); usb_log_debug("\t\tUSAGEMAX: %X", - report_item->usage_maximum); + report_item->usage_maximum); usb_log_debug("\t\tUSAGES COUNT: %zu", - report_item->usages_count); + report_item->usages_count); usb_log_debug("\t\tVALUE: %X", report_item->value); @@ -932,7 +924,7 @@ usb_log_debug("\tLength: %zu", report_des->bit_length); usb_log_debug("\tB Size: %zu", - usb_hid_report_byte_size(report, - report_des->report_id, - report_des->type)); + usb_hid_report_byte_size(report, + report_des->report_id, + report_des->type)); usb_log_debug("\tItems: %zu", report_des->item_length); @@ -950,5 +942,5 @@ void usb_hid_report_deinit(usb_hid_report_t *report) { - if(report == NULL){ + if (report == NULL) { return; } @@ -957,5 +949,5 @@ link_t *path_link; usb_hid_report_path_t *path; - while(!list_empty(&report->collection_paths)) { + while (!list_empty(&report->collection_paths)) { path_link = list_first(&report->collection_paths); path = list_get_instance(path_link, @@ -969,11 +961,11 @@ usb_hid_report_description_t *report_des; usb_hid_report_field_t *field; - while(!list_empty(&report->reports)) { + while (!list_empty(&report->reports)) { report_des = list_get_instance(list_first(&report->reports), - usb_hid_report_description_t, reports_link); + usb_hid_report_description_t, reports_link); list_remove(&report_des->reports_link); - while(!list_empty(&report_des->report_items)) { + while (!list_empty(&report_des->report_items)) { field = list_get_instance( list_first(&report_des->report_items), Index: uspace/lib/usbhost/src/bandwidth.c =================================================================== --- uspace/lib/usbhost/src/bandwidth.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbhost/src/bandwidth.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -62,6 +62,6 @@ /* We care about bandwidth only for interrupt and isochronous. */ - if ((type != USB_TRANSFER_INTERRUPT) - && (type != USB_TRANSFER_ISOCHRONOUS)) { + if ((type != USB_TRANSFER_INTERRUPT) && + (type != USB_TRANSFER_ISOCHRONOUS)) { return 0; } @@ -127,6 +127,6 @@ /* We care about bandwidth only for interrupt and isochronous. */ - if ((type != USB_TRANSFER_INTERRUPT) - && (type != USB_TRANSFER_ISOCHRONOUS)) { + if ((type != USB_TRANSFER_INTERRUPT) && + (type != USB_TRANSFER_ISOCHRONOUS)) { return 0; } @@ -143,8 +143,8 @@ if (ep->direction == USB_DIRECTION_IN) return 64060 + (2 * hub_ls_setup) + - (677 * base_time) + host_delay; + (677 * base_time) + host_delay; else return 64107 + (2 * hub_ls_setup) + - (667 * base_time) + host_delay; + (667 * base_time) + host_delay; case USB_SPEED_FULL: Index: uspace/lib/usbhost/src/endpoint.c =================================================================== --- uspace/lib/usbhost/src/endpoint.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbhost/src/endpoint.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -225,5 +225,5 @@ } - device_t * const device = ep->device; + device_t *const device = ep->device; if (!device) { usb_log_warning("Endpoint detached"); @@ -243,6 +243,6 @@ */ if (size > ep->max_transfer_size && - (ep->transfer_type == USB_TRANSFER_INTERRUPT - || ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)) { + (ep->transfer_type == USB_TRANSFER_INTERRUPT || + ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)) { if (req->dir == USB_DIRECTION_OUT) return ENOSPC; Index: uspace/lib/usbvirt/src/stdreq.c =================================================================== --- uspace/lib/usbvirt/src/stdreq.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbvirt/src/stdreq.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -118,6 +118,6 @@ size_t i; for (i = 0; i < config->extra_count; i++) { - const usbvirt_device_configuration_extras_t *extra - = &config->extra[i]; + const usbvirt_device_configuration_extras_t *extra = + &config->extra[i]; memcpy(ptr, extra->data, extra->length); ptr += extra->length; Index: uspace/lib/usbvirt/src/transfer.c =================================================================== --- uspace/lib/usbvirt/src/transfer.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbvirt/src/transfer.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -81,6 +81,6 @@ usb_log_warning("Control transfer {%s (%s)} not handled.", usb_debug_str_buffer(setup, setup_size, 10), - setup_packet->request_type & 0x80 - ? "IN" : usb_debug_str_buffer(data, data_size, 10)); + setup_packet->request_type & 0x80 ? + "IN" : usb_debug_str_buffer(data, data_size, 10)); rc = EBADCHECKSUM; } Index: uspace/lib/usbvirt/src/virthub_descriptors.c =================================================================== --- uspace/lib/usbvirt/src/virthub_descriptors.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/lib/usbvirt/src/virthub_descriptors.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -85,8 +85,7 @@ .descriptor_type = USB_DESCTYPE_CONFIGURATION, .total_length = - sizeof(virthub_configuration_descriptor_without_hub_size) - + sizeof(virthub_interface_descriptor) - + sizeof(virthub_endpoint_descriptor) - , + sizeof(virthub_configuration_descriptor_without_hub_size) + + sizeof(virthub_interface_descriptor) + + sizeof(virthub_endpoint_descriptor), .interface_count = 1, .configuration_number = HUB_CONFIGURATION_ID, Index: uspace/srv/audio/hound/audio_data.c =================================================================== --- uspace/srv/audio/hound/audio_data.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/audio/hound/audio_data.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -103,5 +103,5 @@ * @return valid pointer to data link structure, NULL on failure. */ -static inline audio_data_link_t * audio_data_link_list_instance(link_t *l) +static inline audio_data_link_t *audio_data_link_list_instance(link_t *l) { return l ? list_get_instance(l, audio_data_link_t, link) : NULL; @@ -144,5 +144,5 @@ * @return pointer to the beginning of data buffer. */ -static inline const void * audio_data_link_start(audio_data_link_t *alink) +static inline const void *audio_data_link_start(audio_data_link_t *alink) { assert(alink); Index: uspace/srv/audio/hound/hound_ctx.c =================================================================== --- uspace/srv/audio/hound/hound_ctx.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/audio/hound/hound_ctx.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -209,6 +209,6 @@ fibril_mutex_lock(&stream->guard); if (stream->allowed_size && - (audio_pipe_bytes(&stream->fifo) + adata->size - > stream->allowed_size)) { + (audio_pipe_bytes(&stream->fifo) + adata->size > + stream->allowed_size)) { fibril_mutex_unlock(&stream->guard); return EOVERFLOW; @@ -246,5 +246,5 @@ */ hound_ctx_stream_t *hound_ctx_create_stream(hound_ctx_t *ctx, int flags, - pcm_format_t format, size_t buffer_size) + pcm_format_t format, size_t buffer_size) { assert(ctx); @@ -308,5 +308,5 @@ while (stream->allowed_size && (audio_pipe_bytes(&stream->fifo) + size > stream->allowed_size)) { - fibril_condvar_wait(&stream->change, &stream->guard); + fibril_condvar_wait(&stream->change, &stream->guard); } @@ -336,5 +336,5 @@ fibril_mutex_lock(&stream->guard); while (audio_pipe_bytes(&stream->fifo) < size) { - fibril_condvar_wait(&stream->change, &stream->guard); + fibril_condvar_wait(&stream->change, &stream->guard); } @@ -466,5 +466,5 @@ if (ret != EOK) log_error("Failed to push data to stream: %s", - str_error(ret)); + str_error(ret)); } audio_data_unref(adata); Index: uspace/srv/fs/cdfs/cdfs_ops.c =================================================================== --- uspace/srv/fs/cdfs/cdfs_ops.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/fs/cdfs/cdfs_ops.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -282,10 +282,10 @@ typedef struct { service_id_t service_id; - fs_index_t index; + fs_index_t index; } ht_key_t; static size_t nodes_key_hash(void *k) { - ht_key_t *key = (ht_key_t*)k; + ht_key_t *key = (ht_key_t *)k; return hash_combine(key->service_id, key->index); } @@ -300,5 +300,5 @@ { cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link); - ht_key_t *key = (ht_key_t*)k; + ht_key_t *key = (ht_key_t *)k; return key->service_id == node->fs->service_id && key->index == node->index; @@ -1208,5 +1208,5 @@ static bool rm_service_id_nodes(ht_link_t *item, void *arg) { - service_id_t service_id = *(service_id_t*)arg; + service_id_t service_id = *(service_id_t *)arg; cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link); @@ -1345,5 +1345,5 @@ static bool cache_remove_closed(ht_link_t *item, void *arg) { - size_t *premove_cnt = (size_t*)arg; + size_t *premove_cnt = (size_t *)arg; /* Some nodes were requested to be removed from the cache. */ Index: uspace/srv/hid/input/input.c =================================================================== --- uspace/srv/hid/input/input.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/hid/input/input.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -308,5 +308,5 @@ /* Mutual exclusion of active clients */ list_foreach(clients, link, client_t, client) - client->active = ((active) && (client == active_client)); + client->active = ((active) && (client == active_client)); /* Notify clients about the arbitration */ Index: uspace/srv/hid/output/port/kfb.c =================================================================== --- uspace/srv/hid/output/port/kfb.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/hid/output/port/kfb.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -490,8 +490,8 @@ size_t word_size = sizeof(unsigned long); - if (((word_size % kfb.pixel_bytes) == 0) - && ((FONT_WIDTH * kfb.pixel_bytes) % word_size == 0) - && ((vp->x * kfb.pixel_bytes) % word_size == 0) - && (kfb.scanline % word_size == 0)) + if (((word_size % kfb.pixel_bytes) == 0) && + ((FONT_WIDTH * kfb.pixel_bytes) % word_size == 0) && + ((vp->x * kfb.pixel_bytes) % word_size == 0) && + (kfb.scanline % word_size == 0)) kfb_vp->draw_char = draw_char_aligned; else Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/loader/main.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -145,5 +145,5 @@ } - char* name = malloc(namesize); + char *name = malloc(namesize); errno_t rc = async_data_write_finalize(write_chandle, name, namesize); if (rc != EOK) { @@ -248,5 +248,5 @@ } - char* name = malloc(namesize); + char *name = malloc(namesize); errno_t rc = async_data_write_finalize(write_chandle, name, namesize); if (rc != EOK) { Index: uspace/srv/locsrv/locsrv.c =================================================================== --- uspace/srv/locsrv/locsrv.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/locsrv/locsrv.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -217,6 +217,6 @@ list_foreach(services_list, services, loc_service_t, service) { - if ((str_cmp(service->namespace->name, ns_name) == 0) - && (str_cmp(service->name, name) == 0)) + if ((str_cmp(service->namespace->name, ns_name) == 0) && + (str_cmp(service->name, name) == 0)) return service; } Index: uspace/srv/net/dnsrsrv/dns_msg.c =================================================================== --- uspace/srv/net/dnsrsrv/dns_msg.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/dnsrsrv/dns_msg.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -383,6 +383,6 @@ question->qtype = dns_uint16_t_decode(pdu->data + name_eoff, pdu->size - name_eoff); - question->qclass = dns_uint16_t_decode(pdu->data + sizeof(uint16_t) - + name_eoff, pdu->size - sizeof(uint16_t) - name_eoff); + question->qclass = dns_uint16_t_decode(pdu->data + sizeof(uint16_t) + + name_eoff, pdu->size - sizeof(uint16_t) - name_eoff); *eoff = name_eoff + 2 * sizeof(uint16_t); @@ -449,5 +449,5 @@ log_msg(LOG_DEFAULT, LVL_DEBUG2, "dns_rr_decode: rtype=0x%x, rclass=0x%x, ttl=0x%x", - rr->rtype, rr->rclass, rr->ttl ); + rr->rtype, rr->rclass, rr->ttl); rdlength = dns_uint16_t_decode(bp, bsz); @@ -510,6 +510,5 @@ (msg->rd ? BIT_V(uint16_t, OPB_RD) : 0) | (msg->ra ? BIT_V(uint16_t, OPB_RA) : 0) | - msg->rcode - ); + msg->rcode); hdr.qd_count = host2uint16_t_be(list_count(&msg->question)); Index: uspace/srv/net/ethip/pdu.c =================================================================== --- uspace/srv/net/ethip/pdu.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/ethip/pdu.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -124,6 +124,10 @@ switch (packet->opcode) { - case aop_request: fopcode = AOP_REQUEST; break; - case aop_reply: fopcode = AOP_REPLY; break; + case aop_request: + fopcode = AOP_REQUEST; + break; + case aop_reply: + fopcode = AOP_REPLY; + break; default: assert(false); @@ -187,6 +191,10 @@ switch (uint16_t_be2host(pfmt->opcode)) { - case AOP_REQUEST: packet->opcode = aop_request; break; - case AOP_REPLY: packet->opcode = aop_reply; break; + case AOP_REQUEST: + packet->opcode = aop_request; + break; + case AOP_REPLY: + packet->opcode = aop_reply; + break; default: log_msg(LOG_DEFAULT, LVL_DEBUG, "Invalid ARP opcode (%" PRIu16 ")", Index: uspace/srv/net/inetsrv/pdu.c =================================================================== --- uspace/srv/net/inetsrv/pdu.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/inetsrv/pdu.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -72,10 +72,10 @@ for (i = 0; i < words; i++) { - w = ((uint16_t)bdata[2*i] << 8) | bdata[2*i + 1]; + w = ((uint16_t)bdata[2 * i] << 8) | bdata[2 * i + 1]; sum = inet_ocadd16(sum, w); } if (size % 2 != 0) { - w = ((uint16_t)bdata[2*words] << 8); + w = ((uint16_t)bdata[2 * words] << 8); sum = inet_ocadd16(sum, w); } Index: uspace/srv/net/slip/slip.c =================================================================== --- uspace/srv/net/slip/slip.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/slip/slip.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -284,5 +284,5 @@ */ -pass: + pass: rc = iplink_ev_recv(&slip_iplink, &sdu, ip_v4); if (rc != EOK) { @@ -374,6 +374,6 @@ if (rc != EOK) { log_msg(LOG_DEFAULT, LVL_ERROR, - "Failed to register service %s", - linkstr); + "Failed to register service %s", + linkstr); goto fail; } Index: uspace/srv/net/tcp/conn.c =================================================================== --- uspace/srv/net/tcp/conn.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/tcp/conn.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -156,6 +156,6 @@ /* Initialize retransmission queue */ - if (tcp_tqueue_init(&conn->retransmit, conn, &tcp_conn_tqueue_cb) - != EOK) { + if (tcp_tqueue_init(&conn->retransmit, conn, &tcp_conn_tqueue_cb) != + EOK) { goto error; } Index: uspace/srv/net/tcp/inet.c =================================================================== --- uspace/srv/net/tcp/inet.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/tcp/inet.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -97,5 +97,6 @@ if (hdr_size < sizeof(tcp_header_t)) { log_msg(LOG_DEFAULT, LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu", - hdr_size, sizeof(tcp_header_t)); return EINVAL; + hdr_size, sizeof(tcp_header_t)); + return EINVAL; } Index: uspace/srv/net/tcp/pdu.c =================================================================== --- uspace/srv/net/tcp/pdu.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/tcp/pdu.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -73,10 +73,10 @@ for (i = 0; i < words; i++) { - w = ((uint16_t)bdata[2*i] << 8) | bdata[2*i + 1]; + w = ((uint16_t)bdata[2 * i] << 8) | bdata[2 * i + 1]; sum = tcp_ocadd16(sum, w); } if (size % 2 != 0) { - w = ((uint16_t)bdata[2*words] << 8); + w = ((uint16_t)bdata[2 * words] << 8); sum = tcp_ocadd16(sum, w); } Index: uspace/srv/net/tcp/seq_no.c =================================================================== --- uspace/srv/net/tcp/seq_no.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/tcp/seq_no.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -170,6 +170,6 @@ /* Beginning of segment is inside window */ - b_in = seq_no_le_lt(conn->rcv_nxt, seg->seq, conn->rcv_nxt - + conn->rcv_wnd); + b_in = seq_no_le_lt(conn->rcv_nxt, seg->seq, conn->rcv_nxt + + conn->rcv_wnd); /* End of segment is inside window */ Index: uspace/srv/net/tcp/test/conn.c =================================================================== --- uspace/srv/net/tcp/test/conn.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/tcp/test/conn.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -139,5 +139,5 @@ while (conn->cstate == st_syn_sent) - fibril_condvar_wait(&conn->cstate_cv, &conn->lock); + fibril_condvar_wait(&conn->cstate_cv, &conn->lock); PCUT_ASSERT_INT_EQUALS(st_closed, conn->cstate); @@ -194,5 +194,5 @@ /* Wait for client-side state to transition */ while (cconn->cstate == st_syn_sent) - fibril_condvar_wait(&cconn->cstate_cv, &cconn->lock); + fibril_condvar_wait(&cconn->cstate_cv, &cconn->lock); PCUT_ASSERT_INT_EQUALS(st_established, cconn->cstate); @@ -203,5 +203,5 @@ tcp_conn_lock(sconn); while (sconn->cstate == st_listen || sconn->cstate == st_syn_received) - fibril_condvar_wait(&sconn->cstate_cv, &sconn->lock); + fibril_condvar_wait(&sconn->cstate_cv, &sconn->lock); PCUT_ASSERT_INT_EQUALS(st_established, sconn->cstate); Index: uspace/srv/net/tcp/test/rqueue.c =================================================================== --- uspace/srv/net/tcp/test/rqueue.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/tcp/test/rqueue.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -107,5 +107,5 @@ seg_cnt = 0; - inet_ep2_init(&epp); + inet_ep2_init(&epp); tcp_rqueue_fibril_start(); Index: uspace/srv/net/tcp/test/seq_no.c =================================================================== --- uspace/srv/net/tcp/test/seq_no.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/tcp/test/seq_no.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -130,5 +130,5 @@ conn->rcv_wnd = (uint32_t) -10; - PCUT_ASSERT_FALSE(seq_no_in_rcv_wnd(conn,19)); + PCUT_ASSERT_FALSE(seq_no_in_rcv_wnd(conn, 19)); PCUT_ASSERT_TRUE(seq_no_in_rcv_wnd(conn, 20)); PCUT_ASSERT_TRUE(seq_no_in_rcv_wnd(conn, 21)); Index: uspace/srv/net/udp/pdu.c =================================================================== --- uspace/srv/net/udp/pdu.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/net/udp/pdu.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -72,10 +72,10 @@ for (i = 0; i < words; i++) { - w = ((uint16_t)bdata[2*i] << 8) | bdata[2*i + 1]; + w = ((uint16_t)bdata[2 * i] << 8) | bdata[2 * i + 1]; sum = udp_ocadd16(sum, w); } if (size % 2 != 0) { - w = ((uint16_t)bdata[2*words] << 8); + w = ((uint16_t)bdata[2 * words] << 8); sum = udp_ocadd16(sum, w); } Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ uspace/srv/vfs/vfs_register.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -382,5 +382,6 @@ fstypes->size = size; - size = 0; count = 0; + size = 0; + count = 0; list_foreach(fs_list, fs_link, fs_info_t, fs) { l = str_size(fs->vfs_info.name) + 1;