syntax sugar

diff --git a/client/cmddata.c b/client/cmddata.c
index a75f2ec06b12a5107f02a0e9951930b4c2dc7093..fe22aa4bf1d498ec4ff4b434de84703ba309ed3a 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1757,9 +1757,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 {
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 {

-       int invert=0;
-       int clk=0;
-       int maxErr=100;
+       int invert = 0, clk = 0, maxErr = 100;

        sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
        if (clk==1){
                invert=1;
        sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
        if (clk==1){
                invert=1;


@@ -1769,25 +1767,26 @@ int PSKDemod(const char *Cmd, bool verbose)
                if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
                return 0;
        }
                if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
                return 0;
        }

-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};

        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;
        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;

-       uint8_t carrier=countFC(BitStream, BitLen, 0);
+       
+       uint8_t carrier = countFC(BitStream, BitLen, 0);

        if (carrier!=2 && carrier!=4 && carrier!=8){
                //invalid carrier
                return 0;
        }
        if (carrier!=2 && carrier!=4 && carrier!=8){
                //invalid carrier
                return 0;
        }

-       if (g_debugMode){
-               PrintAndLog("Carrier: rf/%d",carrier);
-       }
+       
+       if (g_debugMode) PrintAndLog("Carrier: rf/%d",carrier);
+

        int errCnt=0;
        errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
        if (errCnt > maxErr){
        int errCnt=0;
        errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
        if (errCnt > maxErr){

-               if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+               if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);

                return 0;
        } 
        if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
                return 0;
        } 
        if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)

-               if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+               if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);

                return 0;
        }
        if (verbose || g_debugMode){
                return 0;
        }
        if (verbose || g_debugMode){


@@ -1797,7 +1796,7 @@ int PSKDemod(const char *Cmd, bool verbose)
                }
        }
        //prime demod buffer for output
                }
        }
        //prime demod buffer for output

-       setDemodBuf(BitStream,BitLen,0);
+       setDemodBuf(BitStream, BitLen, 0);

        return 1;
 }
 
        return 1;
 }
 

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index c2e8b7b43896595770fffc5b4d2e19b612e14f7d..a0cc060bb5f9321a7de3d445ae488f6961c41499 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -774,14 +774,14 @@ int CmdEM4x05Dump(const char *Cmd) {
        // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
        pwd = param_get32ex(Cmd, 0, 1, 16);
        
        // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
        pwd = param_get32ex(Cmd, 0, 1, 16);
        

-       if ( pwd != 1 ) {
+       if ( pwd != 1 )

                usePwd = true;
                usePwd = true;

-       }
+

        int success = 1;
        for (; addr < 16; addr++) {
                if (addr == 2) {
                        if (usePwd) {
        int success = 1;
        for (; addr < 16; addr++) {
                if (addr == 2) {
                        if (usePwd) {

-                               PrintAndLog("PWD Address %02u | %08X",addr,pwd);
+                               PrintAndLog("PWD Address %02u | %08X", addr, pwd);

                        } else {
                                PrintAndLog("PWD Address 02 | cannot read");
                        }
                        } else {
                                PrintAndLog("PWD Address 02 | cannot read");
                        }


@@ -792,7 +792,7 @@ int CmdEM4x05Dump(const char *Cmd) {
 
        return success;
 }
 
        return success;
 }

-
+//ICEMAN;  mentalnote to self: -1 is not doable for uint32_t..

 int CmdEM4x05Read(const char *Cmd) {
        int addr, pwd;
        bool usePwd = false;
 int CmdEM4x05Read(const char *Cmd) {
        int addr, pwd;
        bool usePwd = false;

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 1b005d96a1313262c87b5caf5940b1eeec3d1f40..5b650b30d27ffe64370e860b33c62978580de092 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -615,6 +615,7 @@ bool tryDetectModulation(){
                                tests[hits].ST = FALSE;\r
                                ++hits;\r
                        }\r
                                tests[hits].ST = FALSE;\r
                                ++hits;\r
                        }\r

+                       //ICEMAN: are these PSKDemod calls needed?\r

                        // PSK2 - needs a call to psk1TOpsk2.\r
                        if ( PSKDemod("0 0 6", FALSE)) {\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        // PSK2 - needs a call to psk1TOpsk2.\r
                        if ( PSKDemod("0 0 6", FALSE)) {\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r