CTCaer/hidapi
1
0
Fork 0
mirror of https://github.com/CTCaer/hidapi.git synced 2024-11-23 18:19:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't send the report number if it's not needed for feature and output reports.

Browse Source
This commit is contained in:
Alan Ott 2010-08-16 23:32:20 -04:00
parent 461963e4b7
commit 89d84b1e02
1 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
linux/hid-libusb.c
View File

@ -529,12 +529,22 @@ hid_device * HID_API_EXPORT hid_open_path(const char *path)
int HID_API_EXPORT hid_write(hid_device *dev, const unsigned char *data, size_t length) int HID_API_EXPORT hid_write(hid_device *dev, const unsigned char *data, size_t length)
{ {
int res; int res;
int report_number = data[0];
int skipped_report_id = 0;
if (report_number == 0x0) {
data++;
length--;
skipped_report_id = 1;
}
if (dev->output_endpoint <= 0) { if (dev->output_endpoint <= 0) {
/* No interrput out endpoint. Use the Control Endpoint */ /* No interrput out endpoint. Use the Control Endpoint */
res = libusb_control_transfer(dev->device_handle, res = libusb_control_transfer(dev->device_handle,
LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE|LIBUSB_ENDPOINT_OUT, LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE|LIBUSB_ENDPOINT_OUT,
0x09/*HID Set_Report*/, 0x09/*HID Set_Report*/,
(2/*HID output*/ << 8) | *data, (2/*HID output*/ << 8) | report_number,
dev->interface, dev->interface,
(unsigned char *)data, length, (unsigned char *)data, length,
1000/*timeout millis*/); 1000/*timeout millis*/);
@ -542,6 +552,9 @@ int HID_API_EXPORT hid_write(hid_device *dev, const unsigned char *data, size_t
if (res < 0) if (res < 0)
return -1; return -1;
if (skipped_report_id)
length++;
return length; return length;
} }
else { else {
@ -553,10 +566,13 @@ int HID_API_EXPORT hid_write(hid_device *dev, const unsigned char *data, size_t
length, length,
&actual_length, 1000); &actual_length, 1000);
if (res == 0) if (res < 0)
return actual_length;
else
return -1; return -1;
if (skipped_report_id)
actual_length++;
return actual_length;
} }
} }
@ -621,11 +637,19 @@ int HID_API_EXPORT hid_set_nonblocking(hid_device *dev, int nonblock)
int HID_API_EXPORT hid_send_feature_report(hid_device *dev, const unsigned char *data, size_t length) int HID_API_EXPORT hid_send_feature_report(hid_device *dev, const unsigned char *data, size_t length)
{ {
int res = -1; int res = -1;
int skipped_report_id = 0;
int report_number = data[0];
if (report_number == 0x0) {
data++;
length--;
skipped_report_id = 1;
}
res = libusb_control_transfer(dev->device_handle, res = libusb_control_transfer(dev->device_handle,
LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE|LIBUSB_ENDPOINT_OUT, LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE|LIBUSB_ENDPOINT_OUT,
0x09/*HID set_report*/, 0x09/*HID set_report*/,
(3/*HID feature*/ << 8) | *data, (3/*HID feature*/ << 8) | report_number,
dev->interface, dev->interface,
(unsigned char *)data, length, (unsigned char *)data, length,
1000/*timeout millis*/); 1000/*timeout millis*/);
@ -633,23 +657,39 @@ int HID_API_EXPORT hid_send_feature_report(hid_device *dev, const unsigned char
if (res < 0) if (res < 0)
return -1; return -1;
/* Account for the report ID */
if (skipped_report_id)
length++;
return length; return length;
} }
int HID_API_EXPORT hid_get_feature_report(hid_device *dev, unsigned char *data, size_t length) int HID_API_EXPORT hid_get_feature_report(hid_device *dev, unsigned char *data, size_t length)
{ {
int res = -1; int res = -1;
int skipped_report_id = 0;
int report_number = data[0];
if (report_number == 0x0) {
/* Offset the return buffer by 1, so that the report ID
will remain in byte 0. */
data++;
length--;
skipped_report_id = 1;
}
res = libusb_control_transfer(dev->device_handle, res = libusb_control_transfer(dev->device_handle,
LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE|LIBUSB_ENDPOINT_IN, LIBUSB_REQUEST_TYPE_CLASS|LIBUSB_RECIPIENT_INTERFACE|LIBUSB_ENDPOINT_IN,
0x01/*HID get_report*/, 0x01/*HID get_report*/,
(3/*HID feature*/ << 8) | *data, (3/*HID feature*/ << 8) | report_number,
dev->interface, dev->interface,
(unsigned char *)data, length, (unsigned char *)data, length,
1000/*timeout millis*/); 1000/*timeout millis*/);
if (res < 0) if (res < 0)
return -1; return -1;
if (skipped_report_id)
res++;
return res; return res;
} }