Commit graph

79 commits

Author SHA1 Message Date
Philippe Teuwen 51e4df533e New button behaviour in bootloader mode:
- Keep button pressed when powering to force entering bootloader
  - Once in bootloader more, you can release the button
- When in bootloader mode (no matter how you entered that mode)
  - One button press to quit bootloader mode and boot main image
2019-05-26 17:48:30 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Philippe Teuwen 7d2d23ce50 fix bootrom using new names (but still old packets) 2019-04-25 01:53:09 +02:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 ce5fcf1e2d simplify 2019-04-07 12:20:17 +02:00
iceman1001 ca9061bd32 changed byte_t -> uint8_t 2019-03-21 15:19:18 +01:00
Philippe Teuwen 2f12e57408 Makefiles: remove spurious spaces/tabs 2019-03-10 11:35:03 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 248a861613 bootrom: fix mix of spaces & tabs 2019-03-09 10:42:03 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001 38853b111f FIX: adding directives to reduce size on systems like Gentoo Hardned (see https://github.com/iceman1001/proxmark3/issues/268) 2019-01-05 20:59:00 +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
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
Chris 49735b62f1 syntax sugar 2018-07-04 12:20:08 +02:00
Chris 35b7989b1c chg: OR in values. 2018-07-02 18:54:12 +02:00
iceman1001 b0545ed555 chg: re-arranged 2017-10-20 14:49:36 +02:00
iceman1001 3b665be5fc chg: usb_cdc, it should be similar to official pm3. lets 2017-10-19 13:06:47 +02:00
iceman1001 1f0a1edfbe CHG: restored the wait in flash-mode. Its waiting for the device to "reboot"..
CHG: usb_Cdc,   :  usb specs say 100ms delay. Previous delay was much longer...
2017-10-17 23:09:32 +02:00
iceman1001 dc7473135c syntax cleaning 2017-10-17 22:05:52 +02:00
iceman1001 d46955e309 FIX: bootrom - flashmode should also not assume sizeof(usbcommand) 544 bytes 2017-10-17 21:14:36 +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 77103e71cf CHG: bootrom flashmode, the delay wait, is already inside usb_enable() function. 2017-10-13 10:40:26 +02:00
iceman1001 e886490a2d CHG: from normal poll, to the length validating one. 2017-10-10 14:04:20 +02:00
iceman1001 07fffb4645 CHG: bootrom configuration to highest clock PLL 2017-09-26 17:04:53 +02:00
iceman1001 0f7241f4b3 FIX: found old thread on forum from 2010, saying this bitshifts are wrong.
ref:   http://www.proxmark.org/forum/viewtopic.php?id=643
2017-09-26 00:19:54 +02:00
iceman1001 1c3ffe1ce2 syntax sugar 2017-09-20 10:42:03 +02:00
iceman1001 6598e12752 FIX: good solution for enabling 512kb memory, instead of a #define. It reads the chipId and detects memsize based on it. 2017-08-22 11:55:00 +02:00
iceman1001 4406f4ee2a CHG: removed some #DEFINE TRUE/FALSE 2017-07-07 12:52:51 +02:00
iceman1001 07bc72b880 CHG: continue code cleanup.
REM: removed stdint.h ,  since we are using c99 when compiling.
2017-02-23 00:32:14 +01:00
iceman1001 9932c55a4a CHG: lf em - refactored @marshmellow42 's em paritycheck.
ADD: `bootrom/Makefile` got some options.  It shouldnt change anything.
2017-02-19 23:24:19 +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 3c6542087e CHG: @ikarus23 removed all missleadning warnings for GCC6.1.1. 2016-09-26 21:38:19 +02:00
René Werner 1cb9b2a3cf used tabs instead of spaces 2016-09-13 21:04:13 +02:00
René Werner 78f59945a7 fixed indentation to get rid of warnings
warnings are treated as errors, so a warning due to misleading
indentation is kinda annoying
2016-09-13 20:57:25 +02:00
iceman1001 cf69eca0ff CHG: a bit code clean up,
FIX: a comparison with signed vs unsigned was solved.   I'm reluctant to change this code since it is a vital piece.
2016-03-01 07:00:56 +01:00
iceman1001 0de8e3874d A lot of changes...
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities,   (not a proper DEMOD, but a start)
.. GetCountUS  better precision from @pwpivi
.. bin2hex,  hex2bin  from @holiman

...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler,   nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block...  See Issue #136  https://github.com/Proxmark/proxmark3/issues/136    Not solved yet.

...
Started add SHA256..   not working yet..
2015-10-04 18:01:33 +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 225ccb910e ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2,
REM: removed old comments in bootrom.c
CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c
2015-01-07 17:42:57 +01:00
roel@libnfc.org 349eabe567 updated code to follow same blinking patterns with leds during flashing/holding button 2013-03-02 06:28:28 +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 6e82300dda removed all old usb calls 2012-12-05 16:14:10 +00:00
roel@libnfc.org 902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
henryk@ploetzli.ch 2c3685c26c BOOTROM CHANGE: Add jump to interrupt handler from Advanced Interrupt Controller.
This change is necessary for all IRQ functionality. If a future osimage needs IRQ functions, the bootloader must be updated to at least this version.
2010-09-10 22:34:24 +00:00
adam@algroup.co.uk bd84638614 create target for binary file archive (linux version) 2010-05-09 12:17:42 +00:00
d18c7db 0aa4cfc2f1 Fix up small error in main osc startup delay and replace more custom defines with standard Atmel defines 2010-03-04 08:15:59 +00:00
marcansoft 24b182d01b Remove 512k support, fix flash waitstates
512k chip support isn't complete anyway and the incorrect clock would've
ended up destroying Flash anyway. The 256k waitstates were set to 0,
which is outside the spec. Set them to 1, which is allowed.
2010-03-03 13:33:24 +00:00
d18c7db 86c35934fc Corrected erroneous bit masking 2010-02-28 05:30:26 +00:00