libusb 1.0.26rc4__zip → 1.0.27.post1__zip

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/.readthedocs.yml

@@ -2,7 +2,7 @@ version: 2
 build:
   os: "ubuntu-22.04"
   tools:
-    python: "3.11"
+    python: "3.12"
 python:
   install:
     - method: pip

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/CHANGES.rst

@@ -1,6 +1,29 @@
 Changelog
 =========
 
+1.0.27.post1 (2024-08-13)
+-------------------------
+- Add support for Python 3.13
+- Setup (dependencies) update.
+- Improvements and cleanup for win32.
+- Source code refactoring and cleanup.
+
+1.0.27 (2024-02-05)
+-------------------
+- | The API has been fully updated to version 1.0.27 (libusb v.1.0.27
+  | is fully backward compatible with v.1.0.26).
+- | For Windows the shared library binaries have been updated to version
+  | 1.0.27. For Linux and macOS, the shared library binaries remain at
+  | version 1.0.26.
+- Bugfixes for options -i and -w in examples/xusb.py
+
+1.0.26 (2024-02-05)
+-------------------
+- | The API has been partially updated to version 1.0.27, but still
+  | only supports version 1.0.26.
+- Improvements and some little bugfixes.
+- Examples and tests are upgraded to 1.0.27.
+
 1.0.26rc4 (2024-01-25)
 ----------------------
 - Setup update (now based on tox >= 4.0).

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/MANIFEST.in

@@ -1,6 +1,5 @@
 # Copyright (c) 2016 Adam Karpierz
-# Licensed under the zlib/libpng License
-# https://opensource.org/license/zlib
+# SPDX-License-Identifier: Zlib
 
 include README.rst
 include CHANGES.rst

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libusb
-Version: 1.0.26rc4
+Version: 1.0.27.post1
 Summary: Python binding for the libusb C library.
 Author: Adam Karpierz
 Author-email: adam@karpierz.net
@@ -26,27 +26,28 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <4.0.0,>=3.8.1
+Requires-Python: <4.0.0,>=3.8.10
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
-Requires-Dist: setuptools>=68.2.2
-Requires-Dist: pkg-about>=1.1.5
+Requires-Dist: setuptools>=72.2.0
+Requires-Dist: pkg-about>=1.1.8
 Provides-Extra: doc
 Requires-Dist: Sphinx>=7.1.2; extra == "doc"
-Requires-Dist: sphinx-toolbox>=3.5.0; extra == "doc"
-Requires-Dist: sphinx-tabs>=3.4.1; extra == "doc"
-Requires-Dist: sphinx-copybutton>=0.5.1; extra == "doc"
-Requires-Dist: sphinxcontrib-spelling>=7.7.0; extra == "doc"
-Requires-Dist: sphinx-lint>=0.6.7; extra == "doc"
+Requires-Dist: sphinx-toolbox>=3.7.0; extra == "doc"
+Requires-Dist: sphinx-tabs>=3.4.5; extra == "doc"
+Requires-Dist: sphinx-copybutton>=0.5.2; extra == "doc"
+Requires-Dist: sphinxcontrib-spelling>=8.0.0; extra == "doc"
+Requires-Dist: sphinx-lint>=0.9.1; extra == "doc"
 Requires-Dist: restructuredtext-lint>=1.4.0; extra == "doc"
-Requires-Dist: nbsphinx>=0.8.10; extra == "doc"
+Requires-Dist: nbsphinx>=0.9.4; extra == "doc"
 Provides-Extra: test
-Requires-Dist: deepdiff>=6.7.1; extra == "test"
-Requires-Dist: rich>=13.7.0; extra == "test"
+Requires-Dist: deepdiff>=7.0.1; extra == "test"
+Requires-Dist: rich>=13.7.1; extra == "test"
 
 libusb
 ======
@@ -128,7 +129,7 @@ Prerequisites:
 + Python 3.8 or higher
 
   * https://www.python.org/
-  * with C libusb 1.0.26 is a primary test environment.
+  * with C libusb 1.0.27 is a primary test environment.
 
 + pip and setuptools
 
