summaryrefslogtreecommitdiff
path: root/libusb/version_nano.h
diff options
context:
space:
mode:
authorMatthias Bolte <matthias.bolte@googlemail.com>2019-12-16 13:38:35 +0100
committerChris Dickens <christopher.a.dickens@gmail.com>2020-01-02 18:52:24 -0800
commitf67f065709c948d2e29150ea2a3d9441a2609f36 (patch)
tree9a36373fa0e2575348fb688dd99227228a9a9de3 /libusb/version_nano.h
parent1e9d26a753a741bfdb0769b4c895697d16edcc27 (diff)
downloadlibusb-f67f065709c948d2e29150ea2a3d9441a2609f36.tar.gz
windows: Fix USBD_STATUS to LIBUSB_TRANSFER_STATUS translation
The MSDN documentaion says that the most significant 4 bits of the USBD_STATUS value indicate success/pending/error state, but then gives them as 2 bit values. The broken translations code assumes these to be the lower 2 bits: 0b0000 for success 0b0001 for pending 0b0010 for error 0b0011 for error But actually it's the higher 2 bits: 0b0000 for success 0b0100 for pending 0b1000 for error 0b1100 for error The USBDK code already deals with USBD_STATUS and gets it correct. Another problem is that the broken translations code then masks off the most significant 4 bits of the USBD_STATUS value, but then compares it to the full 32 bit error codes to figure out the actual error. This switch will always jump to the default case, because all checked error codes have their most significant 2 bits set, but the values they are compared against have those bits masked off. Move the working code from the USBDK backend to the shared header and reuse it in the WinUSB backend too. [dickens] Fixed whitespace, removed unused definitions, add ifdef guard, and retained name as USBD_SUCCESS to match w32api header. Closes #665 Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'libusb/version_nano.h')
-rw-r--r--libusb/version_nano.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index ba3fee6..3b9b7ee 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11416
+#define LIBUSB_NANO 11417