Changeset 3f162ab in mainline

Timestamp:

2011-12-05T20:34:52Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f167f55

Parents:

c3887ad

Message:

usb: Use macros from macros.h header.

Location:

uspace

Files:

• drv/bus/usb/ohci/ohci_batch.c (modified) (2 diffs)
• drv/bus/usb/uhci/uhci_batch.c (modified) (3 diffs)
• lib/usbhost/src/usb_transfer_batch.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
+#include <macros.h>
 
 #include <usb/usb.h>
@@ -295 +296 @@
         while (remain_size > 0) {
                 const size_t transfer_size =
-                    remain_size > OHCI_TD_MAX_TRANSFER ?
-                    OHCI_TD_MAX_TRANSFER : remain_size;
+                    min(remain_size, OHCI_TD_MAX_TRANSFER);
                 toggle = 1 - toggle;
 

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
+#include <macros.h>
 
 #include <usb/usb.h>
@@ -237 +238 @@
 
         while (remain_size > 0) {
-                const size_t packet_size =
-                    (remain_size < mps) ? remain_size : mps;
+                const size_t packet_size = min(remain_size, mps);
 
                 const td_t *next_td = (td + 1 < uhci_batch->td_count)
@@ -309 +309 @@
 
         while (remain_size > 0) {
-                const size_t packet_size =
-                    (remain_size < mps) ? remain_size : mps;
+                const size_t packet_size = min(remain_size, mps);
 
                 td_init(

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
+#include <macros.h>
 
 #include <usb/usb.h>
@@ -146 +147 @@
                 /* We care about the data and there are some to copy */
                 if (data) {
-                        const size_t min_size = size < instance->buffer_size
-                            ? size : instance->buffer_size;
-                        memcpy(instance->buffer, data, min_size);
+                        const size_t minsize = min(size, instance->buffer_size);
+                        memcpy(instance->buffer, data, minsize);
                 }
                 instance->callback_in(instance->fun, instance->error,