Commit graph

64 commits

Author SHA1 Message Date
iceman1001
4d8488e14b CHG: https://github.com/Proxmark/proxmark3/pull/631 from offical repo. (piwi)
CHG: textual adjustments
2018-07-28 14:25:12 +02:00
iceman1001
2e6699273e chg: cleanup from offical repo 2018-04-18 20:17:00 +02:00
iceman1001
85f3870233 chg: removed old WITH_EMV , HAS_512_FLASH, defines, since emv now is native in client and we have automatic detection of 512kb size when compiling. 2017-12-24 10:23:04 +01:00
iceman1001
1e32ceb54c CHG: adding standalone as VPATH.. 2017-09-28 22:36:09 +02:00
iceman1001
72e53b0968 chg: disable emv for armsrc default. 2017-09-20 10:42:46 +02:00
iceman1001
14550557be CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation.
* client/Makefile
 * common/Makefile.common
2017-09-18 22:33:22 +02:00
iceman1001
28f1f23d48 chg: easy printing of MAKE variables
Usage::
  make print-FLASHTOOL
  cd bootrom; make print-APP_CFLAGS
  cd client; make print-GCC_VERSION
2017-09-18 18:59:51 +02:00
iceman1001
a797314dab more adaptations 2017-07-27 22:05:54 +02:00
iceman1001
a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +02:00
Iceman
d59026518e FIX: fullimage.s19
According to @doegox  the *.s19 file is generated with wrong offset for the data section.
ref:  http://wiki.yobi.be/wiki/Proxmark#Flashing_full_image.2C_take_1
2017-05-29 09:39:25 +02:00
Iceman
489e735f86 Update Makefile.common
chg:  disabling 512kb flashing since it has issues with the flasher code.  Might enable it later on.
2017-04-26 21:32:42 +02:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more.
ref: 43534cbad2
2017-02-23 00:03:10 +01:00
iceman1001
19d9376c16 CHG: added some comments when changing the HAS_512_FLASH macro directive.
CHG: 'make cli'  -  needs lualibs to compile.  well,  and more stuff ofcourse.
2017-02-20 11:47:10 +01:00
iceman1001
573e8d72c7 FIX: 'EMV compiling' - Makefiles are very picky about how things are done. its parser is a bit paranoid. So, to make things easier and more correct.
- armsrc/Makefile          when commenting out functionality,  move it below the comment otherwise APPS_CFLAG breaks to early.  See WITH_LCD
  - common/Makefile.common   enable / disable EMV,  uncomment two lines.  then make clean && make all.  flash,   MIGHT NOT work on 256kb devices

FIX: missing break in appmain.c made it go to iclass function..
2017-02-13 15:32:48 +01:00
iceman1001
ed55e9aec4 chg: trying to generalize the EMV build. 2017-02-13 11:05:03 +01:00
iceman1001
5a08545794 ADD: added a compiling flag -DHAS_512_FLASH i common/Makefile.common, to be used for PM3 devices with 512KB. Original commit from @hewitt 2016-10-07 00:12:09 +02:00
iceman1001
62577a62ae FIX: Much of my added extra legic code is commented away now.
FIX: the gcc6.1.1 warning broke my gcc 4.8.4 build env..
2016-09-26 20:21:31 +02:00
iceman1001
fada2feaf7 ADD: @ikarus / @pwpiwi solution to stop treating GCC 6.1.1 warnings like errors. Should compile fine now on GCC6.1.1 2016-09-26 20:02:40 +02:00
iceman1001
87342aadbc CHG: adjusted timing according to @sentinel 's traces 2016-09-14 16:18:04 +02:00
iceman1001
ad493abc2a CHG: changed to the new flasher command. 2016-04-21 10:32:06 +02:00
iceman1001
ff4ff94b25 DEL: Removed old comment, after I've been compiling and testing all -W parameters in it. Didn't find any new warnings. Which is good. 2016-03-01 06:58:32 +01:00
iceman1001
1d0ccbe04b ADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix.
ADD:  added the "t55x7" refactoring by @marshmellow42
2015-10-27 21:47:21 +01:00
iceman1001
9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +02:00
iceman1001
7c99b4f782 CHG: Added the parameters -fdata-sections -ffunction-sections to common/Makefile.common for making the .elf filesize smaller.
REF: https://github.com/Proxmark/proxmark3/issues/83
2015-03-30 16:27:07 +02:00
iceman1001
0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
2015-03-24 11:45:31 +01:00
iceman1001
b1db38e1b7 ADD: piwi's compiler flags -O2 2015-03-18 20:29:58 +01:00
iceman1001
64d1b4efc9 Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	armsrc/Makefile
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/epa.c
	armsrc/iclass.c
	armsrc/iso14443a.c
	armsrc/iso14443a.h
	armsrc/iso15693.c
	armsrc/lfops.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	armsrc/string.h
	armsrc/util.h
	bootrom/bootrom.c
	client/Makefile
	client/cmddata.c
	client/cmddata.h
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhf14b.c
	client/cmdhf15.c
	client/cmdhficlass.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/cmdlf.c
	client/cmdlfem4x.c
	client/cmdlfhid.c
	client/cmdlfhitag.c
	client/cmdlfio.c
	client/cmdmain.c
	client/data.h
	client/flash.c
	client/graph.c
	client/graph.h
	client/loclass/elite_crack.c
	client/loclass/fileutils.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/lualibs/mf_default_keys.lua
	client/lualibs/utils.lua
	client/mifarehost.c
	client/nonce2key/crapto1.c
	client/proxmark3.c
	client/scripting.c
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
	client/scripts/tracetest.lua
	common/Makefile.common
	common/cmd.c
	common/cmd.h
	common/lfdemod.c
	common/lfdemod.h
	common/usb_cdc.c
	common/usb_cdc.h
	include/usb_cmd.h
