From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Fri, 6 Nov 2015 07:55:09 +0000 (+0100)
Subject: fixing hf snoop:
X-Git-Tag: v2.3.0~19
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/5d0e19016945bdb1c76d152277e3c5695bfac5b8

fixing hf snoop:
- add: clear the trace buffer before snooping
- fix: allow trigger on odd samples as well
- fix: don't use Dbprintf() in timing tight loops
---

diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index b7d69013..56774bd0 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -7,7 +7,6 @@ static void RAMFUNC optimizedSnoop(void);
 
 static void RAMFUNC optimizedSnoop(void)
 {
-	BigBuf_free();
 	int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
 
 	uint16_t *dest = (uint16_t *)BigBuf_get_addr();
@@ -29,7 +28,7 @@ static void RAMFUNC optimizedSnoop(void)
 
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
-	Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
+	Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.", samplesToSkip, triggersToSkip);
 	bool trigger_cnt;
 	LED_D_ON();
 	// Select correct configs
@@ -41,6 +40,9 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 	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.
 
 	trigger_cnt = 0;
@@ -49,24 +51,25 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 		WDT_HIT();
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			r = (uint16_t)AT91C_BASE_SSC->SSC_RHR;
-			if (!(trigger_cnt == triggersToSkip) && ( (r >> 8) >= 240)) 
+			r = MAX(r & 0xff, r >> 8); 
+			if (r >= 240) 
 			{
-				Dbprintf("Trigger kicked! Value: %d.", r >> 8);
-				trigger_cnt++;
-				break;
+				if (++trigger_cnt > triggersToSkip) {
+					break;
+				}
 			} 
 		}
 	}
+
 	if(!BUTTON_PRESS()) {
-		Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r >> 8);
 		int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
 		while(waitcount != 0) {
 			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 				waitcount--;
 			}
 		}
-
 		optimizedSnoop();
+		Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
 	}
 
 	DbpString("HF Snoop end");