diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c index f328ccb0d..c872c1261 100644 --- a/armsrc/hitag2.c +++ b/armsrc/hitag2.c @@ -1279,7 +1279,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) { } FpgaDownloadAndGo(FPGA_BITSTREAM_LF); - BigBuf_free(); + BigBuf_free(); clear_trace(); set_tracing(true); @@ -1338,11 +1338,11 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) { // DbpString("Configured for hitag2 reader"); } else { Dbprintf("Error, unknown hitag reader type: %d", htf); - goto out; + goto out; } uint8_t attempt_count = 0; - - while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length() ) { + + while (!bStop && !BUTTON_PRESS() && !usb_poll_validate_length()) { WDT_HIT(); @@ -1376,7 +1376,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) { attempt_count++; //attempt 3 times to get uid then quit if (!bStop && attempt_count == 3) bStop = true; - + break; } default: { @@ -1474,8 +1474,8 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) { } } } - -out: + +out: LEDsoff(); AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c index 53b8e75b3..faf77229c 100644 --- a/armsrc/lfsampling.c +++ b/armsrc/lfsampling.c @@ -239,9 +239,9 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) { if (!silent) printConfig(); LFSetupFPGAForADC(config.divisor, activeField); - uint32_t ret = DoAcquisition_config(silent, sample_size); - FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); - return ret; + uint32_t ret = DoAcquisition_config(silent, sample_size); + FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); + return ret; } /** @@ -250,7 +250,7 @@ uint32_t ReadLF(bool activeField, bool silent, int sample_size) { **/ uint32_t SampleLF(bool printCfg, int sample_size) { BigBuf_Clear_ext(false); - return ReadLF(true, printCfg, sample_size); + return ReadLF(true, printCfg, sample_size); } /** * Initializes the FPGA for snoop-mode (field off), and acquires the samples. @@ -258,7 +258,7 @@ uint32_t SampleLF(bool printCfg, int sample_size) { **/ uint32_t SnoopLF() { BigBuf_Clear_ext(false); - return ReadLF(false, true, 0); + return ReadLF(false, true, 0); } /** @@ -427,12 +427,10 @@ uint32_t doCotagAcquisitionManchester() { if (sample > COTAG_ONE_THRESHOLD) { prev = curr; curr = 1; - } - else if ( sample < COTAG_ZERO_THRESHOLD) { + } else if (sample < COTAG_ZERO_THRESHOLD) { prev = curr; curr = 0; - } - else { + } else { curr = prev; } diff --git a/client/cmdhf.c b/client/cmdhf.c index 237149348..63bfd6d0f 100644 --- a/client/cmdhf.c +++ b/client/cmdhf.c @@ -42,7 +42,7 @@ int CmdHFSearch(const char *Cmd) { if (cmdp == 'h') return usage_hf_search(); PrintAndLogEx(INFO, "Checking for known tags...\n"); - + int ans = CmdHF14AInfo("s"); if (ans > 0) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO14443-A tag") " found\n"); diff --git a/client/cmdlf.c b/client/cmdlf.c index b6da222c6..b6202ed73 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -216,7 +216,7 @@ int CmdFlexdemod(const char *Cmd) { } if (start == size - LONG_WAIT) { - PrintAndLogEx(WARNING, "nothing to wait for"); + PrintAndLogEx(WARNING, "nothing to wait for"); return 0; } @@ -839,12 +839,12 @@ bool CheckChipType(bool getDeviceData) { //check for t55xx chip... if (tryDetectP1(true)) { - PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found"); + PrintAndLogEx(SUCCESS, "\nChipset detection : " _GREEN_("Atmel T55xx") " found"); PrintAndLogEx(SUCCESS, "Try " _YELLOW_("`lf t55xx`")" commands"); retval = true; goto out; } - + out: save_restoreGB(GRAPH_RESTORE); save_restoreDB(GRAPH_RESTORE); @@ -945,19 +945,19 @@ int CmdLFfind(const char *Cmd) { bool st = true; if (ASKDemod_ext("0 0 0", true, false, 1, &st)) { PrintAndLogEx(NORMAL, "\nUnknown ASK Modulated and Manchester encoded Tag found!"); - PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'") ); + PrintAndLogEx(NORMAL, "if it does not look right it could instead be ASK/Biphase - try " _YELLOW_("'data rawdemod ab'")); goto out; } if (CmdPSK1rawDemod("")) { PrintAndLogEx(NORMAL, "Possible unknown PSK1 Modulated Tag found above!"); - PrintAndLogEx(NORMAL, " Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'") ); + PrintAndLogEx(NORMAL, " Could also be PSK2 - try " _YELLOW_("'data rawdemod p2'")); PrintAndLogEx(NORMAL, " Could also be PSK3 - [currently not supported]"); - PrintAndLogEx(NORMAL, " Could also be NRZ - try " _YELLOW_("'data rawdemod nr") ); + PrintAndLogEx(NORMAL, " Could also be NRZ - try " _YELLOW_("'data rawdemod nr")); goto out; } - PrintAndLogEx(FAILED, _RED_("\nNo data found!") ); + PrintAndLogEx(FAILED, _RED_("\nNo data found!")); } out: // identify chipset diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c index 719c01a96..42540f305 100644 --- a/client/cmdlfhitag.c +++ b/client/cmdlfhitag.c @@ -29,8 +29,7 @@ size_t nbytes(size_t nbits) { return (nbits / 8) + ((nbits % 8) > 0); } -int usage_hitag_reader(void) -{ +int usage_hitag_reader(void) { PrintAndLogEx(NORMAL, "Usage: lf hitag reader [h] "); PrintAndLogEx(NORMAL, "Options:"); PrintAndLogEx(NORMAL, " h This help"); @@ -43,7 +42,7 @@ int usage_hitag_reader(void) PrintAndLogEx(NORMAL, " 22 Authentication"); PrintAndLogEx(NORMAL, " 23 Authentication, key is in format: ISK high + ISK low"); PrintAndLogEx(NORMAL, " 25 Test recorded authentications"); - PrintAndLogEx(NORMAL, " 26 Just read UID"); + PrintAndLogEx(NORMAL, " 26 Just read UID"); return 0; } @@ -228,25 +227,25 @@ int CmdLFHitagReader(const char *Cmd) { c.cmd = CMD_READ_HITAG_S; num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr); num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4); - break; + break; } case RHTSF_KEY: { c.cmd = CMD_READ_HITAG_S; num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key); - break; + break; } case RHT2F_PASSWORD: { num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->pwd.password); - break; + break; } case RHT2F_AUTHENTICATE: { num_to_bytes(param_get32ex(Cmd, 1, 0, 16), 4, htd->auth.NrAr); num_to_bytes(param_get32ex(Cmd, 2, 0, 16), 4, htd->auth.NrAr + 4); - break; + break; } case RHT2F_CRYPTO: { num_to_bytes(param_get64ex(Cmd, 1, 0, 16), 6, htd->crypto.key); - break; + break; } case RHT2F_TEST_AUTH_ATTEMPTS: { // No additional parameters needed