libusb 1.0.24b3__zip → 1.0.26__zip

libusb-1.0.26/.readthedocs.yml

@@ -0,0 +1,15 @@
+version: 2
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.11"
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - doc
+sphinx:
+  builder: html
+  configuration: docs/conf.py
+  fail_on_warning: true

{libusb-1.0.24b3 → libusb-1.0.26}/CHANGES.rst

@@ -1,9 +1,57 @@
 Changelog
 =========
 
+1.0.26 (2024-02-05)
+-------------------
+- API partially updated from 1.0.27 but still supports only 1.0.26.
+- Improvements and some little bugfixes.
+- Examples and tests are upgraded from 1.0.27.
+
+1.0.26rc4 (2024-01-25)
+----------------------
+- Setup update (now based on tox >= 4.0).
+- Cleanup.
+
+1.0.26rc2 (2023-12-20)
+----------------------
+- Add linux aarch64 support.
+
+1.0.26rc1 (2023-12-15)
+----------------------
+- Add support for Python 3.12
+- Drop support for Python 3.7
+- Add support for PyPy 3.10
+- Drop support for PyPy 3.7 and 3.8
+- Copyright year update.
+
+1.0.26b5 (2022-09-10)
+---------------------
+- Tox configuration has been moved to pyproject.toml
+
+1.0.26b4 (2022-08-25)
+---------------------
+- | Downgrade of included shared libraries for Linux:
+  | libusb v.1.0.26 -> v.1.0.24 (for now based on Debian's 11 (bullseye)),
+  | because of loading issues of v.1.0.26 from Debian's 12 (bookworm)
+  | shared libraries.
+- Setup update.
+
+1.0.26b3 (2022-07-25)
+---------------------
+- Setup update (currently based mainly on pyproject.toml).
+- Update for macOS (dlls are included for v.10.7+ and v.11.6+ 64bit).
+
+1.0.26b2 (2022-07-18)
+---------------------
+- Upgrade for Windows: libusb v.1.0.24 -> v.1.0.26
+- Update for macOS (v.11.6 64bit).
+- Add support for Python 3.10 and 3.11
+- Add support for PyPy 3.7, 3.8 and 3.9
+- Setup update.
+
 1.0.24b3 (2022-01-10)
 ---------------------
-- Drop support for Python 3.6.
+- Drop support for Python 3.6
 - Copyright year update.
 - Setup update.
 
@@ -30,8 +78,8 @@ Changelog
 - | Upgrade for Windows: libusb v.1.0.22 -> v.1.0.23
   | (partially; without libusb_wrap_sys_device, because
   |  original Windows v.1.0.23 dlls do not export this function).
-- Add support for Python 3.9.
-- Drop support for Python 3.5.
+- Add support for Python 3.9
+- Drop support for Python 3.5
 - Setup update.
 - Cleanup.
 
@@ -52,9 +100,9 @@ Changelog
 
 1.0.22b5 (2019-11-14)
 ---------------------
-- Drop support for Python 2.
-- Drop support for Python 3.4.
-- Add support for Python 3.8.
+- Drop support for Python 2
+- Drop support for Python 3.4
+- Add support for Python 3.8
 - Setup update and cleanup.
 
 1.0.22b4 (2019-02-15)

{libusb-1.0.24b3 → libusb-1.0.26}/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2016-2022 Adam Karpierz
+zlib License
+
+Copyright (C) 2016-2024 Adam Karpierz
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
@@ -12,8 +14,6 @@ freely, subject to the following restrictions:
    claim that you wrote the original software. If you use this software
    in a product, an acknowledgment in the product documentation would be
    appreciated but is not required.
-
 2. Altered source versions must be plainly marked as such, and must not be
    misrepresented as being the original software.
-
 3. This notice may not be removed or altered from any source distribution.

{libusb-1.0.24b3 → libusb-1.0.26}/MANIFEST.in

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

{libusb-1.0.24b3 → libusb-1.0.26}/PKG-INFO

@@ -1,38 +1,52 @@
 Metadata-Version: 2.1
 Name: libusb
-Version: 1.0.24b3
+Version: 1.0.26
 Summary: Python binding for the libusb C library.
-Home-page: https://pypi.org/project/libusb/
 Author: Adam Karpierz
 Author-email: adam@karpierz.net
 Maintainer: Adam Karpierz
 Maintainer-email: adam@karpierz.net
-License: zlib/libpng License ; https://opensource.org/licenses/Zlib
-Download-URL: https://pypi.org/project/libusb/
+License: zlib/libpng License ; https://opensource.org/license/zlib
+Project-URL: Homepage, https://pypi.org/project/libusb/
 Project-URL: Documentation, https://libusb.readthedocs.io/
+Project-URL: Download, https://pypi.org/project/libusb/
 Project-URL: Source, https://github.com/karpierz/libusb
 Project-URL: Issues, https://github.com/karpierz/libusb/issues
 Keywords: usb,libusb
 Platform: any
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: zlib/libpng License
 Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: Polish
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 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 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: Stackless
+Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <4.0.0,>=3.7.0
+Requires-Python: <4.0.0,>=3.8.1
 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
 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: restructuredtext-lint>=1.4.0; extra == "doc"
+Requires-Dist: nbsphinx>=0.8.10; extra == "doc"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: deepdiff>=6.7.1; extra == "test"
+Requires-Dist: rich>=13.7.0; extra == "test"
 
 libusb
 ======
@@ -111,10 +125,10 @@ Installation
 
 Prerequisites:
 
-+ Python 3.7 or higher
++ Python 3.8 or higher
 
   * https://www.python.org/
-  * 3.7 with C libusb 1.0.22 is a primary test environment.
+  * with C libusb 1.0.26 is a primary test environment.
 
 + pip and setuptools
 
@@ -136,7 +150,7 @@ Prerequisites:
 
     python -m pip install --upgrade tox
 
-Visit `development page`_.
+Visit `Development page`_.
 
 Installation from sources:
 
@@ -161,9 +175,9 @@ or on development mode:
 License
 =======
 
-  | Copyright (c) 2016-2022 Adam Karpierz
+  | Copyright (c) 2016-2024 Adam Karpierz
   | Licensed under the zlib/libpng License
-  | https://opensource.org/licenses/Zlib
+  | https://opensource.org/license/zlib
   | Please refer to the accompanying LICENSE file.
 
 Authors
@@ -174,16 +188,65 @@ Authors
 .. |package| replace:: libusb
 .. |package_bold| replace:: **libusb**
 .. |respository| replace:: https://github.com/karpierz/libusb.git
-.. _development page: https://github.com/karpierz/libusb
+.. _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.26 (2024-02-05)
+-------------------
+- API partially updated from 1.0.27 but still supports only 1.0.26.
+- Improvements and some little bugfixes.
+- Examples and tests are upgraded from 1.0.27.
+
+1.0.26rc4 (2024-01-25)
+----------------------
+- Setup update (now based on tox >= 4.0).
+- Cleanup.
+
+1.0.26rc2 (2023-12-20)
+----------------------
+- Add linux aarch64 support.
+
+1.0.26rc1 (2023-12-15)
+----------------------
+- Add support for Python 3.12
+- Drop support for Python 3.7
+- Add support for PyPy 3.10
+- Drop support for PyPy 3.7 and 3.8
+- Copyright year update.
+
+1.0.26b5 (2022-09-10)
+---------------------
+- Tox configuration has been moved to pyproject.toml
+
+1.0.26b4 (2022-08-25)
+---------------------
+- | Downgrade of included shared libraries for Linux:
+  | libusb v.1.0.26 -> v.1.0.24 (for now based on Debian's 11 (bullseye)),
+  | because of loading issues of v.1.0.26 from Debian's 12 (bookworm)
+  | shared libraries.
+- Setup update.
+
+1.0.26b3 (2022-07-25)
+---------------------
+- Setup update (currently based mainly on pyproject.toml).
+- Update for macOS (dlls are included for v.10.7+ and v.11.6+ 64bit).
+
+1.0.26b2 (2022-07-18)
+---------------------
+- Upgrade for Windows: libusb v.1.0.24 -> v.1.0.26
+- Update for macOS (v.11.6 64bit).
+- Add support for Python 3.10 and 3.11
+- Add support for PyPy 3.7, 3.8 and 3.9
+- Setup update.
+
 1.0.24b3 (2022-01-10)
 ---------------------
-- Drop support for Python 3.6.
+- Drop support for Python 3.6
 - Copyright year update.
 - Setup update.
 
@@ -210,8 +273,8 @@ Changelog
 - | Upgrade for Windows: libusb v.1.0.22 -> v.1.0.23
   | (partially; without libusb_wrap_sys_device, because
   |  original Windows v.1.0.23 dlls do not export this function).
-- Add support for Python 3.9.
-- Drop support for Python 3.5.
+- Add support for Python 3.9
+- Drop support for Python 3.5
 - Setup update.
 - Cleanup.
 
@@ -232,9 +295,9 @@ Changelog
 
 1.0.22b5 (2019-11-14)
 ---------------------
-- Drop support for Python 2.
-- Drop support for Python 3.4.
-- Add support for Python 3.8.
+- Drop support for Python 2
+- Drop support for Python 3.4
+- Add support for Python 3.8
 - Setup update and cleanup.
 
 1.0.22b4 (2019-02-15)
@@ -280,5 +343,3 @@ Changelog
 0.0.1 (2016-09-23)
 ------------------
 - Initial release.
-
-

{libusb-1.0.24b3 → libusb-1.0.26}/README.rst

@@ -75,10 +75,10 @@ Installation
 
 Prerequisites:
 
-+ Python 3.7 or higher
++ Python 3.8 or higher
 
   * https://www.python.org/
-  * 3.7 with C libusb 1.0.22 is a primary test environment.
+  * with C libusb 1.0.26 is a primary test environment.
 
 + pip and setuptools
 
@@ -100,7 +100,7 @@ Prerequisites:
 
     python -m pip install --upgrade tox
 
-Visit `development page`_.
+Visit `Development page`_.
 
 Installation from sources:
 
@@ -125,9 +125,9 @@ or on development mode:
 License
 =======
 
-  | Copyright (c) 2016-2022 Adam Karpierz
+  | Copyright (c) 2016-2024 Adam Karpierz
   | Licensed under the zlib/libpng License
-  | https://opensource.org/licenses/Zlib
+  | https://opensource.org/license/zlib
   | Please refer to the accompanying LICENSE file.
 
 Authors
@@ -138,6 +138,7 @@ Authors
 .. |package| replace:: libusb
 .. |package_bold| replace:: **libusb**
 .. |respository| replace:: https://github.com/karpierz/libusb.git
-.. _development page: https://github.com/karpierz/libusb
+.. _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.24b3 → libusb-1.0.26}/docs/conf.py

@@ -4,29 +4,7 @@
 # list see the documentation:
 # https://www.sphinx-doc.org/en/master/usage/configuration.html
 
-import re
-from pathlib import Path
-from setuptools.config import read_configuration
-from packaging import version
-
-top_dir = Path(__file__).resolve().parents[1]
-metadata = read_configuration(top_dir/"setup.cfg",
-                              ignore_option_errors=True)["metadata"]
-copyr_patt = r"^\s*__copyright__\s*=\s*"
-class about:
-    __title__      = metadata["name"]
-    __summary__    = metadata.get("description")
-    __uri__        = metadata.get("url")
-    __version__    = str(version.parse(metadata["version"]))
-    __author__     = metadata.get("author")
-    __maintainer__ = metadata.get("maintainer")
-    __email__      = metadata.get("author_email")
-    __license__    = metadata.get("license")
-    __copyright__  = eval(next((re.split(copyr_patt, line)[1] for line in
-                                next(top_dir.glob("src/**/__about__.py"))
-                                .open("rt", encoding="utf-8")
-                                if re.split(copyr_patt, line)[1:]), "None"))
-del read_configuration, version, metadata, copyr_patt
+__import__("pkg_about").about_from_setup()
 
 def setup(app):
     pass
@@ -70,8 +48,11 @@ extensions = [
    #'sphinx.ext.coverage',
     'sphinx.ext.ifconfig',
     'sphinx.ext.napoleon',
+   #'sphinx_toolbox',
     'sphinx_tabs.tabs',
+    'sphinx_copybutton',
     'sphinxcontrib.spelling',
+    'nbsphinx',
 ]
 
 # Needed for e.g. linkcheck builder

{libusb-1.0.24b3 → libusb-1.0.26}/examples/dpfp.py

@@ -1,6 +1,6 @@
-# Copyright (c) 2016-2022 Adam Karpierz
+# Copyright (c) 2016 Adam Karpierz
 # Licensed under the zlib/libpng License
-# https://opensource.org/licenses/Zlib
+# https://opensource.org/license/zlib
 
 # libusb example program to manipulate U.are.U 4000B fingerprint scanner.
 # Copyright © 2007 Daniel Drake <dsd@gentoo.org>
@@ -34,18 +34,20 @@ import libusb as usb
 from libusb._platform import defined, is_posix, is_windows
 if is_windows: import 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())
