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

merged 6 commits into from
Oct 15, 2022

Conversation

JoergAtGithub
Copy link
Contributor

This PR:

  • resolves the merge conflict
  • Adds two register_device_error statements for hid_get_report_descriptor on mac

nkh-lab and others added 6 commits September 15, 2022 13:01
@nkh-lab
Add configure~ to .gitignore (libusb#459)
f45df3b
@Youw
Introduce HID_API_MAX_REPORT_DESCRIPTOR_SIZE (libusb#452)
4e63d6d 
- first step is to use HID_API_MAX_REPORT_DESCRIPTOR_SIZE internally;
- port a few improvements from get-descriptor branch early;

Resolves: libusb#384
@thesilvanator
libusb: stop read_thread from looping indefinitely (libusb#457)
5ce9051 
- When `libusb_submit_transfer` in `read_thread` fails, `read_callback` never gets called and never sets `transfer_loop_finished` to true, causing `read_thread` to loop indefinitely;

- Do not attempt to run a read loop if the initial `libusb_submit_transfer` fails fixes the issue;

Fixes: libusb#456
@hardkrash
macOS: Error reporting/hid_error implementation (libusb#314)
f2e2b5b
@JoergAtGithub
Merge remote-tracking branch 'upstream/master' into get-descriptor
795fe85
@JoergAtGithub
Added two register_device_error statements for hid_get_report_descrip…
c8061df 
…tor on mac
@JoergAtGithub JoergAtGithub changed the title Merge changes master into get-descriptor branch Merge changes from master into get-descriptor branch Oct 15, 2022
@Youw Youw merged commit b246f67 into libusb:get-descriptor Oct 15, 2022
@JoergAtGithub JoergAtGithub deleted the get-descriptor branch October 15, 2022 22:41
@mcuee mcuee added enhancement New feature or request macOS Related to macOS backend libusb Related to libusb backend labels Dec 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Youw Youw Youw approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request libusb Related to libusb backend macOS Related to macOS backend
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@JoergAtGithub @Youw @mcuee @nkh-lab @thesilvanator @hardkrash