@@ -191,10 +192,34 @@ Authors
 .. _Development page: https://github.com/karpierz/libusb
 .. _PyPI record: https://pypi.org/project/libusb/
 .. _Documentation: https://libusb.readthedocs.io/
+.. _USB Vendors: https://devicehunt.com/all-usb-vendors
 
 Changelog
 =========
 
+1.0.27.post1 (2024-08-13)
+-------------------------
+- Add support for Python 3.13
+- Setup (dependencies) update.
+- Improvements and cleanup for win32.
+- Source code refactoring and cleanup.
+
+1.0.27 (2024-02-05)
+-------------------
+- | The API has been fully updated to version 1.0.27 (libusb v.1.0.27
+  | is fully backward compatible with v.1.0.26).
+- | For Windows the shared library binaries have been updated to version
+  | 1.0.27. For Linux and macOS, the shared library binaries remain at
+  | version 1.0.26.
+- Bugfixes for options -i and -w in examples/xusb.py
+
+1.0.26 (2024-02-05)
+-------------------
+- | The API has been partially updated to version 1.0.27, but still
+  | only supports version 1.0.26.
+- Improvements and some little bugfixes.
+- Examples and tests are upgraded to 1.0.27.
+
 1.0.26rc4 (2024-01-25)
 ----------------------
 - Setup update (now based on tox >= 4.0).

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/README.rst

@@ -78,7 +78,7 @@ Prerequisites:
 + Python 3.8 or higher
 
   * https://www.python.org/
-  * with C libusb 1.0.26 is a primary test environment.
+  * with C libusb 1.0.27 is a primary test environment.
 
 + pip and setuptools
 
@@ -141,3 +141,4 @@ Authors
 .. _Development page: https://github.com/karpierz/libusb
 .. _PyPI record: https://pypi.org/project/libusb/
 .. _Documentation: https://libusb.readthedocs.io/
+.. _USB Vendors: https://devicehunt.com/all-usb-vendors

libusb-1.0.27.post1/examples/_win32.py