-            semaphore: semaphore_t = sem_open(name, O_CREAT | O_EXCL, 0, 0) 
+            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;
             # Remove semaphore so that it does not persist after process exits
@@ -61,7 +63,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 +75,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 +82,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)
@@ -190,7 +192,10 @@ def find_dpfp_device() -> int:
     global devh
     global VID, PID
     devh = usb.open_device_with_vid_pid(None, VID, PID)
-    return 0 if devh else -errno.ENODEV
+    if not devh:
+        ct.set_errno(errno.ENODEV)
+        return -1
+    return 0
 
 
 def print_f0_data() ->int:
@@ -287,12 +292,14 @@ def set_mode_async(data) -> int:
     try:
         buf = (ct.c_ubyte * (usb.LIBUSB_CONTROL_SETUP_SIZE + 1))()
     except:
-        return -errno.ENOMEM
+        ct.set_errno(errno.ENOMEM)
+        return -1
 
     transfer = usb.alloc_transfer(0)
     if not transfer:
         del buf
-        return -errno.ENOMEM
+        ct.set_errno(errno.ENOMEM)
+        return -1
 
     print("async set mode {:02x}".format(data))
     usb.fill_control_setup(buf, CTRL_OUT, USB_RQ, 0x4e, 0, 1)
@@ -519,11 +526,13 @@ def alloc_transfers() -> int:
 
     img_transfer = usb.alloc_transfer(0)
     if not img_transfer:
