Changeset 95c675b in mainline for uspace/lib/usb

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

Location:

uspace/lib/usb

Files:

• include/usb/usb.h (modified) (1 diff)
• src/usb.c (modified) (2 diffs)

uspace/lib/usb/include/usb/usb.h

@@ -35 +35 @@
 #define LIBUSB_USB_H_
 
+#include <byteorder.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <byteorder.h>
+#include <types/common.h>
 
 /** Convert 16bit value from native (host) endianness to USB endianness. */

uspace/lib/usb/src/usb.c

@@ -74 +74 @@
 const char *usb_str_transfer_type(usb_transfer_type_t t)
 {
-        if (t >= ARRAY_SIZE(str_transfer_type)) {
+        if ((size_t)t >= ARRAY_SIZE(str_transfer_type)) {
                 return "invalid";
         }
@@ -87 +87 @@
 const char *usb_str_transfer_type_short(usb_transfer_type_t t)
 {
-        if (t >= ARRAY_SIZE(str_transfer_type_short)) {
+        if ((size_t)t >= ARRAY_SIZE(str_transfer_type_short)) {
                 return "invl";
         }