diff options
Diffstat (limited to 'libusb')
| -rw-r--r-- | libusb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libusb/include/libusb/tusb_helpers.h | 8 | ||||
| -rwxr-xr-x | libusb/include/libusb/tusb_helpers.h.gen | 8 | ||||
| -rw-r--r-- | libusb/usb_common.c | 3 |
4 files changed, 11 insertions, 9 deletions
diff --git a/libusb/CMakeLists.txt b/libusb/CMakeLists.txt index f5d6ae2..c23f30e 100644 --- a/libusb/CMakeLists.txt +++ b/libusb/CMakeLists.txt @@ -14,4 +14,5 @@ target_link_libraries(libusb INTERFACE tinyusb_board libcr_ipc + libmisc ) diff --git a/libusb/include/libusb/tusb_helpers.h b/libusb/include/libusb/tusb_helpers.h index a250ca7..1b4e48e 100644 --- a/libusb/include/libusb/tusb_helpers.h +++ b/libusb/include/libusb/tusb_helpers.h @@ -1,4 +1,4 @@ -/* Generated by `./libusb/include/libusb/tusb_helpers.h.gen `. DO NOT EDIT! */ +/* Generated by `libusb/include/libusb/tusb_helpers.h.gen `. DO NOT EDIT! */ /* libusb/tusb_helpers.h - Preprocessor macros that I think should be included in TinyUSB * * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> @@ -36,16 +36,16 @@ * dated 2000-03-29. There is no longer any mention of this on usb.org, but I found a copy at * http://www.baiheee.com/Documents/090518/090518112619/USB_LANGIDs.pdf * - * So how does the USB-IF defined LANGIDs these days? + * So if they don't publish that anymore, how does the USB-IF define LANGIDs these days? * * https://www.usb.org/deprecated-links-and-tools says "To get the latest LANGID definitions go to * https://docs.microsoft.com/en-us/windows/desktop/intl/language-identifier-constants-and-strings. This * page will change as new LANGIDs are added." That page has no list of LANGIDs, but says "For the * predefined primary language identifiers with their valid sublanguage identifiers, see * [\[MS-LCID\]: Windows Language Code Identifier (LCID) - * Reference](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-565326e84c37f)." + * Reference](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-56532684c37f)." * That page at the time of this writing as a PDF marked as version 16.0, dated 2024-04-24: - * https://winprotocoldoc.blob.core.windows.net/productionwindowsarchives/MS-LCID/%5bMS-LCID%5d.pdf + * https://winprotocoldocs-bhdugrdyduf5h2e4.b02.azurefd.net/MS-LCID/%5bMS-LCID%5d.pdf * [MS-LCID] defines an LCID as a 32-bit value consisting of a 16-bit a "Language ID", a 4-bit "Sort * ID", and 12 reserved bits. * diff --git a/libusb/include/libusb/tusb_helpers.h.gen b/libusb/include/libusb/tusb_helpers.h.gen index 326ca22..5a5d1ac 100755 --- a/libusb/include/libusb/tusb_helpers.h.gen +++ b/libusb/include/libusb/tusb_helpers.h.gen @@ -42,16 +42,16 @@ cat <<'EOT' * dated 2000-03-29. There is no longer any mention of this on usb.org, but I found a copy at * http://www.baiheee.com/Documents/090518/090518112619/USB_LANGIDs.pdf * - * So how does the USB-IF defined LANGIDs these days? + * So if they don't publish that anymore, how does the USB-IF define LANGIDs these days? * * https://www.usb.org/deprecated-links-and-tools says "To get the latest LANGID definitions go to * https://docs.microsoft.com/en-us/windows/desktop/intl/language-identifier-constants-and-strings. This * page will change as new LANGIDs are added." That page has no list of LANGIDs, but says "For the * predefined primary language identifiers with their valid sublanguage identifiers, see * [\[MS-LCID\]: Windows Language Code Identifier (LCID) - * Reference](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-565326e84c37f)." + * Reference](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-56532684c37f)." * That page at the time of this writing as a PDF marked as version 16.0, dated 2024-04-24: - * https://winprotocoldoc.blob.core.windows.net/productionwindowsarchives/MS-LCID/%5bMS-LCID%5d.pdf + * https://winprotocoldocs-bhdugrdyduf5h2e4.b02.azurefd.net/MS-LCID/%5bMS-LCID%5d.pdf * [MS-LCID] defines an LCID as a 32-bit value consisting of a 16-bit a "Language ID", a 4-bit "Sort * ID", and 12 reserved bits. * @@ -65,7 +65,7 @@ cat <<'EOT' */ EOT if [[ ! -f 3rd-party/MS-LCID.pdf || 3rd-party/MS-LCID.pdf -ot $0 ]]; then - wget --no-use-server-timestamps -O 3rd-party/MS-LCID.pdf 'https://winprotocoldoc.blob.core.windows.net/productionwindowsarchives/MS-LCID/%5bMS-LCID%5d.pdf' + wget --no-use-server-timestamps -O 3rd-party/MS-LCID.pdf 'https://winprotocoldocs-bhdugrdyduf5h2e4.b02.azurefd.net/MS-LCID/%5bMS-LCID%5d.pdf' fi if [[ ! -f 3rd-party/MS-LCID.txt || 3rd-party/MS-LCID.txt -ot 3rd-party/MS-LCID.pdf ]]; then pdftotext -layout 3rd-party/MS-LCID.pdf diff --git a/libusb/usb_common.c b/libusb/usb_common.c index ceabad3..17dba0a 100644 --- a/libusb/usb_common.c +++ b/libusb/usb_common.c @@ -7,11 +7,12 @@ #include <stdint.h> /* for uint{n}_t types */ #include <stddef.h> /* for size_t */ #include <string.h> /* memcpy(newlib) */ -#include <assert.h> /* for assert(newlib) */ #include <stdlib.h> /* for malloc(pico_malloc), realloc(pico_malloc), reallocarray(pico_malloc) */ #include "bsp/board_api.h" /* for board_init(), board_init_after_usb(), board_usb_get_serial(TinyUSB) */ #include "tusb.h" /* for various tusb_*_t types */ +#include <libmisc/assert.h> + #include <libusb/tusb_helpers.h> /* for LANGID_*, TU_UTF16() */ #include <libusb/usb_common.h> |