From ebba11b3f551cbca47ac3d88a249bc1b865dcf5c Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 6 Jan 2022 20:05:26 +0100 Subject: [PATCH] make style --- armsrc/lfops.c | 6 +++--- armsrc/lfops.h | 12 ++++++------ armsrc/nprintf.h | 2 +- client/deps/hardnested/hardnested_bf_core.c | 4 ++-- doc/commands.json | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/armsrc/lfops.c b/armsrc/lfops.c index 52e3f8db6..e404344d4 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -403,9 +403,9 @@ static bool prev_keep = false; * @param period_1 * @param command (in binary char array) */ -void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint16_t period_0, uint16_t period_1, - const uint8_t *symbol_extra, uint16_t *period_extra, uint8_t *command, - bool verbose, bool keep_field_on, uint32_t samples, bool ledcontrol) { +void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint16_t period_0, uint16_t period_1, + const uint8_t *symbol_extra, uint16_t *period_extra, uint8_t *command, + bool verbose, bool keep_field_on, uint32_t samples, bool ledcontrol) { if (!prev_keep) { FpgaDownloadAndGo(FPGA_BITSTREAM_LF); diff --git a/armsrc/lfops.h b/armsrc/lfops.h index 494b59623..f1bc88b64 100644 --- a/armsrc/lfops.h +++ b/armsrc/lfops.h @@ -21,9 +21,9 @@ #include "pm3_cmd.h" // struct -void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint16_t period_0, uint16_t period_1, - const uint8_t *symbol_extra, uint16_t *period_extra, uint8_t *command, bool verbose, - bool keep_field_on, uint32_t samples, bool ledcontrol); +void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint16_t period_0, uint16_t period_1, + const uint8_t *symbol_extra, uint16_t *period_extra, uint8_t *command, bool verbose, + bool keep_field_on, uint32_t samples, bool ledcontrol); void ReadTItag(bool ledcontrol); void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc, bool ledcontrol); @@ -38,8 +38,8 @@ void CmdHIDsimTAGEx(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT, boo void CmdHIDsimTAG(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT, bool ledcontrol); void CmdFSKsimTAGEx(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clk, uint16_t bitslen, - uint8_t *bits, bool ledcontrol, int numcycles); -void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clk, uint16_t bitslen, + uint8_t *bits, bool ledcontrol, int numcycles); +void CmdFSKsimTAG(uint8_t fchigh, uint8_t fclow, uint8_t separator, uint8_t clk, uint16_t bitslen, uint8_t *bits, bool ledcontrol); void CmdASKsimTAG(uint8_t encoding, uint8_t invert, uint8_t separator, uint8_t clk, uint16_t size, const uint8_t *bits, bool ledcontrol); @@ -62,7 +62,7 @@ void T55xxResetRead(uint8_t flags, bool ledcontrol); //id T55xxWriteBlock(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t flags, bool ledcontrol); void T55xxWriteBlock(uint8_t *data, bool ledcontrol); // void T55xxWriteBlockExt(uint32_t data, uint8_t blockno, uint32_t pwd, uint8_t flags); -void T55xxReadBlock(uint8_t page, bool pwd_mode, bool brute_mem, uint8_t block, uint32_t pwd, +void T55xxReadBlock(uint8_t page, bool pwd_mode, bool brute_mem, uint8_t block, uint32_t pwd, uint8_t downlink_mode, bool ledcontrol); void T55xxWakeUp(uint32_t pwd, uint8_t flags, bool ledcontrol); void T55xx_ChkPwds(uint8_t flags, bool ledcontrol); diff --git a/armsrc/nprintf.h b/armsrc/nprintf.h index 8861f616a..50c8760dc 100644 --- a/armsrc/nprintf.h +++ b/armsrc/nprintf.h @@ -7,7 +7,7 @@ // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/client/deps/hardnested/hardnested_bf_core.c b/client/deps/hardnested/hardnested_bf_core.c index 3609f1938..0e7eabaf5 100644 --- a/client/deps/hardnested/hardnested_bf_core.c +++ b/client/deps/hardnested/hardnested_bf_core.c @@ -596,8 +596,8 @@ SIMDExecInstr GetSIMDInstrAuto(void) { // determine the available instruction set at runtime and call the correct function uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, - uint32_t *keys_found, uint64_t *num_keys_tested, - uint32_t nonces_to_bruteforce, const uint8_t *bf_test_nonce_2nd_byte, + uint32_t *keys_found, uint64_t *num_keys_tested, + uint32_t nonces_to_bruteforce, const uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) { switch (GetSIMDInstrAuto()) { #if defined(COMPILER_HAS_SIMD_AVX512) diff --git a/doc/commands.json b/doc/commands.json index 81fe8a01d..d5fd002c0 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -6037,8 +6037,8 @@ "command": "hw connect", "description": "connects to a proxmark3 device via specified serial port. baudrate here is only for physical uart or uart-bt, not for usb-cdc or blue shark add-on", "notes": [ - "hw connect -p com3", - "hw connect -p com3 -b 115200" + "hw connect -p /dev/ttyacm0", + "hw connect -p /dev/ttyacm0 -b 115200" ], "offline": true, "options": [ @@ -10237,6 +10237,6 @@ "metadata": { "commands_extracted": 601, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2022-01-06T12:03:19" + "extracted_on": "2022-01-06T19:05:01" } } \ No newline at end of file