This commit is contained in:
Philippe Teuwen 2019-05-01 01:38:52 +02:00
commit 4f11ef048f
11 changed files with 38 additions and 38 deletions

View file

@ -594,8 +594,8 @@ int TestProxmark(void) {
} }
// reconfigure. // reconfigure.
if ( conn.send_via_fpc == false ) { if (conn.send_via_fpc == false) {
uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS ); uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS);
} }
return PM3_SUCCESS; return PM3_SUCCESS;

View file

@ -129,7 +129,7 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
data[2] = clear_trace; data[2] = clear_trace;
data[3] = keycnt; data[3] = keycnt;
memcpy(data + 4, keyBlock, 6 * keycnt); memcpy(data + 4, keyBlock, 6 * keycnt);
SendCommandNG(CMD_MIFARE_CHKKEYS, data, (4 + 6 * keycnt) ); SendCommandNG(CMD_MIFARE_CHKKEYS, data, (4 + 6 * keycnt));
PacketResponseNG resp; PacketResponseNG resp;
if (!WaitForResponseTimeout(CMD_MIFARE_CHKKEYS, &resp, 2500)) return PM3_ETIMEOUT; if (!WaitForResponseTimeout(CMD_MIFARE_CHKKEYS, &resp, 2500)) return PM3_ETIMEOUT;

View file

@ -35,7 +35,7 @@ static int l_clearCommandBuffer(lua_State *L) {
* @param L * @param L
* @return * @return
*/ */
static int l_fast_push_mode(lua_State *L){ static int l_fast_push_mode(lua_State *L) {
luaL_checktype(L, 1, LUA_TBOOLEAN); luaL_checktype(L, 1, LUA_TBOOLEAN);

View file

@ -75,7 +75,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
char *tmp_ptr = NULL; char *tmp_ptr = NULL;
// {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG} // {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "}; static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
FILE* stream = stdout; FILE *stream = stdout;
switch (level) { switch (level) {
case ERR: case ERR:

View file

@ -107,6 +107,6 @@ uint32_t uart_get_speed(const serial_port sp);
/* Reconfigure timeouts /* Reconfigure timeouts
*/ */
int uart_reconfigure_timeouts(serial_port sp, uint32_t value ); int uart_reconfigure_timeouts(serial_port sp, uint32_t value);
#endif // _UART_H_ #endif // _UART_H_

View file

@ -73,7 +73,7 @@ struct timeval timeout = {
.tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000 .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000
}; };
int uart_reconfigure_timeouts(serial_port sp, uint32_t value ) { int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
timeout.tv_usec = value * 1000; timeout.tv_usec = value * 1000;
return PM3_SUCCESS; return PM3_SUCCESS;
} }