X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/217cfb6b29773989774cbe573af0372df09f056b..a015ef37330ddd44c9a2d820e1def6545d4dea8d:/armsrc/lfsampling.c

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 643b3168..ffbc0da8 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -101,7 +101,7 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
 	// 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();
+	FpgaSetupSsc(FPGA_MAJOR_MODE_LF_ADC);
 }
 
 /**
@@ -153,8 +153,10 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
 			LED_D_OFF();
 			// threshold either high or low values 128 = center 0.  if trigger = 178 
 			if ((trigger_threshold > 0) && (sample < (trigger_threshold+128)) && (sample > (128-trigger_threshold))) { // 
-				if (cancel_after > 0) cancel_counter++;
-				if (cancel_after == cancel_counter) break;
+				if (cancel_after > 0) {
+					cancel_counter++;
+					if (cancel_after == cancel_counter) break;
+				}
 				continue;
 			}
 			trigger_threshold = 0;
@@ -264,7 +266,7 @@ uint32_t SnoopLF()
 }
 
 /**
-* acquisition of Cotag LF signal. Similart to other LF,  since the Cotag has such long datarate RF/384
+* acquisition of Cotag LF signal. Similar to other LF,  since the Cotag has such long datarate RF/384
 * and is Manchester?,  we directly gather the manchester data into bigbuff
 **/
 #define COTAG_T1 384
@@ -334,7 +336,7 @@ uint32_t doCotagAcquisitionManchester() {
 	uint16_t sample_counter = 0, period = 0;
 	uint8_t curr = 0, prev = 0;
 	uint16_t noise_counter = 0;
-	while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize) && (noiseCounter < (COTAG_T1<<1)) ) {
+	while (!BUTTON_PRESS() && !usb_poll_validate_length() && (sample_counter < bufsize) && (noise_counter < (COTAG_T1<<1)) ) {
 		WDT_HIT();
 		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
 			AT91C_BASE_SSC->SSC_THR = 0x43;