@@ -0,0 +1,149 @@
+# Copyright (c) 2013 Adam Karpierz
+# SPDX-License-Identifier: Zlib
+
+import ctypes
+from ctypes import windll
+from ctypes import wintypes
+from ctypes import WINFUNCTYPE
+from ctypes.wintypes import (
+    CHAR, WCHAR, BOOLEAN, BOOL, BYTE, WORD, DWORD, SHORT, USHORT, INT,
+    UINT, LONG, ULONG, LARGE_INTEGER, ULARGE_INTEGER, FLOAT, DOUBLE,
+    LPBYTE, PBYTE, LPWORD, PWORD, LPDWORD, PDWORD, LPLONG, PLONG, LPSTR,
+    LPCSTR, LPVOID, LPCVOID, LPVOID as PVOID, HANDLE, LPHANDLE, PHANDLE,
+    WPARAM, LPARAM, FILETIME, LPFILETIME,
+)
+
+from ctypes.wintypes import WPARAM as ULONG_PTR # workaround
+PULONG_PTR = ctypes.POINTER(ULONG_PTR)
+
+ULONG32   = ctypes.c_uint32
+ULONGLONG = ctypes.c_uint64
+DWORDLONG = ctypes.c_uint64
+SIZE_T    = ctypes.c_size_t
+
+WAIT_ABANDONED = 0x00000080
+WAIT_OBJECT_0  = 0x00000000
+WAIT_TIMEOUT   = 0x00000102
+WAIT_FAILED    = 0xFFFFFFFF
+
+IGNORE   = 0
+INFINITE = 0xFFFFFFFF
+
+FORMAT_MESSAGE_ALLOCATE_BUFFER = 0x00000100
+FORMAT_MESSAGE_ARGUMENT_ARRAY  = 0x00002000
+FORMAT_MESSAGE_FROM_HMODULE    = 0x00000800
+FORMAT_MESSAGE_FROM_STRING     = 0x00000400
+FORMAT_MESSAGE_FROM_SYSTEM     = 0x00001000
+FORMAT_MESSAGE_IGNORE_INSERTS  = 0x00000200
+FORMAT_MESSAGE_MAX_WIDTH_MASK  = 0x000000FF
+
+GetCurrentProcess = windll.kernel32.GetCurrentProcess
+GetCurrentProcess.restype  = HANDLE
+GetCurrentProcess.argtypes = []
+
+GetProcessTimes = windll.kernel32.GetProcessTimes
+GetProcessTimes.restype  = BOOL
+GetProcessTimes.argtypes = [HANDLE,
+                            LPFILETIME,
+                            LPFILETIME,
+                            LPFILETIME,
+                            LPFILETIME]
+
+class SECURITY_ATTRIBUTES(ctypes.Structure):
+    _fields_ = [
+    ("nLength",              DWORD),
+    ("lpSecurityDescriptor", LPVOID),
+    ("bInheritHandle",       BOOL),
+]
+LPSECURITY_ATTRIBUTES = ctypes.POINTER(SECURITY_ATTRIBUTES)
+
+LPTHREAD_START_ROUTINE = WINFUNCTYPE(DWORD, LPVOID)
+CreateThread = windll.kernel32.CreateThread
+CreateThread.restype  = HANDLE
+CreateThread.argtypes = [LPSECURITY_ATTRIBUTES,
+                         SIZE_T,
+                         LPTHREAD_START_ROUTINE,
+                         LPVOID,
+                         DWORD,
+                         LPDWORD]
+
+WaitForSingleObject = windll.kernel32.WaitForSingleObject
+WaitForSingleObject.restype  = DWORD
+WaitForSingleObject.argtypes = [HANDLE,
+                                DWORD]
+
+SetEvent = windll.kernel32.SetEvent
+SetEvent.restype  = BOOL
+SetEvent.argtypes = [HANDLE]
+
+CreateSemaphore = windll.kernel32.CreateSemaphoreA
+CreateSemaphore.restype  = HANDLE
+CreateSemaphore.argtypes = [LPSECURITY_ATTRIBUTES,
+                            LONG,
+                            LONG,
+                            LPCSTR]
+
+ReleaseSemaphore = windll.kernel32.ReleaseSemaphore
+ReleaseSemaphore.restype  = BOOL
+ReleaseSemaphore.argtypes = [HANDLE,
+                             LONG,
+                             LPLONG]
+
+Sleep = windll.kernel32.Sleep
+Sleep.restype  = None
+Sleep.argtypes = [DWORD]
+
+PHANDLER_ROUTINE = WINFUNCTYPE(BOOL, DWORD)
+SetConsoleCtrlHandler = windll.kernel32.SetConsoleCtrlHandler
+SetConsoleCtrlHandler.restype  = BOOL
+SetConsoleCtrlHandler.argtypes = [PHANDLER_ROUTINE,
+                                  BOOL]
+
+CloseHandle = windll.kernel32.CloseHandle
+CloseHandle.restype  = BOOL
+CloseHandle.argtypes = [HANDLE]
+
+GetLastError = windll.kernel32.GetLastError
+GetLastError.restype  = DWORD
+GetLastError.argtypes = []
+
+FormatMessageA = windll.kernel32.FormatMessageA
+FormatMessageA.restype  = DWORD
+FormatMessageA.argtypes = [DWORD,
+                           LPCVOID,
+                           DWORD,
+                           DWORD,
+                           LPSTR,
+                           DWORD,
+                           LPVOID]
+
+class SYSTEMTIME(ctypes.Structure):
+    _fields_ = [
+    ("wYear",         WORD),
+    ("wMonth",        WORD),
+    ("wDayOfWeek",    WORD),
+    ("wDay",          WORD),
+    ("wHour",         WORD),
+    ("wMinute",       WORD),
+    ("wSecond",       WORD),
+    ("wMilliseconds", WORD),
+]
+LPSYSTEMTIME = ctypes.POINTER(SYSTEMTIME)
+
+GetLocalTime = windll.kernel32.GetLocalTime
+GetLocalTime.restype  = None
+GetLocalTime.argtypes = [LPSYSTEMTIME]
+
+SetLocalTime = windll.kernel32.SetLocalTime
+SetLocalTime.restype  = BOOL
+SetLocalTime.argtypes = [LPSYSTEMTIME]
+
+GetSystemTime = windll.kernel32.GetSystemTime
+GetSystemTime.restype  = None
+GetSystemTime.argtypes = [LPSYSTEMTIME]
+
+SetSystemTime = windll.kernel32.SetSystemTime
+SetSystemTime.restype  = BOOL
+SetSystemTime.argtypes = [LPSYSTEMTIME]
+
+del ctypes

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/examples/dpfp.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2016 Adam Karpierz
-# Licensed under the zlib/libpng License
-# https://opensource.org/license/zlib
+# SPDX-License-Identifier: Zlib
 
 # libusb example program to manipulate U.are.U 4000B fingerprint scanner.
 # Copyright © 2007 Daniel Drake <dsd@gentoo.org>