-        return -errno.ENOMEM
+        ct.set_errno(errno.ENOMEM)
+        return -1
 
     irq_transfer = usb.alloc_transfer(0)
     if not irq_transfer:
-        return -errno.ENOMEM
+        ct.set_errno(errno.ENOMEM)
+        return -1
 
     usb.fill_bulk_transfer(img_transfer, devh, EP_DATA,
                            imgbuf, ct.sizeof(imgbuf),
@@ -536,7 +545,6 @@ def alloc_transfers() -> int:
 
 #static
 def sighandler(signum, frame):
-
     request_exit(1)
 
 
@@ -564,9 +572,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()
@@ -577,7 +588,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")
 
@@ -635,12 +647,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.24b3 → libusb-1.0.26}/examples/dpfp_threaded.py

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

{libusb-1.0.24b3 → libusb-1.0.26}/examples/ezusb.py

@@ -1,6 +1,6 @@
-# Copyright (c) 2016-2022 Adam Karpierz
+# Copyright (c) 2016 Adam Karpierz
 # Licensed under the zlib/libpng License
-# https://opensource.org/licenses/Zlib
+# https://opensource.org/license/zlib
 
 # Copyright © 2001 Stephen Williams (steve@icarus.com)
 # Copyright © 2001-2002 David Brownell (dbrownell@users.sourceforge.net)
