Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 3f162ab in mainline


Ignore:
Timestamp:
2011-12-05T20:34:52Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
f167f55
Parents:
c3887ad
Message:

usb: Use macros from macros.h header.

Location:
uspace
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/ohci/ohci_batch.c

    rc3887ad r3f162ab  
    3434#include <errno.h>
    3535#include <str_error.h>
     36#include <macros.h>
    3637
    3738#include <usb/usb.h>
     
    295296        while (remain_size > 0) {
    296297                const size_t transfer_size =
    297                     remain_size > OHCI_TD_MAX_TRANSFER ?
    298                     OHCI_TD_MAX_TRANSFER : remain_size;
     298                    min(remain_size, OHCI_TD_MAX_TRANSFER);
    299299                toggle = 1 - toggle;
    300300
  • uspace/drv/bus/usb/uhci/uhci_batch.c

    rc3887ad r3f162ab  
    3434#include <errno.h>
    3535#include <str_error.h>
     36#include <macros.h>
    3637
    3738#include <usb/usb.h>
     
    237238
    238239        while (remain_size > 0) {
    239                 const size_t packet_size =
    240                     (remain_size < mps) ? remain_size : mps;
     240                const size_t packet_size = min(remain_size, mps);
    241241
    242242                const td_t *next_td = (td + 1 < uhci_batch->td_count)
     
    309309
    310310        while (remain_size > 0) {
    311                 const size_t packet_size =
    312                     (remain_size < mps) ? remain_size : mps;
     311                const size_t packet_size = min(remain_size, mps);
    313312
    314313                td_init(
  • uspace/lib/usbhost/src/usb_transfer_batch.c

    rc3887ad r3f162ab  
    3434#include <errno.h>
    3535#include <str_error.h>
     36#include <macros.h>
    3637
    3738#include <usb/usb.h>
     
    146147                /* We care about the data and there are some to copy */
    147148                if (data) {
    148                         const size_t min_size = size < instance->buffer_size
    149                             ? size : instance->buffer_size;
    150                         memcpy(instance->buffer, data, min_size);
     149                        const size_t minsize = min(size, instance->buffer_size);
     150                        memcpy(instance->buffer, data, minsize);
    151151                }
    152152                instance->callback_in(instance->fun, instance->error,
Note: See TracChangeset for help on using the changeset viewer.