From 8e6258936caea0fda3c6b82d2038cfae66acac66 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Fri, 19 Jul 2019 13:18:35 +0200 Subject: [PATCH] make style --- armsrc/iso14443a.c | 8 ++++---- bootrom/bootrom.c | 8 ++++---- client/emv/emvcore.c | 2 +- client/flasher.c | 8 ++++---- tools/analyzesize.py | 1 - 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index bcd898c89..9c76a476d 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -1596,7 +1596,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing break; } } - + //iceman test if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { b = (uint16_t)(AT91C_BASE_SSC->SSC_RHR); @@ -1937,7 +1937,7 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start //----------------------------------------------------------------------------- static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset) { uint32_t c = 0; - + if (!iso14443a_active) return false; @@ -1968,7 +1968,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive return false; } } - + // timeout already in ms + 100ms guard time if (GetTickCount() - receive_timer > timeout + 100) break; @@ -2378,7 +2378,7 @@ void iso14443a_setup(uint8_t fpga_minor_mode) { UartReset(); NextTransferTime = 2 * DELAY_ARM2AIR_AS_READER; iso14a_set_timeout(1060); // 106 * 10ms default - + iso14443a_active = true; } diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c index bda7de2c6..0726f332d 100644 --- a/bootrom/bootrom.c +++ b/bootrom/bootrom.c @@ -164,9 +164,9 @@ void UsbPacketReceived(uint8_t *packet, int len) { offset = (AT91C_IFLASH_NB_OF_PAGES / 2) * AT91C_IFLASH_PAGE_SIZE / sizeof(uint32_t); } for (i = 0 + (64 * j); i < 64 + (64 * j); i++) { - flash_mem[offset+i] = c->d.asDwords[i]; + flash_mem[offset + i] = c->d.asDwords[i]; } - + /* Check that the address that we are supposed to write to is within our allowed region */ if (((flash_address + AT91C_IFLASH_PAGE_SIZE - 1) >= end_addr) || (flash_address < start_addr)) { /* Disallow write */ @@ -175,8 +175,8 @@ void UsbPacketReceived(uint8_t *packet, int len) { } else { efc_bank->EFC_FCR = MC_FLASH_COMMAND_KEY | - MC_FLASH_COMMAND_PAGEN(page_n) | - AT91C_MC_FCMD_START_PROG; + MC_FLASH_COMMAND_PAGEN(page_n) | + AT91C_MC_FCMD_START_PROG; } // Wait until flashing of page finishes diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c index 6657f2ce3..c814eb11e 100644 --- a/client/emv/emvcore.c +++ b/client/emv/emvcore.c @@ -539,7 +539,7 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, i--; } else { // (1) - card select error, (4) reply timeout, (200) - result length = 0 - if (res == 1 || res == 4 ||res == 200) { + if (res == 1 || res == 4 || res == 200) { if (!LeaveFieldON) DropFieldEx(channel); diff --git a/client/flasher.c b/client/flasher.c index 0db87cb94..25585e7cd 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -83,7 +83,7 @@ int main(int argc, char **argv) { int res; int ret = 0; flash_file_t files[MAX_FILES]; - char * filenames[MAX_FILES]; + char *filenames[MAX_FILES]; bool info = false; memset(files, 0, sizeof(files)); @@ -146,8 +146,8 @@ int main(int argc, char **argv) { if (info) goto finish; - for (int i = 0 ; i < num_files; ++i){ - res = flash_load(&files[i], filenames[i], can_write_bl, mem_avail*ONE_KB); + for (int i = 0 ; i < num_files; ++i) { + res = flash_load(&files[i], filenames[i], can_write_bl, mem_avail * ONE_KB); if (res < 0) { ret = -1; goto finish; @@ -174,7 +174,7 @@ finish: CloseProxmark(); - if (ret==0) + if (ret == 0) PrintAndLogEx(SUCCESS, _BLUE_("All done.")); else PrintAndLogEx(ERR, "Aborted on error."); diff --git a/tools/analyzesize.py b/tools/analyzesize.py index 70c35de26..4a5211c67 100755 --- a/tools/analyzesize.py +++ b/tools/analyzesize.py @@ -31,4 +31,3 @@ elif action.lower() == "diff": flash = text+data print_increase(flash, flash_ref, "Flash") print_increase(bss, bss_ref, "RAM") - \ No newline at end of file