From 7d6f971db4ca1b9c06e166c223e87b8306b5da8e Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Fri, 26 Apr 2019 00:04:32 +0200 Subject: [PATCH] archive and fix hid-flasher --- .../flasher}/Info.plist | 0 .../flasher}/Makefile | 11 ++++------- .../flasher}/elf.h | 0 .../flasher}/flash.c | 2 +- .../flasher}/flash.h | 0 .../flasher}/flasher.c | 2 +- .../flasher}/obj/.dummy | 0 .../flasher}/proxendian.h | 0 .../flasher}/proxmark3.h | 0 .../flasher}/proxusb.c | 1 + .../flasher}/proxusb.h | 1 - .../flasher}/sleep.h | 0 .../flasher}/usb_cmd.h | 0 client/{ => deprecated-hid-flasher}/unbind-proxmark | 0 14 files changed, 7 insertions(+), 10 deletions(-) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/Info.plist (100%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/Makefile (73%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/elf.h (100%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/flash.c (99%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/flash.h (100%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/flasher.c (99%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/obj/.dummy (100%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxendian.h (100%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxmark3.h (100%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxusb.c (99%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/proxusb.h (97%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/sleep.h (100%) rename client/{hid-flasher => deprecated-hid-flasher/flasher}/usb_cmd.h (100%) rename client/{ => deprecated-hid-flasher}/unbind-proxmark (100%) diff --git a/client/hid-flasher/Info.plist b/client/deprecated-hid-flasher/flasher/Info.plist similarity index 100% rename from client/hid-flasher/Info.plist rename to client/deprecated-hid-flasher/flasher/Info.plist diff --git a/client/hid-flasher/Makefile b/client/deprecated-hid-flasher/flasher/Makefile similarity index 73% rename from client/hid-flasher/Makefile rename to client/deprecated-hid-flasher/flasher/Makefile index 90b29748f..bff511459 100644 --- a/client/hid-flasher/Makefile +++ b/client/deprecated-hid-flasher/flasher/Makefile @@ -3,26 +3,23 @@ # at your option, any later version. See the LICENSE.txt file for the text of # the license. #----------------------------------------------------------------------------- -include ../../common/Makefile.common CC=gcc CXX=g++ #COMMON_FLAGS = -m32 -VPATH = ../../common OBJDIR = obj +LDLIBS = -lreadline -lpthread +CFLAGS = -std=gnu99 -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3 ifeq ($(platform),Darwin) - LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb-1.0 -lreadline -lpthread - CFLAGS = -std=gnu99 -I. -I../include -I../common -I/usr/local/include -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3 + LDLIBS += -lusb-1.0 else - LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread - CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3 + LDLIBS += -lusb endif LDFLAGS = $(COMMON_FLAGS) CXXFLAGS = -QTLDLIBS = RM = rm -f BINS = flasher diff --git a/client/hid-flasher/elf.h b/client/deprecated-hid-flasher/flasher/elf.h similarity index 100% rename from client/hid-flasher/elf.h rename to client/deprecated-hid-flasher/flasher/elf.h diff --git a/client/hid-flasher/flash.c b/client/deprecated-hid-flasher/flasher/flash.c similarity index 99% rename from client/hid-flasher/flash.c rename to client/deprecated-hid-flasher/flasher/flash.c index 22f57a817..48d0f00de 100644 --- a/client/hid-flasher/flash.c +++ b/client/deprecated-hid-flasher/flasher/flash.c @@ -11,11 +11,11 @@ #include #include #include -#include "util_posix.h" #include "proxusb.h" #include "flash.h" #include "elf.h" #include "proxendian.h" +#include "sleep.h" #define FLASH_START 0x100000 #define FLASH_SIZE (256*1024) diff --git a/client/hid-flasher/flash.h b/client/deprecated-hid-flasher/flasher/flash.h similarity index 100% rename from client/hid-flasher/flash.h rename to client/deprecated-hid-flasher/flasher/flash.h diff --git a/client/hid-flasher/flasher.c b/client/deprecated-hid-flasher/flasher/flasher.c similarity index 99% rename from client/hid-flasher/flasher.c rename to client/deprecated-hid-flasher/flasher/flasher.c index 0cc800826..f9d5f49b7 100644 --- a/client/hid-flasher/flasher.c +++ b/client/deprecated-hid-flasher/flasher/flasher.c @@ -9,9 +9,9 @@ #include #include #include -#include "util_posix.h" #include "proxusb.h" #include "flash.h" +#include "sleep.h" static void usage(char *argv0) { fprintf(stderr, "Usage: %s [-b] image.elf [image.elf...]\n\n", argv0); diff --git a/client/hid-flasher/obj/.dummy b/client/deprecated-hid-flasher/flasher/obj/.dummy similarity index 100% rename from client/hid-flasher/obj/.dummy rename to client/deprecated-hid-flasher/flasher/obj/.dummy diff --git a/client/hid-flasher/proxendian.h b/client/deprecated-hid-flasher/flasher/proxendian.h similarity index 100% rename from client/hid-flasher/proxendian.h rename to client/deprecated-hid-flasher/flasher/proxendian.h diff --git a/client/hid-flasher/proxmark3.h b/client/deprecated-hid-flasher/flasher/proxmark3.h similarity index 100% rename from client/hid-flasher/proxmark3.h rename to client/deprecated-hid-flasher/flasher/proxmark3.h diff --git a/client/hid-flasher/proxusb.c b/client/deprecated-hid-flasher/flasher/proxusb.c similarity index 99% rename from client/hid-flasher/proxusb.c rename to client/deprecated-hid-flasher/flasher/proxusb.c index 7563429d8..71bb0708c 100644 --- a/client/hid-flasher/proxusb.c +++ b/client/deprecated-hid-flasher/flasher/proxusb.c @@ -9,6 +9,7 @@ // USB utilities //----------------------------------------------------------------------------- #include "proxusb.h" +#include "sleep.h" // It seems to be missing for mingw #ifndef ETIMEDOUT diff --git a/client/hid-flasher/proxusb.h b/client/deprecated-hid-flasher/flasher/proxusb.h similarity index 97% rename from client/hid-flasher/proxusb.h rename to client/deprecated-hid-flasher/flasher/proxusb.h index 69d47abd2..f79fd7e33 100644 --- a/client/hid-flasher/proxusb.h +++ b/client/deprecated-hid-flasher/flasher/proxusb.h @@ -22,7 +22,6 @@ #include #include "proxmark3.h" #include "usb_cmd.h" -#include "util_posix.h" extern unsigned char return_on_error; extern unsigned char error_occured; diff --git a/client/hid-flasher/sleep.h b/client/deprecated-hid-flasher/flasher/sleep.h similarity index 100% rename from client/hid-flasher/sleep.h rename to client/deprecated-hid-flasher/flasher/sleep.h diff --git a/client/hid-flasher/usb_cmd.h b/client/deprecated-hid-flasher/flasher/usb_cmd.h similarity index 100% rename from client/hid-flasher/usb_cmd.h rename to client/deprecated-hid-flasher/flasher/usb_cmd.h diff --git a/client/unbind-proxmark b/client/deprecated-hid-flasher/unbind-proxmark similarity index 100% rename from client/unbind-proxmark rename to client/deprecated-hid-flasher/unbind-proxmark