Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge changes from master into get-descriptor branch #465

Merged
merged 6 commits into from
Oct 15, 2022
Merged

Merge changes from master into get-descriptor branch #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f45df3b
Add configure~ to .gitignore (#459)
nkh-lab Sep 15, 2022
4e63d6d
Introduce HID_API_MAX_REPORT_DESCRIPTOR_SIZE (#452)
Youw Sep 15, 2022
5ce9051
libusb: stop `read_thread` from looping indefinitely (#457)
thesilvanator Sep 28, 2022
f2e2b5b
macOS: Error reporting/`hid_error` implementation (#314)
hardkrash Oct 14, 2022
795fe85
Merge remote-tracking branch 'upstream/master' into get-descriptor
JoergAtGithub Oct 15, 2022
c8061df
Added two register_device_error statements for hid_get_report_descrip…
JoergAtGithub Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ar-lib
autom4te.cache/
config.*
configure
configure~
compile
depcomp
install-sh
Expand Down
15 changes: 10 additions & 5 deletions libusb/hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,14 +592,14 @@ static int hid_get_report_descriptor_libusb(libusb_device_handle *handle, int in
*/
static void fill_device_info_usage(struct hid_device_info *cur_dev, libusb_device_handle *handle, int interface_num, uint16_t expected_report_descriptor_size)
{
unsigned char hid_report[HID_API_MAX_REPORT_DESCRIPTOR_SIZE];
unsigned char hid_report_descriptor[HID_API_MAX_REPORT_DESCRIPTOR_SIZE];
unsigned short page = 0, usage = 0;

int res = hid_get_report_descriptor_libusb(handle, interface_num, expected_report_descriptor_size, hid_report, sizeof(hid_report));
int res = hid_get_report_descriptor_libusb(handle, interface_num, expected_report_descriptor_size, hid_report_descriptor, sizeof(hid_report_descriptor));
if (res >= 0) {
/* Parse the usage and usage page
out of the report descriptor. */
get_usage(hid_report, res, &page, &usage);
get_usage(hid_report_descriptor, res, &page, &usage);
}

cur_dev->usage_page = page;
Expand Down Expand Up @@ -967,6 +967,7 @@ static void read_callback(struct libusb_transfer *transfer)

static void *read_thread(void *param)
{
int res;
hid_device *dev = param;
uint8_t *buf;
const size_t length = dev->input_ep_max_packet_size;
Expand All @@ -985,14 +986,18 @@ static void *read_thread(void *param)

/* Make the first submission. Further submissions are made
from inside read_callback() */
libusb_submit_transfer(dev->transfer);
res = libusb_submit_transfer(dev->transfer);
if(res < 0) {
LOG("libusb_submit_transfer failed: %d %s. Stopping read_thread from running\n", res, libusb_error_name(res));
dev->shutdown_thread = 1;
dev->transfer_loop_finished = 1;
}

/* Notify the main thread that the read thread is up and running. */
pthread_barrier_wait(&dev->barrier);

/* Handle all the events. */
while (!dev->shutdown_thread) {
int res;
res = libusb_handle_events(usb_context);
if (res < 0) {
/* There was an error. */
Expand Down
Loading