Merge request: https://gitlab.riscosopen.org/RiscOS/Sources/HWSupport/USB/USBDriver/merge_requests/16