Skip to content

Rebase to libusb/connection-callback #1

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.

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

Closed
wants to merge 6 commits into from

Conversation

andyvorld
Copy link

PR to rebase device_notify onto the new https://github.com/libusb/hidapi/tree/connection-callback.

Mainly a straight copy + paste job to get the minimal example to compile, and two modifications.

  • In interface_notify_callback, the device path is no longer normalized and uses hid_internal_UTF16toUTF8 instead of wcstombs
  • In hid_hotplug_deregister_callback hotplug_cb->handle was changed to (*current)->handle to address a nullptr access from Add hotplug support libusb/hidapi#238 (comment).

@Youw
Copy link

Youw commented Apr 18, 2023

please resolve conflicts - otherwise it will be impossible to merge anyway

@andyvorld
Copy link
Author

andyvorld commented Apr 18, 2023

I thought it would be a reset to my branch's head? As the device_notify branch was rebased so there are no easy common ancestors.
I can still try to resolve the conflicts if its meant to be merged in.

@andyvorld andyvorld changed the title Device notify Rebase to libusb/connection-callback Apr 18, 2023
@DJm00n
Copy link
Owner

DJm00n commented Apr 18, 2023

@andyvorld thank you for your work. I have manually rebased my changes under current upstream/master branch and also cherry-picked your b864213 fix.
Also, your 80e3e01 change was a bit broken - so I did proper changes instead while rebasing.

I've done this to avoid unnecessary noise in the git history.

@DJm00n DJm00n closed this Apr 18, 2023
@andyvorld andyvorld deleted the device_notify branch November 15, 2023 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants