LF sim

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 731496026375c87e1ea69fbb546a0893c03299f9..64e6775c580ca436c2bf88fb3c1cd655e97bd9e2 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -71,7 +71,7 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
 {
        uint32_t parityWd = 0;
        size_t j = 0, bitCnt = 0;
 {
        uint32_t parityWd = 0;
        size_t j = 0, bitCnt = 0;

-       for (int word = 0; word < (bLen); word+=pLen){
+       for (int word = 0; word < (bLen); word += pLen){

                for (int bit=0; bit < pLen; bit++){
                        parityWd = (parityWd << 1) | BitStream[startIdx+word+bit];
                        BitStream[j++] = (BitStream[startIdx+word+bit]);
                for (int bit=0; bit < pLen; bit++){
                        parityWd = (parityWd << 1) | BitStream[startIdx+word+bit];
                        BitStream[j++] = (BitStream[startIdx+word+bit]);


@@ -83,7 +83,7 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
                        case 2:  if (BitStream[j]==0) { return 0; } break; //should be 1 spacer bit
                        default: if (parityTest(parityWd, pLen, pType) == 0) { return 0; } break; //test parity
                }
                        case 2:  if (BitStream[j]==0) { return 0; } break; //should be 1 spacer bit
                        default: if (parityTest(parityWd, pLen, pType) == 0) { return 0; } break; //test parity
                }

-               bitCnt+=(pLen-1);
+               bitCnt += (pLen-1);

                parityWd = 0;
        }
        // if we got here then all the parities passed
                parityWd = 0;
        }
        // if we got here then all the parities passed


@@ -708,7 +708,18 @@ int Visa2kDemod_AM(uint8_t *dest, size_t *size) {
        //return start position
        return (int) startIdx;
 }
        //return start position
        return (int) startIdx;
 }

-
+// by iceman
+// find Noralsy preamble in already demoded data
+int NoralsyDemod_AM(uint8_t *dest, size_t *size) {
+       if (*size < 96*2) return -1; //make sure buffer has data
+       size_t startIdx = 0;
+       uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};
+       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
+       if (errChk == 0) return -2; //preamble not found
+       if (*size != 96) return -3; //wrong demoded size
+       //return start position
+       return (int) startIdx;
+}

 // find presco preamble 0x10D in already demoded data
 int PrescoDemod(uint8_t *dest, size_t *size) {
        if (*size < 128*2) return -1; //make sure buffer has data
 // find presco preamble 0x10D in already demoded data
 int PrescoDemod(uint8_t *dest, size_t *size) {
        if (*size < 128*2) return -1; //make sure buffer has data


@@ -804,7 +815,7 @@ int PyramiddemodFSK(uint8_t *dest, size_t *size)
        *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
        if (*size < 128) return -2;  //did we get a good demod?
 
        *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
        if (*size < 128) return -2;  //did we get a good demod?
 

-       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};
+       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1};

        size_t startIdx = 0;
        uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
        if (errChk == 0) return -4; //preamble not found
        size_t startIdx = 0;
        uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
        if (errChk == 0) return -4; //preamble not found