Commit graph

46 commits

Author SHA1 Message Date
Philippe Teuwen
21be6d4400 FPC: got RX working, got client over usart somehow working..., see detailed commit msg
* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
2019-04-02 22:06:10 +02:00
Philippe Teuwen
43ca641939 Flasher: Avoid race condition when flasher finds the not yet closed pm3 port 2019-03-31 12:15:49 +02:00
iceman1001
26804cb85f style 2019-03-18 23:48:40 +01:00
Philippe Teuwen
961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen
da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen
0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
iceman1001
5c231e772c chg: use calloc 2019-01-30 21:53:10 +01:00
Chris
24eaac8681 CHG: the thread comms refactoring from offical pm3 repo
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
2018-09-06 21:43:20 +02:00
Chris
3fd1854b8a chg: from offical 2018-06-17 12:55:09 +02:00
iceman1001
2e6699273e chg: cleanup from offical repo 2018-04-18 20:17:00 +02:00
iceman1001
24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
iceman1001
d1566728e2 more fflushes. 2017-10-30 15:10:32 +01:00
iceman1001
92858d39d4 fix: flushing some output.. 2017-10-30 15:08:20 +01:00
iceman1001
f6d2d508b4 rem: removed old references to google code. 2017-10-29 19:25:34 +01:00
iceman1001
b99b2dd30f FIX: stderr -> stdout 2017-10-19 13:41:55 +02:00
iceman1001
16028f7d33 CHG: appmain now calls cmd_recieve as it should
CHG: flasher -  removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client,  wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes.  usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
2017-10-17 20:58:17 +02:00
iceman1001
19a2c05de0 FIX: ubuntu complains about sleep... 2017-07-30 09:30:42 +02:00
iceman1001
f28da2da6e monster merge...
all those changes marshmellow did..  and more...
2017-07-30 09:17:48 +02:00
iceman1001
83adc96d81 some missing include inttypes.. 2017-07-28 01:37:55 +02:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more.
ref: 43534cbad2
2017-02-23 00:03:10 +01:00
iceman1001
5ebba500dc CHG: prints if command is NACK, 2017-02-19 01:34:21 +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
f62b5e1204 added @piwi 's usb speed test.
.. found out that my usb speed is really slow.  Started to look for reasons. Have a win7 64 env, running on a vmware image.
2015-07-31 10:37:24 +02:00
iceman1001
7838f4beba MERGED: @holimans changes
MERGED: @piwi changes
MERGED: @marshmellows changes.

I'm not even gonna try write up all that stuff..

ADD: changed some commands inside the "Hf 14a sim" on deviceside.
ADD: @mobeius "two nonce" version for mfkey32.   It is also inside the "hf 14a sim" with the "x" parameter.
2015-07-22 23:00:52 +02:00
iceman1001
3fe4ff4f03 CHG: generic code clean up. Removal of commented code.
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
2015-01-05 15:51:27 +01:00
fnargwibble@gmail.com
e654346b79 i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh. 2013-10-05 16:55:53 +00:00
fnargwibble@gmail.com
e12b82d362 show device name during flashing and change advice on hanging 2013-10-05 16:44:48 +00:00
roel@libnfc.org
d8193fa5ac flasher updated again, should work more solid now 2013-03-21 12:44:21 +00:00
roel@libnfc.org
125a98a110 fixed stupid 64-bit formatting for x86/amd64 and unix/windows 2013-02-28 22:22:24 +00: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
marcansoft
66d6ba7057 Get rid of flasher memory leak
Too bad the proxmark usb code still has a bajillion :(
2010-02-26 15:13:58 +00:00
marcansoft
0ae6234a5b Remove remnant junk and TODO -> FIXME 2010-02-26 14:08:54 +00:00
marcansoft
8fe1a992c7 New flasher, much more paranoid and much more correct.
Knows how to merge segments to solve the "data overwrites last text
block" issue.

Removed "partition" stuff. Now it just flashes any elf file you pass,
though there's still a -b option required to explicitly enable flashing
the bootloader.
2010-02-26 14:03:43 +00:00
izsh@fail0verflow.com
a553f26748 Add License/Copyright headers/notices. 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:47:22 +00:00
izsh@fail0verflow.com
4cd41f34ea Removing windows specific code. Everything now compile and work the same for the three OS 2010-02-20 23:35:09 +00:00
izsh@fail0verflow.com
91c38cf715 Fix windows compilation issues. But still not final. We should move to pthread and factorize the code with *nix). Ideally we should move to libusb-1.0 too. 2010-02-20 00:36:48 +00:00
d18c7db
3ec3a4724e Removed hackish usb.h file, re-added Info.plist 2010-02-19 23:24:49 +00:00
d18c7db
393c3ef933 Attempt at getting the windows client to at least compile without bombing out with errors, may not be fully usable, e.g. plot window doesn't come up, etc 2010-02-18 08:24:26 +00:00
adam@algroup.co.uk
83a9b236fe fix warning: implicit declaration of function ‘exit’ 2010-02-06 09:33:17 +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
bushing
cef938d883 fix a stack overflow in the flasher routine (my bad) 2010-01-27 09:25:37 +00:00
d18c7db
815f3f2559 Decreased BigBuff mem, some elf flasher fixes (needs more work) but flashing correctly currently. 2010-01-10 03:57:41 +00:00
bushing
2cab856f9f removed support for s19 files in the flasher and replaced it
with elf parsing.  can we stop specifying the "partition" yet?
2010-01-05 00:02:12 +00:00
bushing
6e4d4ee609 refactor flashing code into flash.h, so we can share it between platforms 2010-01-04 05:11:08 +00:00