github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

style

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
client/comms.c
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;

20
client/flash.c
View file

@ -63,14 +63,14 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
continue; continue;
} }
PrintAndLogEx(NORMAL, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x", PrintAndLogEx(NORMAL, "%d: V 0x%08x P 0x%08x (0x%08x->0x%08x) [%c%c%c] @0x%x",
i, vaddr, paddr, filesz, memsz, i, vaddr, paddr, filesz, memsz,
(flags & PF_R) ? 'R' : ' ', (flags & PF_R) ? 'R' : ' ',
(flags & PF_W) ? 'W' : ' ', (flags & PF_W) ? 'W' : ' ',
(flags & PF_X) ? 'X' : ' ', (flags & PF_X) ? 'X' : ' ',
offset); offset);
if (filesz != memsz) { if (filesz != memsz) {
PrintAndLogEx(ERR, "Error: PHDR file size does not equal memory size\n" PrintAndLogEx(ERR, "Error: PHDR file size does not equal memory size\n"
"(DATA+BSS PHDRs do not make sense on ROM platforms!)"); "(DATA+BSS PHDRs do not make sense on ROM platforms!)");
return -1; return -1;
} }
if (paddr < last_end) { if (paddr < last_end) {
@ -121,7 +121,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
memcpy(new_data, prev_seg->data, prev_seg->length); memcpy(new_data, prev_seg->data, prev_seg->length);
memcpy(new_data + this_offset, data, filesz); memcpy(new_data + this_offset, data, filesz);
PrintAndLogEx(NORMAL, "Note: Extending previous segment from 0x%x to 0x%x bytes", PrintAndLogEx(NORMAL, "Note: Extending previous segment from 0x%x to 0x%x bytes",
prev_seg->length, new_length); prev_seg->length, new_length);
if (hole) if (hole)
PrintAndLogEx(NORMAL, "Note: 0x%x-byte hole created", hole); PrintAndLogEx(NORMAL, "Note: 0x%x-byte hole created", hole);
free(data); free(data);
@ -335,9 +335,9 @@ static int wait_for_ack(PacketResponseNG *ack) {
if (ack->cmd != CMD_ACK) { if (ack->cmd != CMD_ACK) {
PrintAndLogEx(ERR, "Error: Unexpected reply 0x%04x %s (expected ACK)", PrintAndLogEx(ERR, "Error: Unexpected reply 0x%04x %s (expected ACK)",
ack->cmd, ack->cmd,
(ack->cmd == CMD_NACK) ? "NACK" : "" (ack->cmd == CMD_NACK) ? "NACK" : ""
); );
return -1; return -1;
} }
return 0; return 0;

2
client/mifare/mifarehost.c
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;

2
client/scripting.c
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);

2
client/ui.c
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:

2
uart/uart.h
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_

2
uart/uart_posix.c
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;
} }