Skip to content

Fix macOS device detection by loading libusb drivers alongside native drivers #698

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

Open
ajpeng wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Fix macOS device detection by loading libusb drivers alongside native drivers #698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pmca/commands/usb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@ def importDriver(driverName=None):
raise Exception('Unknown driver')

# Fallback to libusb
if MscContext is None or (driverName is None and sys.platform == 'win32'):
if MscContext is None or (driverName is None and sys.platform in ('win32', 'darwin')):
from ..usb.driver.generic.libusb import MscContext as MscContext2
if MtpContext is None or (driverName is None and sys.platform == 'win32'):
if MtpContext is None or (driverName is None and sys.platform in ('win32', 'darwin')):
from ..usb.driver.generic.libusb import MtpContext as MtpContext2
if (VendorSpecificContext is None and driverName != 'qemu') or (driverName is None and sys.platform == 'win32'):
if (VendorSpecificContext is None and driverName != 'qemu') or (driverName is None and sys.platform in ('win32', 'darwin')):
from ..usb.driver.generic.libusb import VendorSpecificContext as VendorSpecificContext2

drivers = [context() for context in [MscContext, MtpContext, VendorSpecificContext, MscContext2, MtpContext2, VendorSpecificContext2] if context]
Expand Down