Changeset a1732929 in mainline for uspace/drv/bus/usb/usbdiag/tests.c


Ignore:
Timestamp:
2018-01-15T17:04:34Z (6 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9ff99e8
Parents:
c1a966e
git-author:
Ondřej Hlavatý <aearsis@…> (2018-01-15 17:04:32)
git-committer:
Ondřej Hlavatý <aearsis@…> (2018-01-15 17:04:34)
Message:

usb: unified logging

Use logger instead of printf. Logger adds newlines automatically.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbdiag/tests.c

    rc1a966e ra1732929  
    6868                while (remaining > 0) {
    6969                        if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
    70                                 usb_log_error("Read of %s IN endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
     70                                usb_log_error("Read of %s IN endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
    7171                                break;
    7272                        }
    7373
    7474                        if (transferred > remaining) {
    75                                 usb_log_error("Read of %s IN endpoint returned more data than expected.\n", usb_str_transfer_type(pipe->desc.transfer_type));
     75                                usb_log_error("Read of %s IN endpoint returned more data than expected.", usb_str_transfer_type(pipe->desc.transfer_type));
    7676                                rc = EINVAL;
    7777                                break;
     
    121121                // Write buffer to device.
    122122                if ((rc = usb_pipe_write(pipe, buffer, size))) {
    123                         usb_log_error("Write to %s OUT endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
     123                        usb_log_error("Write to %s OUT endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
    124124                        break;
    125125                }
     
    169169                while (remaining > 0) {
    170170                        if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
    171                                 usb_log_error("Read of %s IN endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
     171                                usb_log_error("Read of %s IN endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
    172172                                break;
    173173                        }
    174174
    175175                        if (transferred > remaining) {
    176                                 usb_log_error("Read of %s IN endpoint returned more data than expected.\n", usb_str_transfer_type(pipe->desc.transfer_type));
     176                                usb_log_error("Read of %s IN endpoint returned more data than expected.", usb_str_transfer_type(pipe->desc.transfer_type));
    177177                                rc = EINVAL;
    178178                                break;
     
    187187                for (size_t i = 0; i < size; i += sizeof(test_data)) {
    188188                        if (*(uint32_t *)(buffer + i) != test_data) {
    189                                 usb_log_error("Read of %s IN endpoint returned invald data at address %lu.\n", usb_str_transfer_type(pipe->desc.transfer_type), i);
     189                                usb_log_error("Read of %s IN endpoint returned invald data at address %lu.", usb_str_transfer_type(pipe->desc.transfer_type), i);
    190190                                rc = EINVAL;
    191191                                break;
     
    238238                // Write buffer to device.
    239239                if ((rc = usb_pipe_write(pipe, buffer, size))) {
    240                         usb_log_error("Write to %s OUT endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
     240                        usb_log_error("Write to %s OUT endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
    241241                        break;
    242242                }
Note: See TracChangeset for help on using the changeset viewer.