@@ -29,6 +29,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 +172,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,11 +185,14 @@ 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)
 
-    return 0 if status >= 0 else -errno.EIO
+    if status < 0:
+        ct.set_errno(errno.EIO)
+        return -1
+    return 0
 
 
 # Issues the specified vendor-specific read request.
@@ -202,7 +207,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 |
@@ -215,11 +220,14 @@ 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)
 
-    return 0 if status >= 0 else -errno.EIO
+    if status < 0:
+        ct.set_errno(errno.EIO)
+        return -1
+    return 0
 
 
 # Modifies the CPUCS register to stop or reset the CPU.
@@ -249,7 +257,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
@@ -257,7 +265,7 @@ def ezusb_cpucs(device, addr, do_run: bool) -> bool:
         return True
 
 
-# Send an FX3 jumpt to address command
+# Send an FX3 jump to address command
 # Returns False on error.
 
 #static
@@ -281,7 +289,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
@@ -390,7 +398,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):
@@ -592,7 +600,8 @@ def ram_poke(context, addr, external, data, size) -> int:
     if ctx_mode == internal_only:    # CPU should be stopped
         if external:
             logerror("can't write {} bytes external memory at {:#010x}\n", size, addr)
-            return -errno.EINVAL
+            ct.set_errno(errno.EINVAL)
+            return -1
     elif ctx_mode == skip_internal:  # CPU must be running
         if not external:
             if verbose >= 2:
@@ -605,10 +614,12 @@ def ram_poke(context, addr, external, data, size) -> int:
             return 0
     elif ctx_mode == _undef:
         logerror("bug\n")
-        return -errno.EDOM
+        ct.set_errno(errno.EDOM)
+        return -1
     else:
         logerror("bug\n")
-        return -errno.EDOM
+        ct.set_errno(errno.EDOM)
+        return -1
 
     ctx.total += size
     ctx.count += 1