2015-01-29 21:39:33 +01:00
iceman1001
23b598ee23 CHG: Minor code clean up.
ADD: crc16.c - new crc16_ccitt calc.
2015-01-07 20:40:22 +01:00
iceman1001
f6c18637ca chg: LF t55xx trace
new:  LF t55xx info
2014-10-06 19:42:50 +02:00
iceman1001
f38a152863 First check in. 2014-09-11 23:23:46 +02:00
roel@libnfc.org
28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
roel@libnfc.org
902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
dn337t@gmail.com
18d4eec685 removed commented out CFLAGS setting (probably committed by mistake) 2012-07-03 12:14:46 +00:00
dekoninggans@gmail.com
5f60ac5716 Changed arm-eabi- to arm-none-eabi (new convention) 2012-06-28 13:56:21 +00:00
roel@libnfc.org
245e844e80 fix temp changes 2011-09-05 11:48:08 +00:00
roel@libnfc.org
38c4979dae fix compiling under MAC OSX 2011-09-05 11:44:45 +00:00
adam@algroup.co.uk
bd84638614 create target for binary file archive (linux version) 2010-05-09 12:17:42 +00:00
yobibe
b38742c92c Fix small issue in make help 2010-03-29 10:36:26 +00:00
izsh@fail0verflow.com
e7227419e5 Don't modify the PATH to prevent from mixing multiple arm-eabi compilers in the PATH 2010-03-04 00:33:05 +00:00
adam@algroup.co.uk
09c1ce4bdd put arm-eabi compiler back on path for those that have followed devkitpro installation instructions 2010-02-27 09:05:03 +00:00
marcansoft
98540684df Link using gcc and get rid of the LIBGCC stuff
GCC knows how to find libgcc, and the proper way to link C code is to
use gcc, not ld.
2010-02-26 14:03:03 +00:00
izsh@fail0verflow.com
a63deed172 common/Makefile.common: Revert the DEVKITARM change. Just need to put the cross compiler in the path. No need to hardcode for a given distribution and a given version. 2010-02-26 13:06:07 +00:00
adam@algroup.co.uk
30351384b6 correct paths for devkitPro Linux development environment 2010-02-22 12:36:42 +00:00
marcansoft
bd20f8f478 Add license headers to armsrc/bootrom/common stuff
I have kept whatever copyright notices exist. Please add your own
copyright notice if you have made any nontrivial changes or additions to
the code. There are several files without any attribution, currently.
2010-02-21 00:12:52 +00:00
marcansoft
c062856a74 But let people override CROSS if they reall want to ;) 2010-02-20 21:32:09 +00:00
marcansoft
272e55ca64 Switch compiler to arm-eabi instead of arm-elf
Non-EABI has been deprecated for a while and in fact won't build
with interworking support these days. Configuring the latest
gcc/binutils for arm-eabi works out of the box, so use that.
2010-02-20 21:28:29 +00:00
izsh.f0f
7fe9b0b742 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.
2010-02-04 01:27:07 +00:00
roel@libnfc.org
6c5ad03860 mifare usb update 2009-12-30 00:18:35 +00:00
henryk@ploetzli.ch
a665f74081 Use the interworking version of libgcc.a 2009-12-22 16:40:03 +00:00
bushing
d5be6f7cd4 fix OS detection, libgcc detection 2009-12-22 12:50:34 +00:00