Commit graph

80 commits

Author SHA1 Message Date
Vladimir Serbinenko 9923765c0a Specify that we need TCP and not UDP connection
Relevant man pages say that with our previous
code libc might return either. Glibc returns tcp but
bionic returns udp. So specify it explicitly
2019-05-29 19:25:48 +02:00
iceman1001 13cd6ab61a add support for higher speeds. 2019-05-18 21:38:21 +02:00
Philippe Teuwen 362d7b6956 Fix win32 uart_receive disconnected device error code (@iceman) 2019-05-16 13:16:23 +02:00
Philippe Teuwen b5e4a60a15 timeout reconfiguration: flag was never cleared and some more changes:
* clear newtimeout_pending flag
* fix initial newtimeout_pending flag value on win32
* remove all _atomic as anyway a load+clear wouldn't be atomic and we're not in a critical situation: just one writer seldomly called on reconnect
* move new timeout poll to uart_recv for faster deployment
* remove redundant uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
2019-05-16 12:35:40 +02:00
iceman1001 b206ecfad3 chg: revert logic 2019-05-16 07:44:52 +02:00
iceman1001 27c556b69a fix: now compiles on mingw 2019-05-16 07:32:34 +02:00
Philippe Teuwen b4e8be82f4 remove spMutex, use atomic test&set instead 2019-05-16 00:29:30 +02:00
Philippe Teuwen 7928a82434 uart_win32: Remove debug msgs 2019-05-10 07:46:49 +02:00
Philippe Teuwen 68e5b3c355 style 2019-05-08 01:35:51 +02:00
iceman1001 7785dcbce4 chg: less fallbacks 2019-05-07 12:05:37 +02:00
iceman1001 6113d6bbb4 chg: init timeout values everytime. 2019-05-07 12:05:23 +02:00
iceman1001 f68a398e42 rename 2019-05-07 11:46:12 +02:00
iceman1001 61d250a7f8 add: 'hw connect' - lets you connect to a specified serial port. If already connected, it disconnects current port before. 2019-05-07 11:05:05 +02:00
iceman1001 29a160c905 reconnect version2 yolo 2019-05-06 22:41:00 +02:00
iceman1001 a49ae2d0ce FIX: slow reconfigure on mingw of serial port 2019-05-03 21:33:00 +02:00
Philippe Teuwen 4f11ef048f style 2019-05-01 01:38:52 +02:00
iceman1001 f8f39d6196 fix: passing a struct. 2019-04-30 22:03:20 +02:00
Philippe Teuwen dbf5e74069 Fix "control reaches end of non-void function" warning 2019-04-30 21:48:14 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
iceman1001 7ee6125ef6 fixes.. 2019-04-30 13:01:55 +02:00
iceman1001 e1063e2836 chg: reconfigure uart timeouts when compiled for FPC and connecting over USB. 2019-04-30 12:57:44 +02:00
iceman1001 26c953aee8 MINGW, uart speed up when compiling with FPC support 2019-04-30 09:47:21 +02:00
Philippe Teuwen 12937884f6 move uart_speed to conn struct and display baudrate only for real UART 2019-04-27 01:15:52 +02:00
Philippe Teuwen 5c9c4637d8 doc uart timings 2019-04-25 19:55:37 +02:00
iceman1001 278ec017fe chg: increased client side timeout. Accoring to test with rdv4 addon ( @doegox ) 2019-04-25 17:04:51 +02:00
Philippe Teuwen 4d0875442f uart_posix rx timeouts 2019-04-22 01:33:39 +02:00
Philippe Teuwen e0cd5850f9 usart: clean, doc, now uart_posix 60ms 2019-04-21 12:02:36 +02:00
Philippe Teuwen a77ea12b77 client uart: increase rx timeout 2019-04-21 01:38:24 +02:00
Philippe Teuwen 4aa1b49493 fix uart_posix: bytecound must be 32b 2019-04-21 01:05:02 +02:00
Philippe Teuwen 6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
iceman1001 7912f7494b init array 2019-04-14 19:44:55 +02:00
Philippe Teuwen 9a7bba2438 Move UART open msg to avoid flood in wait mode 2019-04-14 18:49:19 +02:00
Philippe Teuwen 04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
Philippe Teuwen 97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen 7f76fea21a good const, bad const, fixing -Wincompatible-pointer-types-discards-qualifiers 2019-04-10 10:21:42 +02:00
Philippe Teuwen 7effdfc275 style 2019-04-05 23:29:19 +02:00
iceman1001 ea5dddafef fix: invalidPrintfArg 2019-04-05 18:47:36 +02:00
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 7bd95dd5c3 FPC experiments: got so far TX_only, usart=115200 + usb=460800, see full commit msg
* Add \r\n to sent strings
* remove usart_init() from UsbPacketReceive cmd, it's already init in main.
* Add PLATFORM PM3RDV4FPC to ease dev
* TX: US_TCR is len of data to send, not len of buffer
* Use only one PDC bank as we're using it in sync
* Busy loop to wait for end of TX as we'using it in sync
* Change usart speed to 115200
* Don't downgrade USB speed, keep 460800
* Attempt to detect received data, fail so far
2019-04-02 01:06:03 +02:00
Philippe Teuwen 1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +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 1fe75f2481 zlib, uart: fix mix of spaces & tabs 2019-03-09 11:15:18 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001 8512c0ea09 fix: mem leak 2019-02-24 19:25:44 +01:00
iceman1001 ef9d1fa378 fix: mem leak, 2019-02-22 15:21:20 +01:00
iceman1001 439f767b4d fix: mem leak 2019-02-21 23:35:03 +01:00
iceman1001 265c069edc chg... missing 2019-02-21 16:19:07 +01:00
iceman1001 44392c6afc fix: whitespaces 2019-02-21 16:09:27 +01:00
iceman1001 00d1fd9d45 fix: mem leaks 2019-02-21 16:07:14 +01:00