X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/42f57e0294c13f14f8ebcdcc529b5872c2884786..0e74c023bd73e4516652f1656794a2edc2b12abc:/armsrc/lfops.c

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 6b131c26..94d9d1fb 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -15,6 +15,58 @@
 #include "crc16.h"
 #include "string.h"
 
+
+/**
+* Does the sample acquisition. If threshold is specified, the actual sampling 
+* is not commenced until the threshold has been reached. 
+* @param trigger_threshold - the threshold
+* @param silent - is true, now outputs are made. If false, dbprints the status
+*/
+void DoAcquisition125k_internal(int trigger_threshold,bool silent)
+{
+	uint8_t *dest = (uint8_t *)BigBuf;
+	int n = sizeof(BigBuf);
+	int i;
+
+	memset(dest, 0, n);
+	i = 0;
+	for(;;) {
+		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
+			AT91C_BASE_SSC->SSC_THR = 0x43;
+			LED_D_ON();
+		}
+		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
+			dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+			LED_D_OFF();
+			if (trigger_threshold != -1 && dest[i] < trigger_threshold)
+				continue;
+			else
+				trigger_threshold = -1;
+			if (++i >= n) break;
+		}
+	}
+	if(!silent)
+	{
+		Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
+				dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
+		
+	}
+}
+/**
+* Perform sample aquisition. 
+*/
+void DoAcquisition125k(int trigger_threshold)
+{
+	DoAcquisition125k_internal(trigger_threshold, false);
+}
+
+/**
+* Setup the FPGA to listen for samples. This method downloads the FPGA bitstream 
+* if not already loaded, sets divisor and starts up the antenna. 
+* @param divisor : 1, 88> 255 or negative ==> 134.8 KHz
+* 				   0 or 95 ==> 125 KHz
+* 				   
+**/
 void LFSetupFPGAForADC(int divisor, bool lf_field)
 {
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@@ -34,12 +86,18 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
 	// Now set up the SSC to get the ADC samples that are now streaming at us.
 	FpgaSetupSsc();
 }
-
+/**
+* Initializes the FPGA, and acquires the samples. 
+**/
 void AcquireRawAdcSamples125k(int divisor)
 {
 	LFSetupFPGAForADC(divisor, true);
-	DoAcquisition125k(-1);
+	// Now call the acquisition routine
+	DoAcquisition125k_internal(-1,false);
 }
+/**
+* Initializes the FPGA for snoop-mode, and acquires the samples. 
+**/
 
 void SnoopLFRawAdcSamples(int divisor, int trigger_threshold)
 {
@@ -47,58 +105,27 @@ void SnoopLFRawAdcSamples(int divisor, int trigger_threshold)
 	DoAcquisition125k(trigger_threshold);
 }
 
-// split into two routines so we can avoid timing issues after sending commands //
-void DoAcquisition125k(int trigger_threshold)
-{
-	uint8_t *dest = (uint8_t *)BigBuf;
-	int n = sizeof(BigBuf);
-	int i;
-
-	memset(dest, 0, n);
-	i = 0;
-	for(;;) {
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
-			AT91C_BASE_SSC->SSC_THR = 0x43;
-			LED_D_ON();
-		}
-		if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
-			dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			LED_D_OFF();
-			if (trigger_threshold != -1 && dest[i] < trigger_threshold)
-				continue;
-			else
-				trigger_threshold = -1;
-			if (++i >= n) break;
-		}
-	}
-	Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",
-			dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);
-}
-
 void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1, uint8_t *command)
 {
-	int at134khz;
 
 	/* Make sure the tag is reset */
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	SpinDelay(2500);
 
+
+	int divisor_used = 95; // 125 KHz
 	// see if 'h' was specified
+
 	if (command[strlen((char *) command) - 1] == 'h')
-		at134khz = TRUE;
-	else
-		at134khz = FALSE;
+		divisor_used = 88; // 134.8 KHz
 
-	if (at134khz)
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-	else
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
 
+	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor_used); 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-
 	// Give it a bit of time for the resonant antenna to settle.
 	SpinDelay(50);
+
 	// And a little more time for the tag to fully power up
 	SpinDelay(2000);
 
@@ -110,10 +137,7 @@ void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1,
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		LED_D_OFF();
 		SpinDelayUs(delay_off);
-		if (at134khz)
-			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-		else
-			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor_used); 
 
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 		LED_D_ON();
@@ -125,10 +149,7 @@ void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1,
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LED_D_OFF();
 	SpinDelayUs(delay_off);
-	if (at134khz)
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-	else
-		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, divisor_used); 
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
@@ -609,477 +630,333 @@ void CmdHIDsimTAG(int hi, int lo, int ledcontrol)
 		LED_A_OFF();
 }
 
