Skip to content

Fix compatibility with native PyUSB usb.core.Device.ctrl_transfer #11

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

Merged
tannewt merged 3 commits into from
Feb 12, 2026
Merged

Fix compatibility with native PyUSB usb.core.Device.ctrl_transfer #11

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cf2a6d
Fix compatibility with native PyUSB `usb.core.Device.ctrl_transfer`
relic-se Feb 11, 2026
c59885c
Use `array.array` to unify CPython and CircuitPython implementation
relic-se Feb 11, 2026
d5fdba9
Return `bytearray` objects
relic-se Feb 11, 2026
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
17 changes: 9 additions & 8 deletions adafruit_usb_host_descriptors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* Author(s): Scott Shawcroft
"""

import array
import struct

import usb
Expand Down Expand Up @@ -83,23 +84,23 @@ def get_descriptor(device, desc_type, index, buf, language_id=0):

def get_device_descriptor(device):
"""Fetch the device descriptor and return it."""
buf = bytearray(1)
buf = array.array("B", bytearray(1))
get_descriptor(device, DESC_DEVICE, 0, buf)
full_buf = bytearray(buf[0])
full_buf = array.array("B", bytearray(buf[0]))
get_descriptor(device, DESC_DEVICE, 0, full_buf)
return full_buf
return bytearray(full_buf)


def get_configuration_descriptor(device, index):
"""Fetch the configuration descriptor, its associated descriptors and return it."""
# Allow capitalization that matches the USB spec.
# pylint: disable=invalid-name
buf = bytearray(4)
buf = array.array("B", bytearray(4))
get_descriptor(device, DESC_CONFIGURATION, index, buf)
wTotalLength = struct.unpack("<xxH", buf)[0]
full_buf = bytearray(wTotalLength)
full_buf = array.array("B", bytearray(wTotalLength))
get_descriptor(device, DESC_CONFIGURATION, index, full_buf)
return full_buf
return bytearray(full_buf)


def get_report_descriptor(device, interface_num, length):
Expand All @@ -110,7 +111,7 @@ def get_report_descriptor(device, interface_num, length):
if length < 1:
return None

buf = bytearray(length)
buf = array.array("B", bytearray(length))
try:
# 0x81 = Dir: IN | Type: Standard | Recipient: Interface
# wValue = 0x2200 (Report Descriptor)
Expand All @@ -121,7 +122,7 @@ def get_report_descriptor(device, interface_num, length):
interface_num,
buf,
)
return buf
return bytearray(buf)
except usb.core.USBError as e:
print(f"Failed to read Report Descriptor: {e}")
return None
Expand Down