Made 125KHz default sampling, instead of 134KHz for LF

[proxmark3-svn] / armsrc / lfops.c

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index ab196325f2c5c5abb371bd0c6b48486eb65c3a2c..e34eab35f5bc813f8201b699967db819ed9da556 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -15,130 +15,44 @@
 #include "crc16.h"
 #include "string.h"
 #include "lfdemod.h"
 #include "crc16.h"
 #include "string.h"
 #include "lfdemod.h"

+#include "lfsampling.h"

 
 
 /**
 
 
 /**

-* Does the sample acquisition. If threshold is specified, the actual sampling 
-* is not commenced until the threshold has been reached. 
-* @param trigger_threshold - the threshold
-* @param silent - is true, now outputs are made. If false, dbprints the status
-*/
-void DoAcquisition125k_internal(int trigger_threshold,bool silent)
-{
-    uint8_t *dest = (uint8_t *)BigBuf;
-    int n = sizeof(BigBuf);
-    int i;
-
-    memset(dest, 0, n);
-    i = 0;
-    for(;;) {
-        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
-            AT91C_BASE_SSC->SSC_THR = 0x43;
-            LED_D_ON();
-        }
-        if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-            dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-            LED_D_OFF();
-            if (trigger_threshold != -1 && dest[i] < trigger_threshold)
-                continue;
-            else
-                trigger_threshold = -1;
-            if (++i >= n) break;
-        }
-    }
-    if(!silent)
-    {
-        Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
-                 dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
-
-    }
-}
-/**
-* Perform sample aquisition. 
-*/
-void DoAcquisition125k(int trigger_threshold)
-{
-    DoAcquisition125k_internal(trigger_threshold, false);
-}
-
-/**
-* Setup the FPGA to listen for samples. This method downloads the FPGA bitstream 
-* if not already loaded, sets divisor and starts up the antenna. 
-* @param divisor : 1, 88> 255 or negative ==> 134.8 KHz
-*                                 0 or 95 ==> 125 KHz
-*                                 
-**/
-void LFSetupFPGAForADC(int divisor, bool lf_field)
-{
-    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    if ( (divisor == 1) || (divisor < 0) || (divisor > 255) )
-        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-    else if (divisor == 0)
-        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-    else
-        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor);
-
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | (lf_field ? FPGA_LF_ADC_READER_FIELD : 0));
-
-    // Connect the A/D to the peak-detected low-frequency path.
-    SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(50);
-    // Now set up the SSC to get the ADC samples that are now streaming at us.
-    FpgaSetupSsc();
-}
-/**
-* Initializes the FPGA, and acquires the samples. 
-**/
-void AcquireRawAdcSamples125k(int divisor)
-{
-    LFSetupFPGAForADC(divisor, true);
-    // Now call the acquisition routine
-    DoAcquisition125k_internal(-1,false);
-}
-/**
-* Initializes the FPGA for snoop-mode, and acquires the samples. 
-**/
-
-void SnoopLFRawAdcSamples(int divisor, int trigger_threshold)
-{
-    LFSetupFPGAForADC(divisor, false);
-    DoAcquisition125k(trigger_threshold);
-}
-
+ * Function to do a modulation and then get samples.
+ * @param delay_off
+ * @param period_0
+ * @param period_1
+ * @param command
+ */

 void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1, uint8_t *command)
 {
 
 void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1, uint8_t *command)
 {
 

-    /* Make sure the tag is reset */
-    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    SpinDelay(2500);
-
-

     int divisor_used = 95; // 125 KHz
     // see if 'h' was specified
 
     if (command[strlen((char *) command) - 1] == 'h')
         divisor_used = 88; // 134.8 KHz
 
     int divisor_used = 95; // 125 KHz
     // see if 'h' was specified
 
     if (command[strlen((char *) command) - 1] == 'h')
         divisor_used = 88; // 134.8 KHz
 

+       sample_config sc = { 0,0,1, divisor_used, 0};
+       setSamplingConfig(&sc);

 
 

-    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor_used);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-    // Give it a bit of time for the resonant antenna to settle.
-    SpinDelay(50);
+       /* Make sure the tag is reset */
+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       SpinDelay(2500);

 
 

-    // And a little more time for the tag to fully power up
-    SpinDelay(2000);
+       LFSetupFPGAForADC(sc.divisor, 1);

 
 