-
-// loop to capture raw HID waveform then FSK demodulate the TAG ID from it
-void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
+//translate wave to 11111100000 (1 for each short wave 0 for each long wave) 
+size_t fsk_demod(uint8_t * dest, size_t size)
 {
-	uint8_t *dest = (uint8_t *)BigBuf;
-	int m=0, n=0, i=0, idx=0, found=0, lastval=0;
-  uint32_t hi2=0, hi=0, lo=0;
-
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+	uint32_t last_transition = 0;
+	uint32_t idx = 1;
+	uint32_t maxVal=0;
+	// // we don't care about actual value, only if it's more or less than a
+	// // threshold essentially we capture zero crossings for later analysis
+
+	// we do care about the actual value as sometimes near the center of the
+	// wave we may get static that changes direction of wave for one value
+	// if our value is too low it might affect the read.  and if our tag or
+	// antenna is weak a setting too high might not see anything. [marshmellow]
+	if (size<100) return size;
+	for(idx=1; idx<100; idx++){
+    	if(maxVal<dest[idx]) maxVal = dest[idx];
+    }
+    // set close to the top of the wave threshold with 13% margin for error
+    // less likely to get a false transition up there. 
+    // (but have to be careful not to go too high and miss some short waves)
+  	uint32_t threshold_value = (uint32_t)(maxVal*.87); 	idx=1;
+	//uint8_t threshold_value = 127;
+	
+	// sync to first lo-hi transition, and threshold
+
+	// Need to threshold first sample
+	if(dest[0] < threshold_value) dest[0] = 0;
+	else dest[0] = 1;
+
+	size_t numBits = 0;
+	// count cycles between consecutive lo-hi transitions, there should be either 8 (fc/8)
+	// or 10 (fc/10) cycles but in practice due to noise etc we may end up with with anywhere
+	// between 7 to 11 cycles so fuzz it by treat anything <9 as 8 and anything else as 10
+	for(idx = 1; idx < size; idx++) {
+		// threshold current value
+		if (dest[idx] < threshold_value) dest[idx] = 0;
+		else dest[idx] = 1;
+
+		// Check for 0->1 transition
+		if (dest[idx-1] < dest[idx]) { // 0 -> 1 transition
+			if (idx-last_transition<6){
+				//do nothing with extra garbage
+			} else if (idx-last_transition <  9) {
+				dest[numBits]=1;
+			} else {
+				dest[numBits]=0;
+			}
+			last_transition = idx;
+			numBits++;
+		}
+	}
+	return numBits; //Actually, it returns the number of bytes, but each byte represents a bit: 1 or 0
+}
 
-	// Connect the A/D to the peak-detected low-frequency path.
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
+uint32_t myround(float f)
+{
+  if (f >= 2000) return 2000;//something bad happened
+  return (uint32_t) (f + (float)0.5);
+}
 
