X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/031311c7ae0b3be39da2768ca6871beac3062ec6..a2937cea8db9a2ef51becff18d3b0227b837b576:/armsrc/hfsnoop.c

diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index b7d69013..d06af443 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -2,12 +2,12 @@
 #include "apps.h"
 #include "BigBuf.h"
 #include "util.h"
+#include "usb_cdc.h"	// for usb_poll_validate_length
 
 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();
@@ -20,7 +20,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)
@@ -29,8 +29,10 @@ 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;
+	int trigger_cnt;
 	LED_D_ON();
 	// Select correct configs
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -45,28 +47,26 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 
 	trigger_cnt = 0;
 	uint16_t r = 0;
-	while(!BUTTON_PRESS()) {
+	while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
 		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)) 
-			{
-				Dbprintf("Trigger kicked! Value: %d.", r >> 8);
-				trigger_cnt++;
-				break;
+			r = MAX(r & 0xff, r >> 8); 
+			if (r >= 240) {
+				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)) {
+			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");