From e2fc6ea6dbe3de047785d22fbfae799d3999041b Mon Sep 17 00:00:00 2001 From: Andres Erbsen Date: Sat, 28 Mar 2026 11:21:46 -0700 Subject: [PATCH] build on Alpine Linux, require libusb 1.0.9-rc3 (2008) --- ujprog/Makefile.linux | 4 ++-- ujprog/ujprog.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ujprog/Makefile.linux b/ujprog/Makefile.linux index c4342d1..3d611c7 100644 --- a/ujprog/Makefile.linux +++ b/ujprog/Makefile.linux @@ -7,9 +7,9 @@ ARCHNAME = $(shell uname -m)-linux-gnu # for linux on raspberrypi-3 # ARCHNAME = arm-linux-gnueabihf -FTLIB = /usr/lib/${ARCHNAME}/libftdi.a +FTLIB ?= /usr/lib/${ARCHNAME}/libftdi.a #FTLIB = -lftdi -USBLIB = /usr/lib/${ARCHNAME}/libusb.a +USBLIB ?= /usr/lib/${ARCHNAME}/libusb.a ujprog: ${SRCS} ${CC} ${CFLAGS} ${SRCS} ${FTLIB} ${USBLIB} -o ujprog diff --git a/ujprog/ujprog.c b/ujprog/ujprog.c index bdc30ea..c00d88c 100644 --- a/ujprog/ujprog.c +++ b/ujprog/ujprog.c @@ -75,6 +75,7 @@ static const char *verstr = "ULX3S JTAG programmer v 3.4"; #include #include #endif +#include #include #endif @@ -1045,7 +1046,7 @@ shutdown_usb(void) } #ifdef __linux__ - usb_reset((void *) fc.usb_dev); + libusb_reset_device(fc.usb_dev); #else res = ftdi_usb_close(&fc); if (res < 0) {