fix hf 15 commands (#293)

[proxmark3-svn] / armsrc / iso15693.c

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index e7145c5c9e84b3d6dd5399c145e74123e72be077..e11e5a9ccc6e232fa7374bf2c7f5fb1e2390ec66 100644 (file)
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -319,18 +319,7 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {

-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
+                               uint8_t r = ABS(b) + ABS(prev);

 
                                dest[c++] = (uint8_t)r;
 
 
                                dest[c++] = (uint8_t)r;
 


@@ -367,7 +356,7 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                        maxPos = i;
                }
        }
                        maxPos = i;
                }
        }

-       //      DbpString("SOF at %d, correlation %d", maxPos,max/(arraylen(FrameSOF)/skip));
+               // Dbprintf("SOF at %d, correlation %d", maxPos,max/(arraylen(FrameSOF)/skip));

 
        int k = 0; // this will be our return value
 
 
        int k = 0; // this will be our return value
 


@@ -396,7 +385,7 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                        corr1 *= 4;
        
                        if(corrEOF > corr1 && corrEOF > corr0) {
                        corr1 *= 4;
        
                        if(corrEOF > corr1 && corrEOF > corr0) {

-       //                      DbpString("EOF at %d", i);
+                               // Dbprintf("EOF at %d", i);

                                break;
                        } else if(corr1 > corr0) {
                                i += arraylen(Logic1)/skip;
                                break;
                        } else if(corr1 > corr0) {
                                i += arraylen(Logic1)/skip;


@@ -468,18 +457,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {

-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
+                               uint8_t r = ABS(b) + ABS(prev);

 
                                dest[c++] = (uint8_t)r;
 
 
                                dest[c++] = (uint8_t)r;
 


@@ -648,18 +626,7 @@ void AcquireRawAdcSamplesIso15693(void)
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {

-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
+                               uint8_t r = ABS(b) + ABS(prev);

 
                                dest[c++] = (uint8_t)r;
 
 
                                dest[c++] = (uint8_t)r;
 


@@ -713,18 +680,7 @@ void RecordRawAdcSamplesIso15693(void)
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {

-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
+                               uint8_t r = ABS(b) + ABS(prev);

 
                                dest[c++] = (uint8_t)r;
 
 
                                dest[c++] = (uint8_t)r;