-    // Now set up the SSC to get the ADC samples that are now streaming at us.
-    FpgaSetupSsc();
+       // And a little more time for the tag to fully power up
+       SpinDelay(2000);

 
     // now modulate the reader field
     while(*command != '\0' && *command != ' ') {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LED_D_OFF();
         SpinDelayUs(delay_off);
 
     // now modulate the reader field
     while(*command != '\0' && *command != ' ') {
         FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
         LED_D_OFF();
         SpinDelayUs(delay_off);

-        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor_used);
+               FpgaSendCommand(FPGA_CMD_SET_DIVISOR, sc.divisor);

 
         FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
         LED_D_ON();
 
         FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
         LED_D_ON();


@@ -150,14 +64,16 @@ void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1,
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LED_D_OFF();
     SpinDelayUs(delay_off);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
     LED_D_OFF();
     SpinDelayUs(delay_off);

-    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor_used);
+       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, sc.divisor);

 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
     // now do the read
 
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
     // now do the read

-    DoAcquisition125k(-1);
+       DoAcquisition_config(false);

 }
 
 }
 

+
+

 /* blank r/w tag data stream
 ...0000000000000000 01111111
 1010101010101010101010101010101010101010101010101010101010101010
 /* blank r/w tag data stream
 ...0000000000000000 01111111
 1010101010101010101010101010101010101010101010101010101010101010


@@ -173,15 +89,12 @@ void ReadTItag(void)
     // when we read a TI tag we sample the zerocross line at 2Mhz
     // TI tags modulate a 1 as 16 cycles of 123.2Khz
     // TI tags modulate a 0 as 16 cycles of 134.2Khz
     // when we read a TI tag we sample the zerocross line at 2Mhz
     // TI tags modulate a 1 as 16 cycles of 123.2Khz
     // TI tags modulate a 0 as 16 cycles of 134.2Khz

-#define FSAMPLE 2000000
-#define FREQLO 123200
-#define FREQHI 134200
-
-    signed char *dest = (signed char *)BigBuf;
-    int n = sizeof(BigBuf);
-    // int *dest = GraphBuffer;
-    // int n = GraphTraceLen;
+ #define FSAMPLE 2000000
+ #define FREQLO 123200
+ #define FREQHI 134200

 
 

+    signed char *dest = (signed char *)BigBuf_get_addr();
+    uint16_t n = BigBuf_max_traceLen();

     // 128 bit shift register [shift3:shift2:shift1:shift0]
     uint32_t shift3 = 0, shift2 = 0, shift1 = 0, shift0 = 0;
 
     // 128 bit shift register [shift3:shift2:shift1:shift0]
     uint32_t shift3 = 0, shift2 = 0, shift1 = 0, shift0 = 0;
 


@@ -263,10 +176,10 @@ void ReadTItag(void)
         shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
 
         // if r/w tag, check ident match
         shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
 
         // if r/w tag, check ident match

-        if ( shift3&(1<<15) ) {
+               if (shift3 & (1<<15) ) {

             DbpString("Info: TI tag is rewriteable");
             // only 15 bits compare, last bit of ident is not valid
             DbpString("Info: TI tag is rewriteable");
             // only 15 bits compare, last bit of ident is not valid

-            if ( ((shift3>>16)^shift0)&0x7fff ) {
+                       if (((shift3 >> 16) ^ shift0) & 0x7fff ) {

                 DbpString("Error: Ident mismatch!");
             } else {
                 DbpString("Info: TI tag ident is valid");
                 DbpString("Error: Ident mismatch!");
             } else {
                 DbpString("Info: TI tag ident is valid");


@@ -330,10 +243,11 @@ void AcquireTiType(void)
     int i, j, n;
     // tag transmission is <20ms, sampling at 2M gives us 40K samples max
     // each sample is 1 bit stuffed into a uint32_t so we need 1250 uint32_t
     int i, j, n;
     // tag transmission is <20ms, sampling at 2M gives us 40K samples max
     // each sample is 1 bit stuffed into a uint32_t so we need 1250 uint32_t

-#define TIBUFLEN 1250
+ #define TIBUFLEN 1250

 
     // clear buffer
 
     // clear buffer

-    memset(BigBuf,0,sizeof(BigBuf));
+       uint32_t *BigBuf = (uint32_t *)BigBuf_get_addr();
+    memset(BigBuf,0,BigBuf_max_traceLen()/sizeof(uint32_t));

 
     // Set up the synchronous serial port
     AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DIN;
 
     // Set up the synchronous serial port
     AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DIN;


@@ -381,7 +295,7 @@ void AcquireTiType(void)
     AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_ASR = GPIO_SSC_DIN | GPIO_SSC_DOUT;
 
     AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_ASR = GPIO_SSC_DIN | GPIO_SSC_DOUT;
 

-    char *dest = (char *)BigBuf;
+    char *dest = (char *)BigBuf_get_addr();

     n = TIBUFLEN*32;
     // unpack buffer
     for (i=TIBUFLEN-1; i>=0; i--) {
     n = TIBUFLEN*32;
     // unpack buffer
     for (i=TIBUFLEN-1; i>=0; i--) {


@@ -470,19 +384,19 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
 void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
 {
     int i;
 void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
 {
     int i;

-    uint8_t *tab = (uint8_t *)BigBuf;
-    
+    uint8_t *tab = BigBuf_get_addr();
+

     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);

-    
+

     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT | GPIO_SSC_CLK;
     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT | GPIO_SSC_CLK;

-    
+

     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
     AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_CLK;

-    
+

 #define SHORT_COIL()   LOW(GPIO_SSC_DOUT)
 #define OPEN_COIL()            HIGH(GPIO_SSC_DOUT)
 #define SHORT_COIL()   LOW(GPIO_SSC_DOUT)
 #define OPEN_COIL()            HIGH(GPIO_SSC_DOUT)

-    
+

     i = 0;
     for(;;) {
         while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
     i = 0;
     for(;;) {
         while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {


@@ -492,18 +406,18 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
             }
             WDT_HIT();
         }
             }
             WDT_HIT();
         }

-        
+

         if (ledcontrol)
             LED_D_ON();
         if (ledcontrol)
             LED_D_ON();

-        
+

         if(tab[i])
             OPEN_COIL();
         else
             SHORT_COIL();
         if(tab[i])
             OPEN_COIL();
         else
             SHORT_COIL();

-        
+

         if (ledcontrol)
             LED_D_OFF();
         if (ledcontrol)
             LED_D_OFF();

-        
+

         while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
             if(BUTTON_PRESS()) {
                 DbpString("Stopped");
         while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
             if(BUTTON_PRESS()) {
                 DbpString("Stopped");


@@ -511,7 +425,7 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
             }
             WDT_HIT();
         }
             }
             WDT_HIT();
         }

-        
+

         i++;
         if(i == period) {
             i = 0;
         i++;
         if(i == period) {
             i = 0;


@@ -530,7 +444,7 @@ void SimulateTagLowFrequencyBidir(int divisor, int t0)
 
 // compose fc/8 fc/10 waveform
 static void fc(int c, int *n) {
 
 // compose fc/8 fc/10 waveform
 static void fc(int c, int *n) {

-    uint8_t *dest = (uint8_t *)BigBuf;
+    uint8_t *dest = BigBuf_get_addr();

     int idx;
 
     // for when we want an fc8 pattern every 4 logical bits
     int idx;
 
     // for when we want an fc8 pattern every 4 logical bits


@@ -634,11 +548,11 @@ void CmdHIDsimTAG(int hi, int lo, int ledcontrol)
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
 {
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
 void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
 {

-    uint8_t *dest = (uint8_t *)BigBuf;
-
-    size_t size=0; //, found=0;
+    uint8_t *dest = BigBuf_get_addr();
+    const size_t sizeOfBigBuff = BigBuf_max_traceLen();
+    size_t size = 0; 

     uint32_t hi2=0, hi=0, lo=0;
     uint32_t hi2=0, hi=0, lo=0;

-
+    int idx=0;

     // Configure to go in 125Khz listen mode
     LFSetupFPGAForADC(95, true);
 
     // Configure to go in 125Khz listen mode
     LFSetupFPGAForADC(95, true);
 


@@ -647,16 +561,12 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
 
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
 

-        DoAcquisition125k_internal(-1,true);
-        size  = sizeof(BigBuf);
-        if (size < 2000) continue;
-        // FSK demodulator
-
-        int bitLen = HIDdemodFSK(dest,size,&hi2,&hi,&lo);
-
-        WDT_HIT();
-
-        if (bitLen>0 && lo>0){
+               DoAcquisition_default(-1,true);
+               // FSK demodulator
+        size = sizeOfBigBuff;  //variable size will change after demod so re initialize it before use
+               idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo);
+        
+               if (idx>0 && lo>0){

             // final loop, go over previously decoded manchester data and decode into usable tag ID
             // 111000 bit pattern represent start of frame, 01 pattern represents a 1 and 10 represents a 0
             if (hi2 != 0){ //extra large HID tags
             // final loop, go over previously decoded manchester data and decode into usable tag ID
             // 111000 bit pattern represent start of frame, 01 pattern represents a 1 and 10 represents a 0
             if (hi2 != 0){ //extra large HID tags


@@ -667,30 +577,30 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                 uint8_t bitlen = 0;
                 uint32_t fc = 0;
                 uint32_t cardnum = 0;
                 uint8_t bitlen = 0;
                 uint32_t fc = 0;
                 uint32_t cardnum = 0;

-                if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used
+                               if (((hi>>5)&1) == 1){//if bit 38 is set then < 37 bit format is used

                     uint32_t lo2=0;
                     lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
                     uint8_t idx3 = 1;
                     uint32_t lo2=0;
                     lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
                     uint8_t idx3 = 1;

-                    while(lo2>1){ //find last bit set to 1 (format len bit)
-                        lo2=lo2>>1;
+                                       while(lo2 > 1){ //find last bit set to 1 (format len bit)
+                                               lo2=lo2 >> 1;

                         idx3++;
                     }
                         idx3++;
                     }

-                    bitlen =idx3+19;
+                                       bitlen = idx3+19;

                     fc =0;
                     cardnum=0;
                     fc =0;
                     cardnum=0;

-                    if(bitlen==26){
+                                       if(bitlen == 26){

                         cardnum = (lo>>1)&0xFFFF;
                         fc = (lo>>17)&0xFF;
                     }
                         cardnum = (lo>>1)&0xFFFF;
                         fc = (lo>>17)&0xFF;
                     }

-                    if(bitlen==37){
+                                       if(bitlen == 37){

                         cardnum = (lo>>1)&0x7FFFF;
                         fc = ((hi&0xF)<<12)|(lo>>20);
                     }
                         cardnum = (lo>>1)&0x7FFFF;
                         fc = ((hi&0xF)<<12)|(lo>>20);
                     }

-                    if(bitlen==34){
+                                       if(bitlen == 34){

                         cardnum = (lo>>1)&0xFFFF;
                         fc= ((hi&1)<<15)|(lo>>17);
                     }
                         cardnum = (lo>>1)&0xFFFF;
                         fc= ((hi&1)<<15)|(lo>>17);
                     }

-                    if(bitlen==35){
+                                       if(bitlen == 35){

                         cardnum = (lo>>1)&0xFFFFF;
                         fc = ((hi&1)<<11)|(lo>>21);
                     }
                         cardnum = (lo>>1)&0xFFFFF;
                         fc = ((hi&1)<<11)|(lo>>21);
                     }


@@ -712,13 +622,14 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
             }
             if (findone){
                 if (ledcontrol)        LED_A_OFF();
             }
             if (findone){
                 if (ledcontrol)        LED_A_OFF();

+                *high = hi;
+                *low = lo;

                 return;
             }
             // reset
             hi2 = hi = lo = 0;
         }
         WDT_HIT();
                 return;
             }
             // reset
             hi2 = hi = lo = 0;
         }
         WDT_HIT();

-        //SpinDelay(50);

     }
     DbpString("Stopped");
     if (ledcontrol) LED_A_OFF();
     }
     DbpString("Stopped");
     if (ledcontrol) LED_A_OFF();


@@ -726,11 +637,10 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
 
 void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
 {
 
 void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
 {

-    uint8_t *dest = (uint8_t *)BigBuf;
+    uint8_t *dest = BigBuf_get_addr();

 
 

-    size_t size=0; //, found=0;
-    uint32_t bitLen=0;
-    int clk=0, invert=0, errCnt=0;
+       size_t size=0, idx=0;
+    int clk=0, invert=0, errCnt=0, maxErr=20;

     uint64_t lo=0;
     // Configure to go in 125Khz listen mode
     LFSetupFPGAForADC(95, true);
     uint64_t lo=0;
     // Configure to go in 125Khz listen mode
     LFSetupFPGAForADC(95, true);


@@ -740,26 +650,29 @@ void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
 
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
 

-        DoAcquisition125k_internal(-1,true);
-        size  = sizeof(BigBuf);
-        if (size < 2000) continue;
-        // FSK demodulator
-        //int askmandemod(uint8_t *BinStream,uint32_t *BitLen,int *clk, int *invert);
-        bitLen=size;
+               DoAcquisition_default(-1,true);
+               size  = BigBuf_max_traceLen();

         //Dbprintf("DEBUG: Buffer got");
         //Dbprintf("DEBUG: Buffer got");

-        errCnt = askmandemod(dest,&bitLen,&clk,&invert); //HIDdemodFSK(dest,size,&hi2,&hi,&lo);
+               //askdemod and manchester decode
+               errCnt = askmandemod(dest, &size, &clk, &invert, maxErr);

         //Dbprintf("DEBUG: ASK Got");
         WDT_HIT();
 
         if (errCnt>=0){
         //Dbprintf("DEBUG: ASK Got");
         WDT_HIT();
 
         if (errCnt>=0){

-            lo = Em410xDecode(dest,bitLen);
+                       lo = Em410xDecode(dest, &size, &idx);

             //Dbprintf("DEBUG: EM GOT");
             //Dbprintf("DEBUG: EM GOT");

-            //printEM410x(lo);

             if (lo>0){
             if (lo>0){

-                Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",(uint32_t)(lo>>32),(uint32_t)lo,(uint32_t)(lo&0xFFFF),(uint32_t)((lo>>16LL) & 0xFF),(uint32_t)(lo & 0xFFFFFF));
+                               Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",
+                                   (uint32_t)(lo>>32),
+                                   (uint32_t)lo,
+                                   (uint32_t)(lo&0xFFFF),
+                                   (uint32_t)((lo>>16LL) & 0xFF),
+                                   (uint32_t)(lo & 0xFFFFFF));

             }
             if (findone){
                 if (ledcontrol)        LED_A_OFF();
             }
             if (findone){
                 if (ledcontrol)        LED_A_OFF();

+                *high=lo>>32;
+                *low=lo & 0xFFFFFFFF;

                 return;
             }
         } else{
                 return;
             }
         } else{


@@ -771,7 +684,6 @@ void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
         invert=0;
         errCnt=0;
         size=0;
         invert=0;
         errCnt=0;
         size=0;

-        //SpinDelay(50);

     }
     DbpString("Stopped");
     if (ledcontrol) LED_A_OFF();
     }
     DbpString("Stopped");
     if (ledcontrol) LED_A_OFF();


@@ -779,7 +691,7 @@ void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
 
 void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
 {
 
 void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
 {

-    uint8_t *dest = (uint8_t *)BigBuf;
+    uint8_t *dest = BigBuf_get_addr();

     int idx=0;
     uint32_t code=0, code2=0;
     uint8_t version=0;
     int idx=0;
     uint32_t code=0, code2=0;
     uint8_t version=0;


@@ -791,10 +703,10 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
     while(!BUTTON_PRESS()) {
         WDT_HIT();
         if (ledcontrol) LED_A_ON();
     while(!BUTTON_PRESS()) {
         WDT_HIT();
         if (ledcontrol) LED_A_ON();

-        DoAcquisition125k_internal(-1,true);
-        //fskdemod and get start index
+               DoAcquisition_default(-1,true);
+               //fskdemod and get start index

         WDT_HIT();
         WDT_HIT();

-        idx = IOdemodFSK(dest,sizeof(BigBuf));
+        idx = IOdemodFSK(dest, BigBuf_max_traceLen());

         if (idx>0){
             //valid tag found
 
         if (idx>0){
             //valid tag found
 


@@ -827,6 +739,8 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
             if (findone){
                 if (ledcontrol)        LED_A_OFF();
                 //LED_A_OFF();
             if (findone){
                 if (ledcontrol)        LED_A_OFF();
                 //LED_A_OFF();

+                *high=code;
+                *low=code2;

                 return;
             }
             code=code2=0;
                 return;
             }
             code=code2=0;


@@ -966,11 +880,11 @@ void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMod
 // Read one card block in page 0
 void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
 {
 // Read one card block in page 0
 void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
 {

-    uint8_t *dest = (uint8_t *)BigBuf;
+    uint8_t *dest = BigBuf_get_addr();

     //int m=0, i=0; //enio adjustment 12/10/14
     uint32_t m=0, i=0;
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     //int m=0, i=0; //enio adjustment 12/10/14
     uint32_t m=0, i=0;
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

-    m = sizeof(BigBuf);
+    m = BigBuf_max_traceLen();

     // Clear destination buffer before sending the command
     memset(dest, 128, m);
     // Connect the A/D to the peak-detected low-frequency path.
     // Clear destination buffer before sending the command
     memset(dest, 128, m);
     // Connect the A/D to the peak-detected low-frequency path.


@@ -1031,11 +945,11 @@ void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
 
 // Read card traceability data (page 1)
 void T55xxReadTrace(void){
 
 // Read card traceability data (page 1)
 void T55xxReadTrace(void){

-    uint8_t *dest = (uint8_t *)BigBuf;
+    uint8_t *dest = BigBuf_get_addr();

     int m=0, i=0;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
     int m=0, i=0;
 
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

-    m = sizeof(BigBuf);
+    m = BigBuf_max_traceLen();

     // Clear destination buffer before sending the command
     memset(dest, 128, m);
     // Connect the A/D to the peak-detected low-frequency path.
     // Clear destination buffer before sending the command
     memset(dest, 128, m);
     // Connect the A/D to the peak-detected low-frequency path.


@@ -1210,7 +1124,7 @@ void CopyIOtoT55x7(uint32_t hi, uint32_t lo, uint8_t longFMT)
 
     data1 = hi;  // load preamble
     data2 = lo;
 
     data1 = hi;  // load preamble
     data2 = lo;

-    
+

     LED_D_ON();
     // Program the data blocks for supplied ID
     // and the block 0 for HID format
     LED_D_ON();
     // Program the data blocks for supplied ID
     // and the block 0 for HID format


@@ -1352,7 +1266,7 @@ void CopyIndala64toT55x7(int hi, int lo)
 
     DbpString("DONE!");
 
 
     DbpString("DONE!");
 

-}      
+}

 
 void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int uid6, int uid7)
 {
 
 void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int uid6, int uid7)
 {


@@ -1385,8 +1299,8 @@ void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int
 int DemodPCF7931(uint8_t **outBlocks) {
     uint8_t BitStream[256];
     uint8_t Blocks[8][16];
 int DemodPCF7931(uint8_t **outBlocks) {
     uint8_t BitStream[256];
     uint8_t Blocks[8][16];

-    uint8_t *GraphBuffer = (uint8_t *)BigBuf;
-    int GraphTraceLen = sizeof(BigBuf);
+    uint8_t *GraphBuffer = BigBuf_get_addr();
+    int GraphTraceLen = BigBuf_max_traceLen();

     int i, j, lastval, bitidx, half_switch;
     int clock = 64;
     int tolerance = clock / 8;
     int i, j, lastval, bitidx, half_switch;
     int clock = 64;
     int tolerance = clock / 8;


@@ -1396,7 +1310,9 @@ int DemodPCF7931(uint8_t **outBlocks) {
     int lmin=128, lmax=128;
     uint8_t dir;
 
     int lmin=128, lmax=128;
     uint8_t dir;
 

-    AcquireRawAdcSamples125k(0);
+       LFSetupFPGAForADC(95, true);
+       DoAcquisition_default(0, 0);
+

 
     lmin = 64;
     lmax = 192;
 
     lmin = 64;
     lmax = 192;


@@ -1803,7 +1719,7 @@ void EM4xLogin(uint32_t Password) {
 void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode) {
 
     uint8_t fwd_bit_count;
 void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode) {
 
     uint8_t fwd_bit_count;

-    uint8_t *dest = (uint8_t *)BigBuf;
+    uint8_t *dest = BigBuf_get_addr();

     int m=0, i=0;
 
     //If password mode do login
     int m=0, i=0;
 
     //If password mode do login


@@ -1813,7 +1729,7 @@ void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode) {
     fwd_bit_count = Prepare_Cmd( FWD_CMD_READ );
     fwd_bit_count += Prepare_Addr( Address );
 
     fwd_bit_count = Prepare_Cmd( FWD_CMD_READ );
     fwd_bit_count += Prepare_Addr( Address );
 

-    m = sizeof(BigBuf);
+    m = BigBuf_max_traceLen();

     // Clear destination buffer before sending the command
     memset(dest, 128, m);
     // Connect the A/D to the peak-detected low-frequency path.
     // Clear destination buffer before sending the command
     memset(dest, 128, m);
     // Connect the A/D to the peak-detected low-frequency path.