Changeset da9d6ca in mainline


Ignore:
Timestamp:
2018-01-31T17:17:57Z (7 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0247bd2
Parents:
4e17d54
Message:

usbdiag: use the dma pipe operations

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/usbdiag/tests.c

    r4e17d54 rda9d6ca  
    4949                return EBADMEM;
    5050
    51         char *buffer = (char *) malloc(size);
     51        char *buffer = usb_pipe_alloc_buffer(pipe, size);
    5252        if (!buffer)
    5353                return ENOMEM;
    … …  
    6767
    6868                while (remaining > 0) {
    69                         if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
     69                        if ((rc = usb_pipe_read_dma(pipe, buffer + size - remaining, remaining, &transferred))) {
    7070                                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;
    … …  
    9292        usb_log_info("Burst test on %s IN endpoint completed in %lu ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
    9393
    94         free(buffer);
     94        usb_pipe_free_buffer(pipe, buffer);
    9595        if (duration)
    9696                *duration = in_duration;
    … …  
    104104                return EBADMEM;
    105105
    106         char *buffer = (char *) malloc(size);
     106        char *buffer = usb_pipe_alloc_buffer(pipe, size);
    107107        if (!buffer)
    108108                return ENOMEM;
    … …  
    120120        for (int i = 0; i < cycles; ++i) {
    121121                // Write buffer to device.
    122                 if ((rc = usb_pipe_write(pipe, buffer, size))) {
     122                if ((rc = usb_pipe_write_dma(pipe, buffer, size))) {
    123123                        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;
    … …  
    133133        usb_log_info("Burst test on %s OUT endpoint completed in %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
    134134
    135         free(buffer);
     135        usb_pipe_free_buffer(pipe, buffer);
    136136        if (duration)
    137137                *duration = in_duration;
    … …  
    152152                return EINVAL;
    153153
    154         char *buffer = (char *) malloc(size);
     154        char *buffer = usb_pipe_alloc_buffer(pipe, size);
    155155        if (!buffer)
    156156                return ENOMEM;
    … …  
    170170
    171171                while (remaining > 0) {
    172                         if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
     172                        if ((rc = usb_pipe_read_dma(pipe, buffer + size - remaining, remaining, &transferred))) {
    173173                                usb_log_error("Read of %s IN endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
    174174                                break;
    … …  
    208208        usb_log_info("Data test on %s IN endpoint completed in %lu ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
    209209
    210         free(buffer);
     210        usb_pipe_free_buffer(pipe, buffer);
    211211        if (duration)
    212212                *duration = in_duration;
    … …  
    225225                return EINVAL;
    226226
    227         char *buffer = (char *) malloc(size);
     227        char *buffer = usb_pipe_alloc_buffer(pipe, size);
    228228        if (!buffer)
    229229                return ENOMEM;
    … …  
    243243        for (int i = 0; i < cycles; ++i) {
    244244                // Write buffer to device.
    245                 if ((rc = usb_pipe_write(pipe, buffer, size))) {
     245                if ((rc = usb_pipe_write_dma(pipe, buffer, size))) {
    246246                        usb_log_error("Write to %s OUT endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
    247247                        break;
    … …  
    256256        usb_log_info("Data test on %s OUT endpoint completed in %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
    257257
    258         free(buffer);
     258        usb_pipe_free_buffer(pipe, buffer);
    259259        if (duration)
    260260                *duration = in_duration;
Note: See TracChangeset for help on using the changeset viewer.