@@ -32,19 +31,21 @@ import ctypes as ct
 
 import libusb as usb
 from libusb._platform import defined, is_posix, is_windows
-if is_windows: import win32
+if is_windows: import _win32 as win32
+
+usb_strerror = lambda r: usb.strerror(r).decode("utf-8")
 
 if defined("DPFP_THREADED"):
 
     if is_posix:
 
-        THREAD_RETURN_VALUE = NULL
         semaphore_t = ct.POINTER(sem_t)
         thread_t    = pthread_t
         thread_return_t = ct.c_void_p
+        THREAD_RETURN_VALUE = NULL
 
         def semaphore_create() -> semaphore_t:
-            name = "/org.libusb.example.dpfp_threaded:%d" % int(getpid())
+            name = "/org.libusb.example.dpfp_threaded:{:d}".format(int(getpid()))
             semaphore: semaphore_t = sem_open(name, O_CREAT | O_EXCL, 0, 0)
             if semaphore == SEM_FAILED:
                 return NULL;
@@ -61,7 +62,7 @@ if defined("DPFP_THREADED"):
         def semaphore_destroy(semaphore: semaphore_t):
             sem_close(semaphore)
 
-        # void *(*thread_entry)(arg: ct.c_void_p)
+        # thread_return_t (*thread_entry)(arg: ct.c_void_p)
         def thread_create(thread: ct.POINTER(thread_t),
                           thread_entry,
                           arg: ct.c_void_p) -> int:
@@ -73,7 +74,6 @@ if defined("DPFP_THREADED"):
 
     elif is_windows:
 
-        THREAD_RETURN_VALUE = 0
         semaphore_t = win32.HANDLE
         thread_t    = win32.HANDLE
         if defined("__CYGWIN__"):
@@ -81,6 +81,7 @@ if defined("DPFP_THREADED"):
         else:
            #thread_return_t = ct.c_uint
             thread_return_t = win32.DWORD
+        THREAD_RETURN_VALUE = 0
 
         def semaphore_create() -> semaphore_t:
             return win32.CreateSemaphore(None, 0, 1, None)
@@ -543,7 +544,6 @@ def alloc_transfers() -> int:
 
 #static
 def sighandler(signum, frame):
-
     request_exit(1)
 
 
@@ -571,9 +571,12 @@ def main(argv=sys.argv[1:]):
     global irq_transfer
     global do_exit
 
-    r = usb.init(None)
+    r = (usb.init_context(None, None, 0)
+         if hasattr(usb, "init_context") else
+         usb.init(None))
     if r < 0:
-        print("failed to initialise libusb {} - {}".format(r, usb.strerror(r)), file=sys.stderr)
+        print("failed to initialise libusb {} - {}".format(r, usb_strerror(r)),
+              file=sys.stderr)
         sys.exit(1)
 
     r = find_dpfp_device()
@@ -584,7 +587,8 @@ def main(argv=sys.argv[1:]):
 
         r = usb.claim_interface(devh, 0)
         if r < 0:
-            print("claim interface error {} - {}".format(r, usb.strerror(r)), file=sys.stderr)
+            print("claim interface error {} - {}".format(r, usb_strerror(r)),
+                  file=sys.stderr)
             return abs(r)
         print("claimed interface")
 
