ADD: next step ISO11784/85

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 2c65014409eebcb09ca22ea6a85d79f9649b179f..62f52a2f0f4d2d3f0cce596b38a9f32b52ebadf2 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -590,22 +590,17 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
        return bitCnt;
 }
 // Ask/Biphase Demod then try to locate an ISO 11784/85 ID
+// BitStream must contain previously askrawdemod and biphasedemoded data
 int ISO11784demodBI(uint8_t *dest, size_t *size)
 {
        //make sure buffer has enough data
-       if (*size < 128*50) return -1;
-
-       if (justNoise(dest, *size)) return -2;
+       if (*size < 128) return -1;
 
-       // FSK demodulator
-       *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
-       if (*size < 96) return -3;  //did we get a good demod?
-
-       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};
        size_t startIdx = 0;
+       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};
+
        uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
-       if (errChk == 0) return -4; //preamble not found
-       if (*size != 128) return -5;
+       if (errChk == 0) return -2; //preamble not found
        return (int)startIdx;
 }