-	// Give it a bit of time for the resonant antenna to settle.
-	SpinDelay(50);
+//translate 11111100000 to 10 
+size_t aggregate_bits(uint8_t *dest,size_t size,  uint8_t rfLen, uint8_t maxConsequtiveBits, uint8_t invert )// uint8_t h2l_crossing_value,uint8_t l2h_crossing_value, 
+{
+	uint8_t lastval=dest[0];
+	uint32_t idx=0;
+	size_t numBits=0;
+	uint32_t n=1;
 
-	// Now set up the SSC to get the ADC samples that are now streaming at us.
-	FpgaSetupSsc();
+	for( idx=1; idx < size; idx++) {
 
-	for(;;) {
-		WDT_HIT();
-		if (ledcontrol)
-			LED_A_ON();
-		if(BUTTON_PRESS()) {
-			DbpString("Stopped");
-			if (ledcontrol)
-				LED_A_OFF();
-			return;
+		if (dest[idx]==lastval) {
+			n++;
+			continue;
+		}
+		//if lastval was 1, we have a 1->0 crossing
+		if ( dest[idx-1]==1 ) {
+			n=myround((float)(n+1)/((float)(rfLen)/(float)8));
+			//n=(n+1) / h2l_crossing_value;
+		} else {// 0->1 crossing
+			n=myround((float)(n+1)/((float)(rfLen-2)/(float)10));
+			//n=(n+1) / l2h_crossing_value;
 		}
+		if (n == 0) n = 1;
 
-		i = 0;
-		m = sizeof(BigBuf);
-		memset(dest,128,m);
-		for(;;) {
-			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-				AT91C_BASE_SSC->SSC_THR = 0x43;
-				if (ledcontrol)
-					LED_D_ON();
-			}
-			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-				dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-				// we don't care about actual value, only if it's more or less than a
-				// threshold essentially we capture zero crossings for later analysis
-				if(dest[i] < 127) dest[i] = 0; else dest[i] = 1;
-				i++;
-				if (ledcontrol)
-					LED_D_OFF();
-				if(i >= m) {
-					break;
-				}
-			}
+		if(n < maxConsequtiveBits) //Consecutive 
+		{
+			if(invert==0){ //invert bits 
+				memset(dest+numBits, dest[idx-1] , n);
+			}else{
+				memset(dest+numBits, dest[idx-1]^1 , n);	
+			}			
+			numBits += n;
 		}
+		n=0;
+		lastval=dest[idx];
+	}//end for
+	return numBits;
+}
+// loop to get raw HID waveform then FSK demodulate the TAG ID from it
+void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
+{
+	uint8_t *dest = (uint8_t *)BigBuf;
 
-		// FSK demodulator
+	size_t size=0,idx=0; //, found=0;
+	uint32_t hi2=0, hi=0, lo=0;
 
-		// sync to first lo-hi transition
-		for( idx=1; idx<m; idx++) {
-			if (dest[idx-1]<dest[idx])
-				lastval=idx;
-				break;
-		}
-		WDT_HIT();
+	// Configure to go in 125Khz listen mode
+	LFSetupFPGAForADC(95, true);
 
-		// count cycles between consecutive lo-hi transitions, there should be either 8 (fc/8)
-		// or 10 (fc/10) cycles but in practice due to noise etc we may end up with with anywhere
-		// between 7 to 11 cycles so fuzz it by treat anything <9 as 8 and anything else as 10
-		for( i=0; idx<m; idx++) {
-			if (dest[idx-1]<dest[idx]) {
-				dest[i]=idx-lastval;
-				if (dest[i] <= 8) {
-						dest[i]=1;
-				} else {
-						dest[i]=0;
-				}
+	while(!BUTTON_PRESS()) {
 
-				lastval=idx;
-				i++;
-			}
-		}
-		m=i;
 		WDT_HIT();
+		if (ledcontrol) LED_A_ON();
+
+		DoAcquisition125k_internal(-1,true);
+		size  = sizeof(BigBuf);
+        if (size < 2000) continue; 
+		// FSK demodulator
+		size = fsk_demod(dest, size);
 
 		// we now have a set of cycle counts, loop over previous results and aggregate data into bit patterns
-		lastval=dest[0];
-		idx=0;
-		i=0;
-		n=0;
-		for( idx=0; idx<m; idx++) {
-			if (dest[idx]==lastval) {
-				n++;
-			} else {
-				// a bit time is five fc/10 or six fc/8 cycles so figure out how many bits a pattern width represents,
-				// an extra fc/8 pattern preceeds every 4 bits (about 200 cycles) just to complicate things but it gets
-				// swallowed up by rounding
-				// expected results are 1 or 2 bits, any more and it's an invalid manchester encoding
-				// special start of frame markers use invalid manchester states (no transitions) by using sequences
-				// like 111000
-				if (dest[idx-1]) {
-					n=(n+1)/6;			// fc/8 in sets of 6
-				} else {
-					n=(n+1)/5;			// fc/10 in sets of 5
-				}
-				switch (n) {			// stuff appropriate bits in buffer
-					case 0:
-					case 1:	// one bit
-						dest[i++]=dest[idx-1];
-						break;
-					case 2: // two bits
-						dest[i++]=dest[idx-1];
-						dest[i++]=dest[idx-1];
-						break;
-					case 3: // 3 bit start of frame markers
-						dest[i++]=dest[idx-1];
-						dest[i++]=dest[idx-1];
-						dest[i++]=dest[idx-1];
-						break;
-					// When a logic 0 is immediately followed by the start of the next transmisson
-					// (special pattern) a pattern of 4 bit duration lengths is created.
-					case 4:
-						dest[i++]=dest[idx-1];
-						dest[i++]=dest[idx-1];
-						dest[i++]=dest[idx-1];
-						dest[i++]=dest[idx-1];
-						break;
-					default:	// this shouldn't happen, don't stuff any bits
-						break;
-				}
-				n=0;
-				lastval=dest[idx];
-			}
-		}
-		m=i;
+		// 1->0 : fc/8 in sets of 6  (RF/50 / 8 = 6.25)
+		// 0->1 : fc/10 in sets of 5 (RF/50 / 10= 5)
+		// do not invert
+		size = aggregate_bits(dest,size, 50,5,0);  //6,5,5,0 
+
 		WDT_HIT();
 
 		// final loop, go over previously decoded manchester data and decode into usable tag ID
 		// 111000 bit pattern represent start of frame, 01 pattern represents a 1 and 10 represents a 0
-		for( idx=0; idx<m-6; idx++) {
+		uint8_t frame_marker_mask[] = {1,1,1,0,0,0};
+		int numshifts = 0;
+		idx = 0;
+		//one scan
+		uint8_t sameCardCount =0;
+		while( idx + sizeof(frame_marker_mask) < size) {
 			// search for a start of frame marker
-			if ( dest[idx] && dest[idx+1] && dest[idx+2] && (!dest[idx+3]) && (!dest[idx+4]) && (!dest[idx+5]) )
-			{
-				found=1;
-				idx+=6;
-        if (found && (hi2|hi|lo)) {
-          if (hi2 != 0){
-            Dbprintf("TAG ID: %x%08x%08x (%d)",
-                     (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
-          }
-          else {
-            Dbprintf("TAG ID: %x%08x (%d)",
-                     (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
-          }
-					/* if we're only looking for one tag */
-					if (findone)
-					{
-						*high = hi;
-						*low = lo;
-						return;
-					}
-          hi2=0;
-					hi=0;
-					lo=0;
-					found=0;
+			if (sameCardCount>2) break;  //only up to 2 valid sets of data for the same read of looping card data
+			if ( memcmp(dest+idx, frame_marker_mask, sizeof(frame_marker_mask)) == 0)
+			{ // frame marker found
+				idx+=sizeof(frame_marker_mask);
+				while(dest[idx] != dest[idx+1] && idx < size-2)
+				{	
+					// Keep going until next frame marker (or error)
+					// Shift in a bit. Start by shifting high registers
+					hi2 = (hi2<<1)|(hi>>31);
+					hi = (hi<<1)|(lo>>31);
+					//Then, shift in a 0 or one into low
+					if (dest[idx] && !dest[idx+1])	// 1 0
+						lo=(lo<<1)|0;
+					else // 0 1
+						lo=(lo<<1)|
+								1;
+					numshifts++;
+					idx += 2;
 				}
-			}
-			if (found) {
-				if (dest[idx] && (!dest[idx+1]) ) {
-          hi2=(hi2<<1)|(hi>>31);
-					hi=(hi<<1)|(lo>>31);
-					lo=(lo<<1)|0;
-				} else if ( (!dest[idx]) && dest[idx+1]) {
-          hi2=(hi2<<1)|(hi>>31);
-					hi=(hi<<1)|(lo>>31);
-					lo=(lo<<1)|1;
-				} else {
-					found=0;
-          hi2=0;
-					hi=0;
-					lo=0;
-				}
-				idx++;
-			}
-			if ( dest[idx] && dest[idx+1] && dest[idx+2] && (!dest[idx+3]) && (!dest[idx+4]) && (!dest[idx+5]) )
-			{
-				found=1;
-				idx+=6;
-				if (found && (hi|lo)) {
-          if (hi2 != 0){
-            Dbprintf("TAG ID: %x%08x%08x (%d)",
-                     (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
-          }
-          else {
-            Dbprintf("TAG ID: %x%08x (%d)",
-                     (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
-          }
-					/* if we're only looking for one tag */
-					if (findone)
+				//Dbprintf("Num shifts: %d ", numshifts);
+				// Hopefully, we read a tag and	 hit upon the next frame marker
+				if(idx + sizeof(frame_marker_mask) < size)
+				{
+					if ( memcmp(dest+idx, frame_marker_mask, sizeof(frame_marker_mask)) == 0)
 					{
-						*high = hi;
-						*low = lo;
-						return;
+						if (hi2 != 0){ //extra large HID tags
+							Dbprintf("TAG ID: %x%08x%08x (%d)",
+								 (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
+						}
+						else {  //standard HID tags <38 bits
+							//Dbprintf("TAG ID: %x%08x (%d)",(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); //old print cmd
+							uint8_t bitlen = 0;
+							uint32_t fc = 0;
+							uint32_t cardnum = 0;
+							if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used
+								uint32_t lo2=0;
+								lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
+								uint8_t idx3 = 1;
+								while(lo2>1){ //find last bit set to 1 (format len bit)
+									lo2=lo2>>1;
+									idx3++;
+								}
+								bitlen =idx3+19;  
+								fc =0;
+								cardnum=0;
+								if(bitlen==26){
+									cardnum = (lo>>1)&0xFFFF;
+									fc = (lo>>17)&0xFF;
+								}
+								if(bitlen==37){
+									cardnum = (lo>>1)&0x7FFFF;
+									fc = ((hi&0xF)<<12)|(lo>>20);
+								}
+								if(bitlen==34){
+									cardnum = (lo>>1)&0xFFFF;
+									fc= ((hi&1)<<15)|(lo>>17);
+								}
+								if(bitlen==35){
+									cardnum = (lo>>1)&0xFFFFF;
+									fc = ((hi&1)<<11)|(lo>>21);
+								}
+							}
+							else { //if bit 38 is not set then 37 bit format is used
+								bitlen= 37;
+								fc =0;
+								cardnum=0;
+								if(bitlen==37){
+									cardnum = (lo>>1)&0x7FFFF;
+									fc = ((hi&0xF)<<12)|(lo>>20);
+								}
+							}
+									//Dbprintf("TAG ID: %x%08x (%d)",
+							// (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);				
+							Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
+								(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,
+								(unsigned int) bitlen, (unsigned int) fc, (unsigned int) cardnum);
+						}
+						sameCardCount++;
+						if (findone){
+							if (ledcontrol)	LED_A_OFF();
+							return;
+						}
 					}
-          hi2=0;
-					hi=0;
-					lo=0;
-					found=0;
 				}
+				// reset
+				hi2 = hi = lo = 0;
+				numshifts = 0;
+			}else
+			{
+				idx++;
 			}
 		}
 		WDT_HIT();
+
 	}
+	DbpString("Stopped");
+	if (ledcontrol) LED_A_OFF();
+}
+
+uint32_t bytebits_to_byte(uint8_t* src, int numbits)
+{
+	uint32_t num = 0;
+	for(int i = 0 ; i < numbits ; i++)
+	{
+		num = (num << 1) | (*src);
+		src++;
+	}
+	return num;
 }
 
 void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
 {
 	uint8_t *dest = (uint8_t *)BigBuf;
-	int m=0, n=0, i=0, idx=0, lastval=0;
-	int found=0;
+	size_t size=0, idx=0;
 	uint32_t code=0, code2=0;
-	//uint32_t hi2=0, hi=0, lo=0;
-
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-
-	// Connect the A/D to the peak-detected low-frequency path.
-	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
-
-	// 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();
-
-	for(;;) {
-		WDT_HIT();
-		if (ledcontrol)
-			LED_A_ON();
-		if(BUTTON_PRESS()) {
-			DbpString("Stopped");
-			if (ledcontrol)
-				LED_A_OFF();
-			return;
-		}
 
-		i = 0;
-		m = sizeof(BigBuf);
-		memset(dest,128,m);
-		for(;;) {
-			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-				AT91C_BASE_SSC->SSC_THR = 0x43;
-				if (ledcontrol)
-					LED_D_ON();
-			}
-			if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-				dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-				// we don't care about actual value, only if it's more or less than a
-				// threshold essentially we capture zero crossings for later analysis
-				if(dest[i] < 127) dest[i] = 0; else dest[i] = 1;
-				i++;
-				if (ledcontrol)
-					LED_D_OFF();
-				if(i >= m) {
-					break;
-				}
-			}
-		}
-
-		// FSK demodulator
-
-		// sync to first lo-hi transition
-		for( idx=1; idx<m; idx++) {
-			if (dest[idx-1]<dest[idx])
-				lastval=idx;
-				break;
-		}
+	// Configure to go in 125Khz listen mode
+	LFSetupFPGAForADC(95, true);
+	
+	while(!BUTTON_PRESS()) {
 		WDT_HIT();
-
-		// count cycles between consecutive lo-hi transitions, there should be either 8 (fc/8)
-		// or 10 (fc/10) cycles but in practice due to noise etc we may end up with with anywhere
-		// between 7 to 11 cycles so fuzz it by treat anything <9 as 8 and anything else as 10
-		for( i=0; idx<m; idx++) {
-			if (dest[idx-1]<dest[idx]) {
-				dest[i]=idx-lastval;
-				if (dest[i] <= 8) {
-						dest[i]=1;
-				} else {
-						dest[i]=0;
-				}
-
-				lastval=idx;
-				i++;
-			}
+		if (ledcontrol) LED_A_ON();
+		DoAcquisition125k_internal(-1,true);
+		size  = sizeof(BigBuf);
+		//make sure buffer has data
+		if (size < 64) return;
+		//test samples are not just noise
+		uint8_t testMax=0;
+		for(idx=0;idx<64;idx++){
+			if (testMax<dest[idx]) testMax=dest[idx];
 		}
-		m=i;
-		WDT_HIT();
-
-		// we now have a set of cycle counts, loop over previous results and aggregate data into bit patterns
-		lastval=dest[0];
 		idx=0;
-		i=0;
-		n=0;
-		for( idx=0; idx<m; idx++) {
-			if (dest[idx]==lastval) {
-				n++;
-			} else {
-				// a bit time is five fc/10 or six fc/8 cycles so figure out how many bits a pattern width represents,
-				// an extra fc/8 pattern preceeds every 4 bits (about 200 cycles) just to complicate things but it gets
-				// swallowed up by rounding
-				// expected results are 1 or 2 bits, any more and it's an invalid manchester encoding
-				// special start of frame markers use invalid manchester states (no transitions) by using sequences
-				// like 111000
-				if (dest[idx-1]) {
-					n=(n+1)/7;			// fc/8 in sets of 7
-				} else {
-					n=(n+1)/6;			// fc/10 in sets of 6
-				}
-				switch (n) {			// stuff appropriate bits in buffer
-					case 0:
-					case 1:	// one bit
-						dest[i++]=dest[idx-1]^1;
-						//Dbprintf("%d",dest[idx-1]);
-						break;
-					case 2: // two bits
-						dest[i++]=dest[idx-1]^1;
-						dest[i++]=dest[idx-1]^1;
-						//Dbprintf("%d",dest[idx-1]);
-						//Dbprintf("%d",dest[idx-1]);
-						break;
-					case 3: // 3 bit start of frame markers
-						for(int j=0; j<3; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 4:
-						for(int j=0; j<4; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 5:
-						for(int j=0; j<5; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 6:
-						for(int j=0; j<6; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 7:
-						for(int j=0; j<7; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 8:
-						for(int j=0; j<8; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 9:
-						for(int j=0; j<9; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 10:
-						for(int j=0; j<10; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
-						}
-						break;
-					case 11:
-						for(int j=0; j<11; j++){
-						  dest[i++]=dest[idx-1]^1;
-						//  Dbprintf("%d",dest[idx-1]);
+		//if not just noise
+		if (testMax>170){
+			//Dbprintf("testMax: %d",testMax);		
+			// FSK demodulator
+			size = fsk_demod(dest, size);
+			// we now have a set of cycle counts, loop over previous results and aggregate data into bit patterns
+			// 1->0 : fc/8 in sets of 7  (RF/64 / 8 = 8)
+			// 0->1 : fc/10 in sets of 6 (RF/64 / 10 = 6.4)
+			size = aggregate_bits(dest, size, 64, 13, 1);  //13 max Consecutive should be ok as most 0s in row should be 10 for init seq - invert bits
+			WDT_HIT();
+			//Index map
+			//0           10          20          30          40          50          60
+			//|           |           |           |           |           |           |
+			//01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
+			//-----------------------------------------------------------------------------
+			//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
+			//
+			//XSF(version)facility:codeone+codetwo
+			//Handle the data
+			uint8_t sameCardCount=0;
+	 	    uint8_t mask[] = {0,0,0,0,0,0,0,0,0,1};
+			for( idx=0; idx < (size - 74); idx++) {
+				if (sameCardCount>2) break;
+	 	    	if ( memcmp(dest + idx, mask, sizeof(mask))==0) {
+	 	    		//frame marker found
+	 	    		if (!dest[idx+8] && dest[idx+17]==1 && dest[idx+26]==1 && dest[idx+35]==1 && dest[idx+44]==1 && dest[idx+53]==1){
+	 	    			//confirmed proper separator bits found
+		                if(findone){ //only print binary if we are doing one
+				 	    	Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7],dest[idx+8]);
+						    Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15],dest[idx+16],dest[idx+17]);			  
+						    Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23],dest[idx+24],dest[idx+25],dest[idx+26]);
+						    Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31],dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35]);
+						    Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39],dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44]);
+						    Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]);
+						    Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
 						}
-						break;
-					case 12:
-						for(int j=0; j<12; j++){
-						  dest[i++]=dest[idx-1]^1;
-						 // Dbprintf("%d",dest[idx-1]);
+						code = bytebits_to_byte(dest+idx,32);
+					    code2 = bytebits_to_byte(dest+idx+32,32); 
+					    short version = bytebits_to_byte(dest+idx+27,8); //14,4
+					    uint8_t facilitycode = bytebits_to_byte(dest+idx+19,8) ;
+					    uint16_t number = (bytebits_to_byte(dest+idx+36,8)<<8)|(bytebits_to_byte(dest+idx+45,8)); //36,9
+					    
+					    Dbprintf("XSF(%02d)%02x:%d (%08x%08x)",version,facilitycode,number,code,code2);			
+						// if we're only looking for one tag 
+						if (findone){
+							if (ledcontrol)	LED_A_OFF();
+							//LED_A_OFF();
+							return;
 						}
-						break;
-					default:	// this shouldn't happen, don't stuff any bits
-						//Dbprintf("%d",dest[idx-1]);
-						break;
-				}
-				n=0;
-				lastval=dest[idx];
+						sameCardCount++;
+					}
+				}		
 			}
-		}//end for
-		/*for(int j=0; j<64;j+=8){
-		  Dbprintf("%d%d%d%d%d%d%d%d",dest[j],dest[j+1],dest[j+2],dest[j+3],dest[j+4],dest[j+5],dest[j+6],dest[j+7]);
-		}
-		Dbprintf("\n");*/
-		m=i;
+		}	
 		WDT_HIT();
-		
-        for( idx=0; idx<m-9; idx++) {
-	  if ( !(dest[idx]) && !(dest[idx+1]) && !(dest[idx+2]) && !(dest[idx+3]) && !(dest[idx+4]) && !(dest[idx+5]) && !(dest[idx+6]) && !(dest[idx+7]) && !(dest[idx+8])&& (dest[idx+9])){
-		found=1;
-		//idx+=9;
-		if (found) {
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7]);
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+8], dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15]);			  
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+16],dest[idx+17],dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23]);
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+24],dest[idx+25],dest[idx+26],dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31]);
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35],dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39]);
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44],dest[idx+45],dest[idx+46],dest[idx+47]);
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53],dest[idx+54],dest[idx+55]);
-		    Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
-		
-		    short version='\x00';
-		    char unknown='\x00';
-		    uint16_t number=0;
-		    for(int j=14;j<18;j++){
-		       //Dbprintf("%d",dest[idx+j]);
-		       version <<=1;
-		       if (dest[idx+j]) version |= 1;
-		    }
-		    for(int j=19;j<27;j++){
-		       //Dbprintf("%d",dest[idx+j]);
-		       unknown <<=1;
-		       if (dest[idx+j]) unknown |= 1;
-		    }
-		    for(int j=36;j<45;j++){
-		       //Dbprintf("%d",dest[idx+j]);
-		       number <<=1;
-		       if (dest[idx+j]) number |= 1;
-		    }
-		    for(int j=46;j<53;j++){
-		       //Dbprintf("%d",dest[idx+j]);
-		       number <<=1;
-		       if (dest[idx+j]) number |= 1;
-		    }
-		    for(int j=0; j<32; j++){
-			code <<=1;
-			if(dest[idx+j]) code |= 1;
-		    }
-		    for(int j=32; j<64; j++){
-			code2 <<=1;
-			if(dest[idx+j]) code2 |= 1;
-		    }
-		    
-		    Dbprintf("XSF(%02d)%02x:%d (%08x%08x)",version,unknown,number,code,code2);
-		    if (ledcontrol)
-			LED_D_OFF();
-		}
-		// if we're only looking for one tag 
-		if (findone){
-			//*high = hi;
-			//*low = lo;
-			LED_A_OFF();
-			return;
-		}
-      
-		//hi=0;
-		//lo=0;
-		found=0;
-	  }
-		
-	}
 	}
