X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7c5f2ced5b7737ededdbc93cc4f9108a140c468a..cbdcc89ae7404ac1c71a9e3824f8ee28ffb3724a:/armsrc/hfsnoop.c?ds=sidebyside

diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index cfded302..4af8522a 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -19,7 +19,7 @@ static void RAMFUNC optimizedSnoop(void)
 		if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)
 		{
 			*dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
-			dest = dest + 1;
+			++dest;
 		}
 	}
 	//Resetting Frame mode (First set in fpgaloader.c)
@@ -28,8 +28,11 @@ static void RAMFUNC optimizedSnoop(void)
 
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
+	BigBuf_free(); BigBuf_Clear();
+	
 	Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
 	bool trigger_cnt;
+
 	LED_D_ON();
 	// Select correct configs
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -39,9 +42,6 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SNOOP);
 	SpinDelay(100);
-
-	BigBuf_free();
-	BigBuf_Clear();
 	
 	AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(16); // Setting Frame Mode For better performance on high speed data transfer.
 
@@ -54,6 +54,7 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 			r = MAX(r & 0xff, r >> 8); 
 			if (r >= 240) 
 			{
+				
 				if (++trigger_cnt > triggersToSkip) {
 				break;
 			} 
@@ -64,9 +65,9 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 	if(!BUTTON_PRESS()) {
 		int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
 		while(waitcount != 0) {
-			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-				waitcount--;
-			}
+			
+			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
+				--waitcount;
 		}
 		optimizedSnoop();
 		Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);