X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/31abe49fd323411b391dd10335eb4c60cfcecb06..aa77d2b12576bce67223f647f603b4111324a74f:/armsrc/lfsampling.c?ds=sidebyside

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 6314ac74..120c0801 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -13,7 +13,7 @@
 
 #include "lfsampling.h"
 
-sample_config config = { 1, 8, 1, 88, 0 } ;
+sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig()
 {
@@ -62,7 +62,6 @@ typedef struct {
 	uint32_t position;
 } BitstreamOut;
 
-
 /**
  * @brief Pushes bit onto the stream
  * @param stream
@@ -124,8 +123,9 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
 uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold,bool silent)
 {
 	//.
-	uint8_t *dest = (uint8_t *)BigBuf;
-	int bufsize = BIGBUF_SIZE;
+	uint8_t *dest = BigBuf_get_addr();
+    int bufsize = BigBuf_max_traceLen();
+
 	memset(dest, 0, bufsize);
 
 	if(bits_per_sample < 1) bits_per_sample = 1;
@@ -224,21 +224,21 @@ uint32_t DoAcquisition_config( bool silent)
 				  ,silent);
 }
 
-uint32_t ReadLF(bool activeField)
+uint32_t ReadLF(bool activeField, bool silent)
 {
-	printConfig();
+	if (!silent) printConfig();
 	LFSetupFPGAForADC(config.divisor, activeField);
 	// Now call the acquisition routine
-	return DoAcquisition_config(false);
+	return DoAcquisition_config(silent);
 }
 
 /**
 * Initializes the FPGA for reader-mode (field on), and acquires the samples.
 * @return number of bits sampled
 **/
-uint32_t SampleLF()
+uint32_t SampleLF(bool printCfg)
 {
-	return ReadLF(true);
+	return ReadLF(true, printCfg);
 }
 /**
 * Initializes the FPGA for snoop-mode (field off), and acquires the samples.
@@ -247,5 +247,5 @@ uint32_t SampleLF()
 
 uint32_t SnoopLF()
 {
-	return ReadLF(false);
+	return ReadLF(false, true);
 }