@@ -642,12 +646,14 @@ def main(argv=sys.argv[1:]):
             if img_transfer:
                 r = usb.cancel_transfer(img_transfer)
                 if r < 0:
-                    print("failed to cancel transfer {} - {}".format(r, usb.strerror(r)), file=sys.stderr)
+                    print("failed to cancel transfer {} - {}".format(r, usb_strerror(r)),
+                          file=sys.stderr)
 
             if irq_transfer:
                 r = usb.cancel_transfer(irq_transfer)
                 if r < 0:
-                    print("failed to cancel transfer {} - {}".format(r, usb.strerror(r)), file=sys.stderr)
+                    print("failed to cancel transfer {} - {}".format(r, usb_strerror(r)),
+                          file=sys.stderr)
 
             while img_transfer or irq_transfer:
                 if usb.handle_events(None) < 0:

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/examples/dpfp_threaded.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2016 Adam Karpierz
-# Licensed under the zlib/libpng License
-# https://opensource.org/license/zlib
+# SPDX-License-Identifier: Zlib
 
 # libusb example program to manipulate U.are.U 4000B fingerprint scanner.
 # Copyright © 2007 Daniel Drake <dsd@gentoo.org>

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/examples/ezusb.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2016 Adam Karpierz
-# Licensed under the zlib/libpng License
-# https://opensource.org/license/zlib
+# SPDX-License-Identifier: Zlib
 
 # Copyright © 2001 Stephen Williams (steve@icarus.com)
 # Copyright © 2001-2002 David Brownell (dbrownell@users.sourceforge.net)
@@ -29,6 +28,8 @@ import ctypes as ct
 
 import libusb as usb
 
+usb_error_name = lambda status: usb.error_name(status).decode("utf-8")
+
 FX_TYPE_UNDEFINED = -1
 FX_TYPE_AN21      = 0  # Original AnchorChips parts
 FX_TYPE_FX1       = 1  # Updated Cypress versions
@@ -170,7 +171,7 @@ def ezusb_write(device, label, opcode, addr, data, size) -> int:
     global verbose
 
     if verbose > 1:
