From fa357459f88bb8f0170d1a68df66e7d068d59996 Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Fri, 27 Sep 2024 20:45:36 -0600
Subject: fixes

---
 libusb/CMakeLists.txt                    | 7 +++++++
 libusb/include/libusb/tusb_helpers.h.gen | 8 ++++++--
 libusb/include/libusb/usb_common.h       | 2 +-
 libusb/usb_common.c                      | 4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'libusb')

diff --git a/libusb/CMakeLists.txt b/libusb/CMakeLists.txt
index e1a9284..c232868 100644
--- a/libusb/CMakeLists.txt
+++ b/libusb/CMakeLists.txt
@@ -8,3 +8,10 @@ target_include_directories(libusb SYSTEM INTERFACE ${CMAKE_CURRENT_LIST_DIR}/inc
 target_sources(libusb INTERFACE
 	usb_common.c
 )
+target_link_libraries(libusb INTERFACE
+	pico_unique_id
+	tinyusb_device
+	tinyusb_board
+
+	libcr_ipc
+)
diff --git a/libusb/include/libusb/tusb_helpers.h.gen b/libusb/include/libusb/tusb_helpers.h.gen
index 9b917da..82e15ba 100755
--- a/libusb/include/libusb/tusb_helpers.h.gen
+++ b/libusb/include/libusb/tusb_helpers.h.gen
@@ -63,8 +63,12 @@ cat <<'EOT'
  * to sort their list of by most-significant-byte was a poor editorial choice.
  */
 EOT
-[ -f 3rd-party/MS-LCID.pdf ] || wget -O 3rd-party/MS-LCID.pdf 'https://winprotocoldoc.blob.core.windows.net/productionwindowsarchives/MS-LCID/%5bMS-LCID%5d.pdf'
-[ -f 3rd-party/MS-LCID.txt ] || pdftotext -layout 3rd-party/MS-LCID.pdf
+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'
+fi
+if [[ ! -f 3rd-party/MS-LCID.txt || 3rd-party/MS-LCID.txt -ot 3rd-party/MS-LCID.txt ]]; then
+	pdftotext -layout 3rd-party/MS-LCID.pdf
+fi
 <3rd-party/MS-LCID.txt \
 	grep -E '^\s*0x[0-9A-F]{4}\s+[a-z]' | sed 's/,.*//' | grep -v reserved | # find the lines we're interested in
 	sed -E 's/^\s*0x(..)(..)\s+(\S.*)/\2 \1 \3/p' | tr '[:lower:]-' '[:upper:]_' | # format them as 'PRIhex SUBhex UPPER_STR' 
diff --git a/libusb/include/libusb/usb_common.h b/libusb/include/libusb/usb_common.h
index 3b45246..33308d2 100644
--- a/libusb/include/libusb/usb_common.h
+++ b/libusb/include/libusb/usb_common.h
@@ -7,7 +7,7 @@
 #ifndef _USB_COMMON_H_
 #define _USB_COMMON_H_
 
-#include "coroutine.h"
+#include <libcr/coroutine.h>
 
 /* Strings ********************************************************************/
 
diff --git a/libusb/usb_common.c b/libusb/usb_common.c
index f10ace8..5485d71 100644
--- a/libusb/usb_common.c
+++ b/libusb/usb_common.c
@@ -11,8 +11,8 @@
 #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 "tusb_helpers.h" /* for LANGID_*, TU_UTF16() */
-#include "usb_common.h"
+#include <libusb/tusb_helpers.h> /* for LANGID_*, TU_UTF16() */
+#include <libusb/usb_common.h>
 
 /* Strings ********************************************************************/
 
-- 
cgit v1.2.3-2-g168b