Index: uspace/drv/hid/usbhid/blink1/blink1.c =================================================================== --- uspace/drv/hid/usbhid/blink1/blink1.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/blink1/blink1.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -64,5 +64,5 @@ usb_blink1_t *blink1_dev = (usb_blink1_t *) ddf_fun_data_get(fun); if (blink1_dev == NULL) { - usb_log_debug("Missing parameters.\n"); + usb_log_debug("Missing parameters."); return EINVAL; } @@ -105,5 +105,5 @@ fun_exposed, HID_BLINK1_FUN_NAME); if (fun == NULL) { - usb_log_error("Could not create DDF function node `%s'.\n", + usb_log_error("Could not create DDF function node `%s'.", HID_BLINK1_FUN_NAME); return ENOMEM; @@ -123,5 +123,5 @@ int rc = ddf_fun_bind(fun); if (rc != EOK) { - usb_log_error("Could not bind DDF function `%s': %s.\n", + usb_log_error("Could not bind DDF function `%s': %s.", ddf_fun_get_name(fun), str_error(rc)); ddf_fun_destroy(fun); @@ -131,5 +131,5 @@ rc = ddf_fun_add_to_category(fun, HID_BLINK1_CATEGORY); if (rc != EOK) { - usb_log_error("Could not add DDF function to category %s: %s.\n", + usb_log_error("Could not add DDF function to category %s: %s.", HID_BLINK1_CATEGORY, str_error(rc)); Index: uspace/drv/hid/usbhid/generic/hiddev.c =================================================================== --- uspace/drv/hid/usbhid/generic/hiddev.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/generic/hiddev.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -96,5 +96,5 @@ const usb_hid_dev_t *hid_dev = fun_hid_dev(fun); - usb_log_debug2("hid_dev: %p, Max input report size (%zu).\n", + usb_log_debug2("hid_dev: %p, Max input report size (%zu).", hid_dev, hid_dev->max_input_report_size); @@ -105,5 +105,5 @@ size_t size, size_t *act_size, int *event_nr, unsigned int flags) { - usb_log_debug2("Generic HID: Get event.\n"); + usb_log_debug2("Generic HID: Get event."); if (buffer == NULL || act_size == NULL || event_nr == NULL) { @@ -115,5 +115,5 @@ if (hid_dev->input_report_size > size) { - usb_log_debug("input_report_size > size (%zu, %zu)\n", + usb_log_debug("input_report_size > size (%zu, %zu)", hid_dev->input_report_size, size); return EINVAL; // TODO: other error code @@ -126,5 +126,5 @@ *event_nr = usb_hid_report_number(hid_dev); - usb_log_debug2("OK\n"); + usb_log_debug2("OK"); return EOK; @@ -133,9 +133,9 @@ static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun) { - usb_log_debug("Generic HID: Get report descriptor length.\n"); - - const usb_hid_dev_t *hid_dev = fun_hid_dev(fun); - - usb_log_debug2("hid_dev->report_desc_size = %zu\n", + usb_log_debug("Generic HID: Get report descriptor length."); + + const usb_hid_dev_t *hid_dev = fun_hid_dev(fun); + + usb_log_debug2("hid_dev->report_desc_size = %zu", hid_dev->report_desc_size); @@ -146,5 +146,5 @@ size_t size, size_t *actual_size) { - usb_log_debug2("Generic HID: Get report descriptor.\n"); + usb_log_debug2("Generic HID: Get report descriptor."); const usb_hid_dev_t *hid_dev = fun_hid_dev(fun); @@ -162,5 +162,5 @@ static int usb_generic_hid_client_connected(ddf_fun_t *fun) { - usb_log_debug("Generic HID: Client connected.\n"); + usb_log_debug("Generic HID: Client connected."); return EOK; } @@ -173,8 +173,8 @@ if (ddf_fun_unbind(fun) != EOK) { - usb_log_error("Failed to unbind generic hid fun.\n"); + usb_log_error("Failed to unbind generic hid fun."); return; } - usb_log_debug2("%s unbound.\n", ddf_fun_get_name(fun)); + usb_log_debug2("%s unbound.", ddf_fun_get_name(fun)); ddf_fun_destroy(fun); } @@ -189,9 +189,9 @@ /* Create the exposed function. */ - usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME); + usb_log_debug("Creating DDF function %s...", HID_GENERIC_FUN_NAME); ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev, fun_exposed, HID_GENERIC_FUN_NAME); if (fun == NULL) { - usb_log_error("Could not create DDF function node.\n"); + usb_log_error("Could not create DDF function node."); return ENOMEM; } @@ -204,5 +204,5 @@ int rc = ddf_fun_bind(fun); if (rc != EOK) { - usb_log_error("Could not bind DDF function: %s.\n", + usb_log_error("Could not bind DDF function: %s.", str_error(rc)); ddf_fun_destroy(fun); @@ -210,5 +210,5 @@ } - usb_log_debug("HID function created. Handle: %" PRIun "\n", + usb_log_debug("HID function created. Handle: %" PRIun "", ddf_fun_get_handle(fun)); *data = fun; Index: uspace/drv/hid/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/hid/usbhid/kbd/kbddev.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/kbd/kbddev.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -185,8 +185,8 @@ if (kbd_dev->client_sess == NULL) { kbd_dev->client_sess = sess; - usb_log_debug("%s: OK\n", __FUNCTION__); + usb_log_debug("%s: OK", __FUNCTION__); async_answer_0(icallid, EOK); } else { - usb_log_error("%s: console session already set\n", + usb_log_error("%s: console session already set", __FUNCTION__); async_answer_0(icallid, ELIMIT); @@ -195,5 +195,5 @@ } default: - usb_log_error("%s: Unknown method: %d.\n", + usb_log_error("%s: Unknown method: %d.", __FUNCTION__, (int) method); async_answer_0(icallid, EINVAL); @@ -226,5 +226,5 @@ /* Reset the LED data. */ memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t)); - usb_log_debug("Creating output report:\n"); + usb_log_debug("Creating output report:"); usb_hid_report_field_t *field = usb_hid_report_get_sibling( @@ -266,5 +266,5 @@ } - usb_log_debug("Output report buffer: %s\n", + usb_log_debug("Output report buffer: %s", usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size, 0)); @@ -276,5 +276,5 @@ kbd_dev->output_buffer, kbd_dev->output_size); if (rc != EOK) { - usb_log_warning("Failed to set kbd indicators.\n"); + usb_log_warning("Failed to set kbd indicators."); } } @@ -289,5 +289,5 @@ void usb_kbd_push_ev(usb_kbd_t *kbd_dev, int type, unsigned key) { - usb_log_debug2("Sending kbdev event %d/%d to the console\n", type, key); + usb_log_debug2("Sending kbdev event %d/%d to the console", type, key); if (kbd_dev->client_sess == NULL) { usb_log_warning( @@ -301,5 +301,5 @@ async_exchange_end(exch); } else { - usb_log_warning("Failed to send key to console.\n"); + usb_log_warning("Failed to send key to console."); } } @@ -353,5 +353,5 @@ kbd_dev->key_count); if (i != (size_t) -1) { - usb_log_error("Detected phantom state.\n"); + usb_log_error("Detected phantom state."); return; } @@ -403,5 +403,5 @@ ddf_dump_buffer(key_buffer, 512, kbd_dev->keys_old, 4, kbd_dev->key_count, 0); - usb_log_debug2("Stored keys %s.\n", key_buffer); + usb_log_debug2("Stored keys %s.", key_buffer); } @@ -431,5 +431,5 @@ usb_hid_report_path_t *path = usb_hid_report_path(); if (path == NULL) { - usb_log_error("Failed to create hid/kbd report path.\n"); + usb_log_error("Failed to create hid/kbd report path."); return; } @@ -438,5 +438,5 @@ usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); if (ret != EOK) { - usb_log_error("Failed to append to hid/kbd report path.\n"); + usb_log_error("Failed to append to hid/kbd report path."); return; } @@ -452,5 +452,5 @@ while (field != NULL) { - usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", + usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)", field, field->value, field->usage); @@ -464,5 +464,5 @@ kbd_dev->keys[i] = 0; } - usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]); + usb_log_debug2("Saved %u. key usage %d", i, kbd_dev->keys[i]); ++i; @@ -502,5 +502,5 @@ usb_hid_report_path_t *path = usb_hid_report_path(); if (path == NULL) { - usb_log_error("Failed to create kbd report path.\n"); + usb_log_error("Failed to create kbd report path."); usb_kbd_destroy(kbd_dev); return ENOMEM; @@ -510,5 +510,5 @@ usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); if (ret != EOK) { - usb_log_error("Failed to append item to kbd report path.\n"); + usb_log_error("Failed to append item to kbd report path."); usb_hid_report_path_free(path); usb_kbd_destroy(kbd_dev); @@ -523,9 +523,9 @@ usb_hid_report_path_free(path); - usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count); + usb_log_debug("Size of the input report: %zu", kbd_dev->key_count); kbd_dev->keys = calloc(kbd_dev->key_count, sizeof(int32_t)); if (kbd_dev->keys == NULL) { - usb_log_error("Failed to allocate key buffer.\n"); + usb_log_error("Failed to allocate key buffer."); usb_kbd_destroy(kbd_dev); return ENOMEM; @@ -534,5 +534,5 @@ kbd_dev->keys_old = calloc(kbd_dev->key_count, sizeof(int32_t)); if (kbd_dev->keys_old == NULL) { - usb_log_error("Failed to allocate old_key buffer.\n"); + usb_log_error("Failed to allocate old_key buffer."); usb_kbd_destroy(kbd_dev); return ENOMEM; @@ -544,14 +544,14 @@ &kbd_dev->output_size, 0); if (kbd_dev->output_buffer == NULL) { - usb_log_error("Error creating output report buffer.\n"); + usb_log_error("Error creating output report buffer."); usb_kbd_destroy(kbd_dev); return ENOMEM; } - usb_log_debug("Output buffer size: %zu\n", kbd_dev->output_size); + usb_log_debug("Output buffer size: %zu", kbd_dev->output_size); kbd_dev->led_path = usb_hid_report_path(); if (kbd_dev->led_path == NULL) { - usb_log_error("Failed to create kbd led report path.\n"); + usb_log_error("Failed to create kbd led report path."); usb_kbd_destroy(kbd_dev); return ENOMEM; @@ -561,5 +561,5 @@ kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0); if (ret != EOK) { - usb_log_error("Failed to append to kbd/led report path.\n"); + usb_log_error("Failed to append to kbd/led report path."); usb_kbd_destroy(kbd_dev); return ret; @@ -569,10 +569,10 @@ &hid_dev->report, 0, USB_HID_REPORT_TYPE_OUTPUT); - usb_log_debug("Output report size (in items): %zu\n", + usb_log_debug("Output report size (in items): %zu", kbd_dev->led_output_size); kbd_dev->led_data = calloc(kbd_dev->led_output_size, sizeof(int32_t)); if (kbd_dev->led_data == NULL) { - usb_log_error("Error creating buffer for LED output report.\n"); + usb_log_error("Error creating buffer for LED output report."); usb_kbd_destroy(kbd_dev); return ENOMEM; @@ -588,5 +588,5 @@ kbd_dev->initialized = USB_KBD_STATUS_INITIALIZED; - usb_log_debug("HID/KBD device structure initialized.\n"); + usb_log_debug("HID/KBD device structure initialized."); return EOK; @@ -618,5 +618,5 @@ int usb_kbd_init(usb_hid_dev_t *hid_dev, void **data) { - usb_log_debug("Initializing HID/KBD structure...\n"); + usb_log_debug("Initializing HID/KBD structure..."); if (hid_dev == NULL) { @@ -627,9 +627,9 @@ /* Create the exposed function. */ - usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME); + usb_log_debug("Creating DDF function %s...", HID_KBD_FUN_NAME); ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev, fun_exposed, HID_KBD_FUN_NAME); if (fun == NULL) { - usb_log_error("Could not create DDF function node.\n"); + usb_log_error("Could not create DDF function node."); return ENOMEM; } @@ -637,5 +637,5 @@ usb_kbd_t *kbd_dev = ddf_fun_data_alloc(fun, sizeof(usb_kbd_t)); if (kbd_dev == NULL) { - usb_log_error("Failed to allocate KBD device structure.\n"); + usb_log_error("Failed to allocate KBD device structure."); ddf_fun_destroy(fun); return ENOMEM; @@ -644,5 +644,5 @@ int ret = kbd_dev_init(kbd_dev, hid_dev); if (ret != EOK) { - usb_log_error("Failed to initialize KBD device structure.\n"); + usb_log_error("Failed to initialize KBD device structure."); ddf_fun_destroy(fun); return ret; @@ -655,5 +655,5 @@ ret = ddf_fun_bind(fun); if (ret != EOK) { - usb_log_error("Could not bind DDF function: %s.\n", + usb_log_error("Could not bind DDF function: %s.", str_error(ret)); usb_kbd_destroy(kbd_dev); @@ -662,8 +662,8 @@ } - usb_log_debug("%s function created. Handle: %" PRIun "\n", + usb_log_debug("%s function created. Handle: %" PRIun "", HID_KBD_FUN_NAME, ddf_fun_get_handle(fun)); - usb_log_debug("Adding DDF function to category %s...\n", + usb_log_debug("Adding DDF function to category %s...", HID_KBD_CATEGORY_NAME); ret = ddf_fun_add_to_category(fun, HID_KBD_CATEGORY_NAME); @@ -753,8 +753,8 @@ if (kbd_dev->fun) { if (ddf_fun_unbind(kbd_dev->fun) != EOK) { - usb_log_warning("Failed to unbind %s.\n", + usb_log_warning("Failed to unbind %s.", ddf_fun_get_name(kbd_dev->fun)); } else { - usb_log_debug2("%s unbound.\n", + usb_log_debug2("%s unbound.", ddf_fun_get_name(kbd_dev->fun)); ddf_fun_destroy(kbd_dev->fun); @@ -784,5 +784,5 @@ if (rc != EOK) { - usb_log_error("Failed to parse boot report descriptor: %s\n", + usb_log_error("Failed to parse boot report descriptor: %s", str_error(rc)); return rc; Index: uspace/drv/hid/usbhid/kbd/kbdrepeat.c =================================================================== --- uspace/drv/hid/usbhid/kbd/kbdrepeat.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/kbd/kbdrepeat.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -69,10 +69,10 @@ unsigned int delay = 0; - usb_log_debug("Starting autorepeat loop.\n"); + usb_log_debug("Starting autorepeat loop."); while (true) { /* Check if the kbd structure is usable. */ if (!usb_kbd_is_initialized(kbd)) { - usb_log_warning("kbd not ready, exiting autorepeat.\n"); + usb_log_warning("kbd not ready, exiting autorepeat."); return; } @@ -82,5 +82,5 @@ if (kbd->repeat.key_new > 0) { if (kbd->repeat.key_new == kbd->repeat.key_repeated) { - usb_log_debug2("Repeating key: %u.\n", + usb_log_debug2("Repeating key: %u.", kbd->repeat.key_repeated); usb_kbd_push_ev(kbd, KEY_PRESS, @@ -88,5 +88,5 @@ delay = kbd->repeat.delay_between; } else { - usb_log_debug2("New key to repeat: %u.\n", + usb_log_debug2("New key to repeat: %u.", kbd->repeat.key_new); kbd->repeat.key_repeated = kbd->repeat.key_new; @@ -95,5 +95,5 @@ } else { if (kbd->repeat.key_repeated > 0) { - usb_log_debug2("Stopping to repeat key: %u.\n", + usb_log_debug2("Stopping to repeat key: %u.", kbd->repeat.key_repeated); kbd->repeat.key_repeated = 0; @@ -119,8 +119,8 @@ int usb_kbd_repeat_fibril(void *arg) { - usb_log_debug("Autorepeat fibril spawned.\n"); + usb_log_debug("Autorepeat fibril spawned."); if (arg == NULL) { - usb_log_error("No device!\n"); + usb_log_error("No device!"); return EINVAL; } Index: uspace/drv/hid/usbhid/main.c =================================================================== --- uspace/drv/hid/usbhid/main.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/main.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -58,8 +58,8 @@ static int usb_hid_device_add(usb_device_t *dev) { - usb_log_debug("%s\n", __FUNCTION__); + usb_log_debug("%s", __FUNCTION__); if (dev == NULL) { - usb_log_error("Wrong parameter given for add_device().\n"); + usb_log_error("Wrong parameter given for add_device()."); return EINVAL; } @@ -73,5 +73,5 @@ usb_device_data_alloc(dev, sizeof(usb_hid_dev_t)); if (hid_dev == NULL) { - usb_log_error("Failed to create USB/HID device structure.\n"); + usb_log_error("Failed to create USB/HID device structure."); return ENOMEM; } @@ -79,10 +79,10 @@ int rc = usb_hid_init(hid_dev, dev); if (rc != EOK) { - usb_log_error("Failed to initialize USB/HID device.\n"); + usb_log_error("Failed to initialize USB/HID device."); usb_hid_deinit(hid_dev); return rc; } - usb_log_debug("USB/HID device structure initialized.\n"); + usb_log_debug("USB/HID device structure initialized."); /* Start automated polling function. @@ -92,5 +92,5 @@ if (rc != EOK) { - usb_log_error("Failed to start polling fibril for `%s'.\n", + usb_log_error("Failed to start polling fibril for `%s'.", usb_device_get_name(dev)); usb_hid_deinit(hid_dev); @@ -99,5 +99,5 @@ hid_dev->running = true; - usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev)); + usb_log_info("HID device `%s' ready.", usb_device_get_name(dev)); return EOK; @@ -115,5 +115,5 @@ /* Clean up. */ usb_hid_deinit(hid_dev); - usb_log_info("%s destruction complete.\n", usb_device_get_name(dev)); + usb_log_info("%s destruction complete.", usb_device_get_name(dev)); return EOK; @@ -132,5 +132,5 @@ assert(hid_dev); - usb_log_info("Device %s removed.\n", usb_device_get_name(dev)); + usb_log_info("Device %s removed.", usb_device_get_name(dev)); return join_and_clean(dev); } @@ -148,5 +148,5 @@ assert(hid_dev); - usb_log_info("Device %s gone.\n", usb_device_get_name(dev)); + usb_log_info("Device %s gone.", usb_device_get_name(dev)); return join_and_clean(dev); } Index: uspace/drv/hid/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/hid/usbhid/mouse/mousedev.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/mouse/mousedev.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -118,11 +118,11 @@ if (mouse_dev == NULL) { - usb_log_debug("%s: Missing parameters.\n", __FUNCTION__); + usb_log_debug("%s: Missing parameters.", __FUNCTION__); async_answer_0(icallid, EINVAL); return; } - usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, ddf_fun_get_name(fun)); - usb_log_debug("%s: mouse_sess: %p\n", + usb_log_debug("%s: fun->name: %s", __FUNCTION__, ddf_fun_get_name(fun)); + usb_log_debug("%s: mouse_sess: %p", __FUNCTION__, mouse_dev->mouse_sess); @@ -132,9 +132,9 @@ if (mouse_dev->mouse_sess == NULL) { mouse_dev->mouse_sess = sess; - usb_log_debug("Console session to %s set ok (%p).\n", + usb_log_debug("Console session to %s set ok (%p).", ddf_fun_get_name(fun), sess); async_answer_0(icallid, EOK); } else { - usb_log_error("Console session to %s already set.\n", + usb_log_error("Console session to %s already set.", ddf_fun_get_name(fun)); async_answer_0(icallid, ELIMIT); @@ -142,5 +142,5 @@ } } else { - usb_log_debug("%s: Invalid function.\n", __FUNCTION__); + usb_log_debug("%s: Invalid function.", __FUNCTION__); async_answer_0(icallid, EINVAL); } @@ -171,5 +171,5 @@ if (mouse_dev->mouse_sess == NULL) { - usb_log_warning(NAME " No console session.\n"); + usb_log_warning(NAME " No console session."); return; } @@ -225,5 +225,5 @@ usb_hid_report_path_t *path = usb_hid_report_path(); if (path == NULL) { - usb_log_warning("Failed to create USB HID report path.\n"); + usb_log_warning("Failed to create USB HID report path."); return; } @@ -232,5 +232,5 @@ if (ret != EOK) { usb_hid_report_path_free(path); - usb_log_warning("Failed to add buttons to report path.\n"); + usb_log_warning("Failed to add buttons to report path."); return; } @@ -242,5 +242,5 @@ while (field != NULL) { - usb_log_debug2(NAME " VALUE(%X) USAGE(%X)\n", field->value, + usb_log_debug2(NAME " VALUE(%X) USAGE(%X)", field->value, field->usage); assert(field->usage > field->usage_minimum); @@ -331,5 +331,5 @@ if (mouse_dev->buttons == NULL) { - usb_log_error(NAME ": out of memory, giving up on device!\n"); + usb_log_error(NAME ": out of memory, giving up on device!"); free(mouse_dev); return ENOMEM; @@ -344,5 +344,5 @@ int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data) { - usb_log_debug("Initializing HID/Mouse structure...\n"); + usb_log_debug("Initializing HID/Mouse structure..."); if (hid_dev == NULL) { @@ -353,9 +353,9 @@ /* Create the exposed function. */ - usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME); + usb_log_debug("Creating DDF function %s...", HID_MOUSE_FUN_NAME); ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev, fun_exposed, HID_MOUSE_FUN_NAME); if (fun == NULL) { - usb_log_error("Could not create DDF function node `%s'.\n", + usb_log_error("Could not create DDF function node `%s'.", HID_MOUSE_FUN_NAME); return ENOMEM; @@ -364,5 +364,5 @@ usb_mouse_t *mouse_dev = ddf_fun_data_alloc(fun, sizeof(usb_mouse_t)); if (mouse_dev == NULL) { - usb_log_error("Failed to alloc HID mouse device structure.\n"); + usb_log_error("Failed to alloc HID mouse device structure."); ddf_fun_destroy(fun); return ENOMEM; @@ -371,5 +371,5 @@ int ret = mouse_dev_init(mouse_dev, hid_dev); if (ret != EOK) { - usb_log_error("Failed to init HID mouse device structure.\n"); + usb_log_error("Failed to init HID mouse device structure."); return ret; } @@ -379,5 +379,5 @@ ret = ddf_fun_bind(fun); if (ret != EOK) { - usb_log_error("Could not bind DDF function `%s': %s.\n", + usb_log_error("Could not bind DDF function `%s': %s.", ddf_fun_get_name(fun), str_error(ret)); ddf_fun_destroy(fun); @@ -385,5 +385,5 @@ } - usb_log_debug("Adding DDF function `%s' to category %s...\n", + usb_log_debug("Adding DDF function `%s' to category %s...", ddf_fun_get_name(fun), HID_MOUSE_CATEGORY); ret = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY); @@ -444,5 +444,5 @@ if (rc != EOK) { - usb_log_error("Failed to parse boot report descriptor: %s\n", + usb_log_error("Failed to parse boot report descriptor: %s", str_error(rc)); return rc; Index: uspace/drv/hid/usbhid/multimedia/multimedia.c =================================================================== --- uspace/drv/hid/usbhid/multimedia/multimedia.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/multimedia/multimedia.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -86,5 +86,5 @@ ipc_callid_t icallid, ipc_call_t *icall) { - usb_log_debug(NAME " default_connection_handler()\n"); + usb_log_debug(NAME " default_connection_handler()"); usb_multimedia_t *multim_dev = ddf_fun_data_get(fun); @@ -95,5 +95,5 @@ if (multim_dev->console_sess == NULL) { multim_dev->console_sess = sess; - usb_log_debug(NAME " Saved session to console: %p\n", + usb_log_debug(NAME " Saved session to console: %p", sess); async_answer_0(icallid, EOK); @@ -137,5 +137,5 @@ }; - usb_log_debug2(NAME " Sending key %d to the console\n", ev.key); + usb_log_debug2(NAME " Sending key %d to the console", ev.key); if (multim_dev->console_sess == NULL) { usb_log_warning( @@ -149,5 +149,5 @@ async_exchange_end(exch); } else { - usb_log_warning("Failed to send multimedia key.\n"); + usb_log_warning("Failed to send multimedia key."); } } @@ -159,5 +159,5 @@ } - usb_log_debug(NAME " Initializing HID/multimedia structure...\n"); + usb_log_debug(NAME " Initializing HID/multimedia structure..."); /* Create the exposed function. */ @@ -165,5 +165,5 @@ hid_dev->usb_dev, fun_exposed, NAME); if (fun == NULL) { - usb_log_error("Could not create DDF function node.\n"); + usb_log_error("Could not create DDF function node."); return ENOMEM; } @@ -184,5 +184,5 @@ int rc = ddf_fun_bind(fun); if (rc != EOK) { - usb_log_error("Could not bind DDF function: %s.\n", + usb_log_error("Could not bind DDF function: %s.", str_error(rc)); ddf_fun_destroy(fun); @@ -190,5 +190,5 @@ } - usb_log_debug(NAME " function created (handle: %" PRIun ").\n", + usb_log_debug(NAME " function created (handle: %" PRIun ").", ddf_fun_get_handle(fun)); @@ -199,5 +199,5 @@ str_error(rc)); if (ddf_fun_unbind(fun) != EOK) { - usb_log_error("Failed to unbind %s, won't destroy.\n", + usb_log_error("Failed to unbind %s, won't destroy.", ddf_fun_get_name(fun)); } else { @@ -210,5 +210,5 @@ *data = fun; - usb_log_debug(NAME " HID/multimedia structure initialized.\n"); + usb_log_debug(NAME " HID/multimedia structure initialized."); return EOK; } @@ -224,8 +224,8 @@ async_hangup(multim_dev->console_sess); if (ddf_fun_unbind(fun) != EOK) { - usb_log_error("Failed to unbind %s, won't destroy.\n", + usb_log_error("Failed to unbind %s, won't destroy.", ddf_fun_get_name(fun)); } else { - usb_log_debug2("%s unbound.\n", ddf_fun_get_name(fun)); + usb_log_debug2("%s unbound.", ddf_fun_get_name(fun)); /* This frees multim_dev too as it was stored in * fun->data */ @@ -266,5 +266,5 @@ while (field != NULL) { if (field->value != 0) { - usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n", + usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)", field->value, field->usage); const unsigned key = @@ -272,5 +272,5 @@ const char *key_str = usbhid_multimedia_usage_to_str(field->usage); - usb_log_info("Pressed key: %s\n", key_str); + usb_log_info("Pressed key: %s", key_str); usb_multimedia_push_ev(multim_dev, KEY_PRESS, key); } Index: uspace/drv/hid/usbhid/usbhid.c =================================================================== --- uspace/drv/hid/usbhid/usbhid.c (revision 745a3f1cffba149c167b6eaa37f53857d4ec024d) +++ uspace/drv/hid/usbhid/usbhid.c (revision d2c3dcd880ba1b8f4263eddeaae18bcc6c072bd9) @@ -134,5 +134,5 @@ usb_hid_report_path_t *usage_path = usb_hid_report_path(); if (usage_path == NULL) { - usb_log_debug("Failed to create usage path.\n"); + usb_log_debug("Failed to create usage path."); return false; } @@ -143,5 +143,5 @@ mapping->usage_path[i].usage_page, mapping->usage_path[i].usage) != EOK) { - usb_log_debug("Failed to append to usage path.\n"); + usb_log_debug("Failed to append to usage path."); usb_hid_report_path_free(usage_path); return false; @@ -149,5 +149,5 @@ } - usb_log_debug("Compare flags: %d\n", mapping->compare); + usb_log_debug("Compare flags: %d", mapping->compare); bool matches = false; @@ -155,5 +155,5 @@ do { - usb_log_debug("Trying report id %u\n", report_id); + usb_log_debug("Trying report id %u", report_id); if (report_id != 0) { usb_hid_report_path_set_report_id(usage_path, @@ -166,5 +166,5 @@ USB_HID_REPORT_TYPE_INPUT); - usb_log_debug("Field: %p\n", field); + usb_log_debug("Field: %p", field); if (field != NULL) { @@ -243,5 +243,5 @@ mapping->product_id); if (usb_hid_ids_match(hid_dev, mapping)) { - usb_log_debug("IDs matched.\n"); + usb_log_debug("IDs matched."); matched = true; } @@ -250,5 +250,5 @@ /* Check usage match. */ if (mapping->usage_path != NULL) { - usb_log_debug("Comparing device against usage path.\n"); + usb_log_debug("Comparing device against usage path."); if (usb_hid_path_matches(hid_dev, mapping)) { /* Does not matter if IDs were matched. */ @@ -258,5 +258,5 @@ if (matched) { - usb_log_debug("Subdriver matched.\n"); + usb_log_debug("Subdriver matched."); subdrivers[count++] = &mapping->subdriver; } @@ -285,5 +285,5 @@ usb_device_get_mapped_ep_desc(dev, endpoints[i].desc); if (epm && epm->present) { - usb_log_debug("Found: %s.\n", endpoints[i].description); + usb_log_debug("Found: %s.", endpoints[i].description); hid_dev->poll_pipe_mapping = epm; return EOK; @@ -301,16 +301,16 @@ do { - usb_log_debug("Getting size of the report.\n"); + usb_log_debug("Getting size of the report."); const size_t size = usb_hid_report_byte_size(&hid_dev->report, report_id, USB_HID_REPORT_TYPE_INPUT); - usb_log_debug("Report ID: %u, size: %zu\n", report_id, size); + usb_log_debug("Report ID: %u, size: %zu", report_id, size); max_size = (size > max_size) ? size : max_size; - usb_log_debug("Getting next report ID\n"); + usb_log_debug("Getting next report ID"); report_id = usb_hid_get_next_report_id(&hid_dev->report, report_id, USB_HID_REPORT_TYPE_INPUT); } while (report_id != 0); - usb_log_debug("Max size of input report: %zu\n", max_size); + usb_log_debug("Max size of input report: %zu", max_size); assert(hid_dev->input_report == NULL); @@ -329,5 +329,5 @@ { if (dev == NULL || arg == NULL || buffer == NULL) { - usb_log_error("Missing arguments to polling callback.\n"); + usb_log_error("Missing arguments to polling callback."); return false; } @@ -336,5 +336,5 @@ assert(hid_dev->input_report != NULL); - usb_log_debug("New data [%zu/%zu]: %s\n", buffer_size, + usb_log_debug("New data [%zu/%zu]: %s", buffer_size, hid_dev->max_input_report_size, usb_debug_str_buffer(buffer, buffer_size, 0)); @@ -419,5 +419,5 @@ assert(dev); - usb_log_debug("Initializing HID structure...\n"); + usb_log_debug("Initializing HID structure..."); usb_hid_report_init(&hid_dev->report); @@ -441,10 +441,10 @@ usb_hid_find_subdrivers(hid_dev); } else { - usb_log_error("Failed to parse report descriptor: fallback.\n"); + usb_log_error("Failed to parse report descriptor: fallback."); hid_dev->subdrivers = NULL; hid_dev->subdriver_count = 0; } - usb_log_debug("Subdriver count(before trying boot protocol): %d\n", + usb_log_debug("Subdriver count(before trying boot protocol): %d", hid_dev->subdriver_count); @@ -457,5 +457,5 @@ switch (hid_dev->poll_pipe_mapping->interface->interface_protocol) { case USB_HID_PROTOCOL_KEYBOARD: - usb_log_info("Falling back to kbd boot protocol.\n"); + usb_log_info("Falling back to kbd boot protocol."); rc = usb_kbd_set_boot_protocol(hid_dev); if (rc == EOK) { @@ -464,5 +464,5 @@ break; case USB_HID_PROTOCOL_MOUSE: - usb_log_info("Falling back to mouse boot protocol.\n"); + usb_log_info("Falling back to mouse boot protocol."); rc = usb_mouse_set_boot_protocol(hid_dev); if (rc == EOK) { @@ -471,10 +471,10 @@ break; default: - usb_log_info("Falling back to generic HID driver.\n"); + usb_log_info("Falling back to generic HID driver."); usb_hid_set_generic_hid_subdriver(hid_dev); } } - usb_log_debug("Subdriver count(after trying boot protocol): %d\n", + usb_log_debug("Subdriver count(after trying boot protocol): %d", hid_dev->subdriver_count); @@ -491,5 +491,5 @@ for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) { if (hid_dev->subdrivers[i].init != NULL) { - usb_log_debug("Initializing subdriver %d.\n",i); + usb_log_debug("Initializing subdriver %d.",i); const int pret = hid_dev->subdrivers[i].init(hid_dev, &hid_dev->subdrivers[i].data); @@ -514,5 +514,5 @@ rc = usb_hid_init_report(hid_dev); if (rc != EOK) { - usb_log_error("Failed to initialize input report buffer: %s\n", str_error(rc)); + usb_log_error("Failed to initialize input report buffer: %s", str_error(rc)); // FIXME: What happens now? } @@ -520,5 +520,5 @@ usb_polling_t *polling = &hid_dev->polling; if ((rc = usb_polling_init(polling))) { - usb_log_error("Failed to initialize polling: %s\n", str_error(rc)); + usb_log_error("Failed to initialize polling: %s", str_error(rc)); // FIXME: What happens now? } @@ -555,5 +555,5 @@ usb_polling_fini(&hid_dev->polling); - usb_log_debug("Subdrivers: %p, subdriver count: %d\n", + usb_log_debug("Subdrivers: %p, subdriver count: %d", hid_dev->subdrivers, hid_dev->subdriver_count);