summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaofan Chen <xiaofanc@gmail.com>2010-07-29 13:30:48 +0100
committerXiaofan Chen <xiaofanc@gmail.com>2010-07-29 13:30:48 +0100
commit9a515b7da416c057c1fca8bb9b6318184aa742b2 (patch)
tree469bbd3168977c07e300306e1d7412139248e64f
parentf0c40ad8113f672269cf1a65d9c2b73d35b907b2 (diff)
downloadlibusb-9a515b7da416c057c1fca8bb9b6318184aa742b2.tar.gz
fixed inconsistencies between prototypes and declarationspbr286
-rw-r--r--libusb/libusb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libusb/libusb.h b/libusb/libusb.h
index d195ff2..7e31b60 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -1157,8 +1157,8 @@ static inline unsigned char *libusb_get_iso_packet_buffer_simple(
/* sync I/O */
LIBUSB_EXP int LIBUSB_API libusb_control_transfer(libusb_device_handle *dev_handle,
- uint8_t request_type, uint8_t request, uint16_t value, uint16_t index,
- unsigned char *data, uint16_t length, unsigned int timeout);
+ uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
+ unsigned char *data, uint16_t wLength, unsigned int timeout);
LIBUSB_EXP int LIBUSB_API libusb_bulk_transfer(libusb_device_handle *dev_handle,
unsigned char endpoint, unsigned char *data, int length,
@@ -1211,7 +1211,7 @@ static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
}
LIBUSB_EXP int LIBUSB_API libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
- uint8_t index, unsigned char *data, int length);
+ uint8_t desc_index, unsigned char *data, int length);
/* polling and timeouts */