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

style

Browse source
This commit is contained in:
osboxes.org 2019-04-10 09:36:23 +02:00
commit ad52243981
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmddata.c
View file

@ -1584,7 +1584,7 @@ int CmdTuneSamples(const char *Cmd) {
GraphBuffer[i] = resp.d.asBytes[i] - 128; GraphBuffer[i] = resp.d.asBytes[i] - 128;
test1 += resp.d.asBytes[i]; test1 += resp.d.asBytes[i];
} }
if (test1 > 0) { if (test1 > 0) {
PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n"); PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
GraphTraceLen = 256; GraphTraceLen = 256;
@ -1979,7 +1979,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
// currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...) // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) { if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
if (g_debugMode > 1) { if (g_debugMode > 1) {
PrintAndLogEx(NORMAL,"DEBUG FSKtoNRZ: no fsk clocks found"); PrintAndLogEx(NORMAL, "DEBUG FSKtoNRZ: no fsk clocks found");
} }
return 0; return 0;
} }

2
client/cmdhfmf.c
View file

@ -1734,7 +1734,7 @@ out:
if (transferToEml) { if (transferToEml) {
uint8_t block[16] = {0x00}; uint8_t block[16] = {0x00};
for ( i = 0; i < sectorsCnt; ++i) { for (i = 0; i < sectorsCnt; ++i) {
mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1); mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
if (e_sector[i].foundKey[0]) if (e_sector[i].foundKey[0])
num_to_bytes(e_sector[i].Key[0], 6, block); num_to_bytes(e_sector[i].Key[0], 6, block);

4
client/fpga_compress.c
View file

@ -206,9 +206,9 @@ int zlib_decompress(FILE *infile, FILE *outfile) {
compressed_fpga_stream.opaque = Z_NULL; compressed_fpga_stream.opaque = Z_NULL;
ret = inflateInit2(&compressed_fpga_stream, 0); ret = inflateInit2(&compressed_fpga_stream, 0);
if ( ret < 0 ) if (ret < 0)
return (EXIT_FAILURE); return (EXIT_FAILURE);
do { do {
if (compressed_fpga_stream.avail_in == 0) { if (compressed_fpga_stream.avail_in == 0) {
compressed_fpga_stream.next_in = inbuf; compressed_fpga_stream.next_in = inbuf;

22
common/lfdemod.c
View file

@ -1413,14 +1413,14 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
//find correct start position [alignment] //find correct start position [alignment]
for (k = 0; k < 2; ++k) { for (k = 0; k < 2; ++k) {
for (i = k; i < *size - 1; i += 2) { for (i = k; i < *size - 1; i += 2) {
if (bits[i] == bits[i + 1]) if (bits[i] == bits[i + 1])
errCnt++; errCnt++;
if ( errCnt > 50) if (errCnt > 50)
break; break;
} }
if (bestErr > errCnt) { if (bestErr > errCnt) {
bestErr = errCnt; bestErr = errCnt;
bestRun = k; bestRun = k;
@ -1428,7 +1428,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
} }
errCnt = 0; errCnt = 0;
} }
*alignPos = bestRun; *alignPos = bestRun;
//decode //decode
for (i = bestRun; i < *size - 1; i += 2) { for (i = bestRun; i < *size - 1; i += 2) {
@ -1467,9 +1467,9 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) { if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
// 8 :: 8-2-1 = 5 8+2+1 = 11 // 8 :: 8-2-1 = 5 8+2+1 = 11
// 16 :: 16-4-1 = 11 16+4+1 = 21 // 16 :: 16-4-1 = 11 16+4+1 = 21
// 32 :: 32-8-1 = 23 32+8+1 = 41 // 32 :: 32-8-1 = 23 32+8+1 = 41
if (smplCnt > clk - cl_4 - 1) { //full clock if (smplCnt > clk - cl_4 - 1) { //full clock
if (smplCnt > clk + cl_4 + 1) { //too many samples if (smplCnt > clk + cl_4 + 1) { //too many samples
@ -1517,11 +1517,11 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
} }
*size = bitCnt; *size = bitCnt;
if ( *startIdx < 0 ) if (*startIdx < 0)
*startIdx = 0; *startIdx = 0;
if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %u ", *startIdx); if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %u ", *startIdx);
return errCnt; return errCnt;
} }
@ -1912,7 +1912,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i", firstFullWave, fullWaveLen, *startIdx); prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i", firstFullWave, fullWaveLen, *startIdx);
prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc); prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
} }
waveStart = 0; waveStart = 0;
dest[numBits++] = curPhase; //set first read bit dest[numBits++] = curPhase; //set first read bit
for (i = firstFullWave + fullWaveLen - 1; i < *size - 3; i++) { for (i = firstFullWave + fullWaveLen - 1; i < *size - 3; i++) {