-        logerror("{}, addr {:#010x} len %4u ({:#06x})\n",
+        logerror("{}, addr {:#010x} len {:4d} ({:#06x})\n",
                  label, addr, size, size)
     status = usb.control_transfer(device,
                                   usb.LIBUSB_ENDPOINT_OUT |
@@ -183,7 +184,7 @@ def ezusb_write(device, label, opcode, addr, data, size) -> int:
                                   1000)
     if status != ct.c_int(size).value:
         if status < 0:
-            logerror("{}: {}\n", label, usb.error_name(status))
+            logerror("{}: {}\n", label, usb_error_name(status))
         else:
             logerror("{} ==> {}\n", label, status)
 
@@ -205,7 +206,7 @@ def ezusb_read(device, label, opcode, addr, data, size) -> int:
     global verbose
 
     if verbose > 1:
-        logerror("{}, addr {:#010x} len %4u ({:#06x})\n",
+        logerror("{}, addr {:#010x} len {:4d} ({:#06x})\n",
                  label, addr, size, size)
     status = usb.control_transfer(device,
                                   usb.LIBUSB_ENDPOINT_IN |
@@ -218,7 +219,7 @@ def ezusb_read(device, label, opcode, addr, data, size) -> int:
                                   1000)
     if status != ct.c_int(size).value:
         if status < 0:
-            logerror("{}: {}\n", label, usb.error_name(status))
+            logerror("{}: {}\n", label, usb_error_name(status))
         else:
             logerror("{} ==> {}\n", label, status)
 
@@ -255,7 +256,7 @@ def ezusb_cpucs(device, addr, do_run: bool) -> bool:
         (not do_run or status != usb.LIBUSB_ERROR_IO)):
         mesg = "can't modify CPUCS"
         if status < 0:
-            logerror("{}: {}\n", mesg, usb.error_name(status))
+            logerror("{}: {}\n", mesg, usb_error_name(status))
         else:
             logerror("{}\n", mesg)
         return False
@@ -287,7 +288,7 @@ def ezusb_fx3_jump(device, addr) -> bool:
     if status != 0 and status != usb.LIBUSB_ERROR_IO:
         mesg = "failed to send jump command"
         if status < 0:
-            logerror("{}: {}\n", mesg, usb.error_name(status))
+            logerror("{}: {}\n", mesg, usb_error_name(status))
         else:
             logerror("{}\n", mesg)
         return False
@@ -396,7 +397,7 @@ def parse_ihex(image, context, is_external, poke) -> int:
             break;
 
         if rec_type != 0:
-            logerror("unsupported record type: %u\n", rec_type)
+            logerror("unsupported record type: {:d}\n", rec_type)
             return -3
 
         if size * 2 + 11 > strlen(buf):

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/examples/fxload.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2016 Adam Karpierz
-# Licensed under the zlib/libpng License
-# https://opensource.org/license/zlib
+# SPDX-License-Identifier: Zlib
 
 # Copyright © 2001 Stephen Williams (steve@icarus.com)
 # Copyright © 2001-2002 David Brownell (dbrownell@users.sourceforge.net)
@@ -35,6 +34,8 @@ from ezusb import FX_KNOWN_DEVICES, FX_TYPE_MAX, FX_TYPE_NAMES, IMG_TYPE_NAMES,
 from ezusb import ezusb_load_ram
 from ezusb import verbose
 
+usb_error_name = lambda status: usb.error_name(status).decode("utf-8")
+
 if not is_windows or defined("__CYGWIN__"):
     #include <syslog.h>
     dosyslog = False  # bool
@@ -157,9 +158,13 @@ def main(argv=sys.argv[1:]):
             return print_usage(-1)
 
     # open the device using libusb
-    status = usb.init(None)
+    status = (usb.init_context(None, None, 0)
+              if hasattr(usb, "init_context") else
+              usb.init(None))
     if status < 0:
-        logerror("usb.init() failed: {}\n", usb.error_name(status))
+        logerror("libusb.init_context() failed: {}\n"
+                 if hasattr(usb, "init_context") else
+                 "libusb.init() failed: {}\n", usb_error_name(status))
         return -1
 
     try:
@@ -169,7 +174,7 @@ def main(argv=sys.argv[1:]):
         if target_type is None or device_id is None or device_path is not None:
 
             if usb.get_device_list(None, ct.byref(devs)) < 0:
-                logerror("libusb.get_device_list() failed: {}\n", usb.error_name(status))
+                logerror("libusb.get_device_list() failed: {}\n", usb_error_name(status))
                 return -1
 
             i = 0
@@ -224,14 +229,14 @@ def main(argv=sys.argv[1:]):
             status = usb.open(dev, ct.byref(device))
             usb.free_device_list(devs, 1)
             if status < 0:
-                logerror("usb.open() failed: {}\n", usb.error_name(status))
+                logerror("libusb.open() failed: {}\n", usb_error_name(status))
                 return -1
 
         elif device_id is not None:
 
             device = usb.open_device_with_vid_pid(None, ct.c_uint16(vid), ct.c_uint16(pid))
             if not device:
-                logerror("usb.open() failed\n")
+                logerror("libusb.open() failed\n")
                 return -1
 
         # We need to claim the first interface
@@ -239,7 +244,7 @@ def main(argv=sys.argv[1:]):
         status = usb.claim_interface(device, 0)
         if status != usb.LIBUSB_SUCCESS:
             usb.close(device)
-            logerror("libusb.claim_interface failed: {}\n", usb.error_name(status))
+            logerror("libusb.claim_interface failed: {}\n", usb_error_name(status))
             return -1
 
         if verbose:

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/examples/hotplugtest.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2016 Adam Karpierz
-# Licensed under the zlib/libpng License
-# https://opensource.org/license/zlib
+# SPDX-License-Identifier: Zlib
 
 # libusb example program for hotplug API
 # Copyright © 2012-2013 Nathan Hjelm <hjelmn@mac.com>
@@ -24,6 +23,8 @@ import ctypes as ct
 
 import libusb as usb
 
+usb_strerror = lambda r: usb.strerror(r).decode("utf-8")
+
 handle = ct.POINTER(usb.device_handle)()
 done = 0
 
@@ -35,10 +36,12 @@ def hotplug_callback(ctx, dev, event, user_data):
 
     desc = usb.device_descriptor()
     rc = usb.get_device_descriptor(dev, ct.byref(desc))
-    if rc != usb.LIBUSB_SUCCESS:
-        print("Error getting device descriptor", file=sys.stderr)
-
-    print("Device attached: {:04x}:{:04x}".format(desc.idVendor, desc.idProduct))
+    if rc == usb.LIBUSB_SUCCESS:
+        print("Device attached: {:04x}:{:04x}".format(desc.idVendor, desc.idProduct))
+    else:
+        print("Device attached")
+        print("Error getting device descriptor: {}".format(usb_strerror(rc)),
+              file=sys.stderr)
 
     if handle:
         usb.close(handle)
@@ -46,7 +49,8 @@ def hotplug_callback(ctx, dev, event, user_data):
 
     rc = usb.open(dev, ct.byref(handle))
     if rc != usb.LIBUSB_SUCCESS:
-        print("Error opening device", file=sys.stderr)
+        print("No access to device: {}".format(usb_strerror(rc)),
+              file=sys.stderr)
 
     done += 1
 
@@ -58,7 +62,14 @@ def hotplug_callback_detach(ctx, dev, event, user_data):
 
     global handle, done
 
-    print("Device detached")
+    desc = usb.device_descriptor()
+    rc = usb.get_device_descriptor(dev, ct.byref(desc))
+    if rc == usb.LIBUSB_SUCCESS:
+        print("Device detached: {:04x}:{:04x}".format(desc.idVendor, desc.idProduct))
+    else:
+        print("Device detached")
+        print("Error getting device descriptor: {}".format(usb_strerror(rc)),
+              file=sys.stderr)
 
     if handle:
         usb.close(handle)
@@ -75,13 +86,15 @@ def main(argv=sys.argv[1:]):
 
     hp = [usb.hotplug_callback_handle() for i in range(2)]
 
-    vendor_id  = int(argv[0]) if len(argv) > 0 else 0x045a
-    product_id = int(argv[1]) if len(argv) > 1 else 0x5005
+    vendor_id  = int(argv[0]) if len(argv) > 0 else usb.LIBUSB_HOTPLUG_MATCH_ANY
+    product_id = int(argv[1]) if len(argv) > 1 else usb.LIBUSB_HOTPLUG_MATCH_ANY
     class_id   = int(argv[2]) if len(argv) > 2 else usb.LIBUSB_HOTPLUG_MATCH_ANY
 
-    rc = usb.init(None)
-    if rc < 0:
-        print("failed to initialise libusb: {}".format(usb.error_name(rc)))
+    rc = (usb.init_context(None, None, 0)
+          if hasattr(usb, "init_context") else
+          usb.init(None))
+    if rc != usb.LIBUSB_SUCCESS:
+        print("failed to initialise libusb: {}".format(usb_strerror(rc)))
         return 1
 
     try:
@@ -107,8 +120,8 @@ def main(argv=sys.argv[1:]):
 
         while done < 2:
             rc = usb.handle_events(None)
-            if rc < 0:
-                print("libusb.handle_events() failed: {}".format(usb.error_name(rc)))
+            if rc != usb.LIBUSB_SUCCESS:
+                print("libusb.handle_events() failed: {}".format(usb_strerror(rc)))
     finally:
         if handle:
             usb.close(handle)

{libusb-1.0.26rc4 → libusb-1.0.27.post1}/examples/listdevs.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2016 Adam Karpierz
-# Licensed under the zlib/libpng License
-# https://opensource.org/license/zlib
+# SPDX-License-Identifier: Zlib
 
 # libusb example program to list devices on the bus
 # Copyright © 2007 Daniel Drake <dsd@gentoo.org>
@@ -54,7 +53,9 @@ def print_devs(devs):
 
 def main(argv=sys.argv[1:]):
 
-    r = usb.init(None)
+    r = (usb.init_context(None, None, 0)
+         if hasattr(usb, "init_context") else
+         usb.init(None))
     if r < 0:
         return r