-	WDT_HIT();
+	DbpString("Stopped");
+	if (ledcontrol) LED_A_OFF();
 }
 
 /*------------------------------
@@ -1163,7 +1040,8 @@ void T55xxWriteBit(int bit)
 // Write one card block in page 0, no lock
 void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
 {
-	unsigned int i;
+	//unsigned int i;  //enio adjustment 12/10/14
+	uint32_t i;
 
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
@@ -1208,8 +1086,8 @@ void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMod
 void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
 {
 	uint8_t *dest = (uint8_t *)BigBuf;
-	int m=0, i=0;
-  
+	//int m=0, i=0; //enio adjustment 12/10/14
+  	uint32_t m=0, i=0;
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	m = sizeof(BigBuf);
   // Clear destination buffer before sending the command
@@ -1669,78 +1547,81 @@ int DemodPCF7931(uint8_t **outBlocks) {
 	
 	for (bitidx = 0; i < GraphTraceLen; i++)
 	{
-    if ( (GraphBuffer[i-1] > GraphBuffer[i] && dir == 1 && GraphBuffer[i] > lmax) || (GraphBuffer[i-1] < GraphBuffer[i] && dir == 0 && GraphBuffer[i] < lmin))
-    {
-      lc = i - lastval;
-      lastval = i;
-      
-      // Switch depending on lc length:
-      // Tolerance is 1/8 of clock rate (arbitrary)
-      if (abs(lc-clock/4) < tolerance) {
-        // 16T0
-        if((i - pmc) == lc) { /* 16T0 was previous one */
-          /* It's a PMC ! */
-          i += (128+127+16+32+33+16)-1;
-          lastval = i;
-          pmc = 0;
-          block_done = 1;
-        }
-        else {
-          pmc = i;
-        }
-      } else if (abs(lc-clock/2) < tolerance) {
-        // 32TO
-        if((i - pmc) == lc) { /* 16T0 was previous one */
-          /* It's a PMC ! */
-          i += (128+127+16+32+33)-1;
-          lastval = i;
-          pmc = 0;
-          block_done = 1;
-        }
-        else if(half_switch == 1) {
-          BitStream[bitidx++] = 0;
-          half_switch = 0;
-        }
-        else
-          half_switch++;
-      } else if (abs(lc-clock) < tolerance) {
-        // 64TO
-        BitStream[bitidx++] = 1;
-      } else {
-        // Error
-        warnings++;
-        if (warnings > 10)
-        {
-          Dbprintf("Error: too many detection errors, aborting.");
-          return 0;
-        }
-      }
-      
-      if(block_done == 1) {
-        if(bitidx == 128) {
-          for(j=0; j<16; j++) {
-            Blocks[num_blocks][j] = 128*BitStream[j*8+7]+
-            64*BitStream[j*8+6]+
-            32*BitStream[j*8+5]+
-            16*BitStream[j*8+4]+
-            8*BitStream[j*8+3]+
-            4*BitStream[j*8+2]+
-            2*BitStream[j*8+1]+
-            BitStream[j*8];
-          }
-          num_blocks++;
-        }
-        bitidx = 0;
-        block_done = 0;
-        half_switch = 0;
-      }
-      if (GraphBuffer[i-1] > GraphBuffer[i]) dir=0;
-      else dir = 1;
-    }
-    if(bitidx==255)
-      bitidx=0;
-    warnings = 0;
-    if(num_blocks == 4) break;
+	    if ( (GraphBuffer[i-1] > GraphBuffer[i] && dir == 1 && GraphBuffer[i] > lmax) || (GraphBuffer[i-1] < GraphBuffer[i] && dir == 0 && GraphBuffer[i] < lmin))
+	    {
+	      lc = i - lastval;
+	      lastval = i;
+	      
+	      // Switch depending on lc length:
+	      // Tolerance is 1/8 of clock rate (arbitrary)
+	      if (abs(lc-clock/4) < tolerance) {
+	        // 16T0
+	        if((i - pmc) == lc) { /* 16T0 was previous one */
+	          /* It's a PMC ! */
+	          i += (128+127+16+32+33+16)-1;
+	          lastval = i;
+	          pmc = 0;
+	          block_done = 1;
+	        }
+	        else {
+	          pmc = i;
+	        }
+	      } else if (abs(lc-clock/2) < tolerance) {
+	        // 32TO
+	        if((i - pmc) == lc) { /* 16T0 was previous one */
+	          /* It's a PMC ! */
+	          i += (128+127+16+32+33)-1;
+	          lastval = i;
+	          pmc = 0;
+	          block_done = 1;
+	        }
+	        else if(half_switch == 1) {
+	          BitStream[bitidx++] = 0;
+	          half_switch = 0;
+	        }
+	        else
+	          half_switch++;
+	      } else if (abs(lc-clock) < tolerance) {
+	        // 64TO
+	        BitStream[bitidx++] = 1;
+	      } else {
+	        // Error
+	        warnings++;
+	        if (warnings > 10)
+	        {
+	          Dbprintf("Error: too many detection errors, aborting.");
+	          return 0;
+	        }
+	      }
+	      
+	      if(block_done == 1) {
+	        if(bitidx == 128) {
+	          for(j=0; j<16; j++) {
+	            Blocks[num_blocks][j] = 128*BitStream[j*8+7]+
+	            64*BitStream[j*8+6]+
+	            32*BitStream[j*8+5]+
+	            16*BitStream[j*8+4]+
+	            8*BitStream[j*8+3]+
+	            4*BitStream[j*8+2]+
+	            2*BitStream[j*8+1]+
+	            BitStream[j*8];
+	          }
+	          num_blocks++;
+	        }
+	        bitidx = 0;
+	        block_done = 0;
+	        half_switch = 0;
+	      }
+	      if(i < GraphTraceLen)
+	      {
+		      if (GraphBuffer[i-1] > GraphBuffer[i]) dir=0;
+		      else dir = 1;	      	
+	      }
+	    }
+	    if(bitidx==255)
+	      bitidx=0;
+	    warnings = 0;
+	    if(num_blocks == 4) break;
 	}
 	memcpy(outBlocks, Blocks, 16*num_blocks);
 	return num_blocks;