Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ujprog/Makefile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ujprog/ujprog.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ static const char *verstr = "ULX3S JTAG programmer v 3.4";
#include <dev/ppbus/ppi.h>
#include <dev/ppbus/ppbconf.h>
#endif
#include <libusb.h>
#include <ftdi.h>
#endif

Expand Down Expand Up @@ -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) {
Expand Down