Client cleanup and restructuring. Stage 1...

Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.

The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P

The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.

Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)

client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.

client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.

client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.

client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.

include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.

common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.

armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.

common/Makefile.common, armsrc/Makefile: Modify accordingly.
This commit is contained in:
izsh.f0f 2010-02-04 01:27:07 +00:00
commit 7fe9b0b742
59 changed files with 4306 additions and 3968 deletions

View file

@ -1,15 +1,38 @@
WINCC=c:\mingw\bin\gcc
#COMMON_FLAGS = -m32
VPATH = ../common
LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
LDFLAGS = $(COMMON_FLAGS)
CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3
CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3
WINLIBS = -lgdi32 -lsetupapi
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
CMDSRCS = \
crc16.c \
iso14443crc.c \
data.c \
graph.c \
ui.c \
cmddata.c \
cmdhf.c \
cmdhf14a.c \
cmdhf14b.c \
cmdhf15.c \
cmdhflegic.c \
cmdhw.c \
cmdlf.c \
cmdlfem4x.c \
cmdlfhid.c \
cmdlfti.c \
cmdparser.c \
cmdmain.c
CMDOBJS = $(CMDSRCS:.c=.o)
ifeq ($(shell echo ""),)
ifeq ($(shell uname),Darwin)
@ -29,7 +52,7 @@ endif
RM = rm -f
BINS = proxmark3 snooper cli flasher
CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp
CLEAN = cli flasher proxmark3 snooper *.o $(CMDOBJS) *.moc.cpp
else
RM = del
BINS = prox.exe
@ -41,19 +64,17 @@ all: $(BINS)
all-static: LDLIBS:=-static $(LDLIBS)
all-static: snooper cli flasher
prox.exe: prox.c wingui.c command.c flash.c
$(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c flash.c $(WINLIBS)
prox.exe: prox.c wingui.c $(CMDSRCS) flash.c
$(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c $(CMDSRCS) flash.c $(WINLIBS)
proxmark3: LDLIBS+=$(QTLDLIBS)
proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
proxmark3: proxmark3.o $(CMDOBJS) proxusb.o $(QTGUI)
command.o: command.c
snooper: snooper.o $(CMDOBJS) proxusb.o guidummy.o
snooper: snooper.o gui.o command.o usb.o guidummy.o
cli: cli.o $(CMDOBJS) proxusb.o guidummy.o
cli: cli.o gui.o command.o usb.o guidummy.o
flasher: flash.o flasher.o usb.o
flasher: flash.o flasher.o proxusb.o
proxguiqt.moc.cpp: proxguiqt.h
$(MOC) -o$@ $^