X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c0d04e9540fd3d6ac7fa1eb0e006eeb7ee91ab7b..5a956258d3d8416f1cd2259319eae784d008a46b:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e86cad8c..b231cae1 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -14,13 +14,19 @@
 #include "LCD.h"
 #endif
 
+#define va_list __builtin_va_list
+#define va_start __builtin_va_start
+#define va_arg __builtin_va_arg
+#define va_end __builtin_va_end
+int kvsprintf(char const *fmt, void *arg, int radix, va_list ap);
+	
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that
 // is the order in which they go out on the wire.
 //=============================================================================
 
-BYTE ToSend[256];
+BYTE ToSend[512];
 int ToSendMax;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
@@ -28,7 +34,7 @@ struct common_area common_area __attribute__((section(".commonarea")));
 void BufferClear(void)
 {
 	memset(BigBuf,0,sizeof(BigBuf));
-	DbpString("Buffer cleared");
+	Dbprintf("Buffer cleared (%i bytes)",sizeof(BigBuf));
 }
 
 void ToSendReset(void)
@@ -69,14 +75,18 @@ void DbpString(char *str)
 
 	UsbCommand c;
 	c.cmd = CMD_DEBUG_PRINT_STRING;
-	c.ext1 = strlen(str);
-	memcpy(c.d.asBytes, str, c.ext1);
+	c.arg[0] = strlen(str);
+	if(c.arg[0] > sizeof(c.d.asBytes)) {
+		c.arg[0] = sizeof(c.d.asBytes);
+	}
+	memcpy(c.d.asBytes, str, c.arg[0]);
 
 	UsbSendPacket((BYTE *)&c, sizeof(c));
 	// TODO fix USB so stupid things like this aren't req'd
 	SpinDelay(50);
 }
 
+#if 0
 void DbpIntegers(int x1, int x2, int x3)
 {
 	/* this holds up stuff unless we're connected to usb */
@@ -85,14 +95,27 @@ void DbpIntegers(int x1, int x2, int x3)
 
 	UsbCommand c;
 	c.cmd = CMD_DEBUG_PRINT_INTEGERS;
-	c.ext1 = x1;
-	c.ext2 = x2;
-	c.ext3 = x3;
+	c.arg[0] = x1;
+	c.arg[1] = x2;
+	c.arg[2] = x3;
 
 	UsbSendPacket((BYTE *)&c, sizeof(c));
 	// XXX
 	SpinDelay(50);
 }
+#endif
+
+void Dbprintf(const char *fmt, ...) {
+// should probably limit size here; oh well, let's just use a big buffer
+	char output_string[128];
+	va_list ap;
+
+	va_start(ap, fmt);
+	kvsprintf(fmt, output_string, 10, ap);
+	va_end(ap);
+ 
+	DbpString(output_string);
+}
 
 //-----------------------------------------------------------------------------
 // Read an ADC channel and block till it completes, then return the result
@@ -176,12 +199,33 @@ void MeasureAntennaTuning(void)
 	vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
 
 	c.cmd = CMD_MEASURED_ANTENNA_TUNING;
-	c.ext1 = (vLf125 << 0) | (vLf134 << 16);
-	c.ext2 = vHf;
-	c.ext3 = peakf | (peakv << 16);
+	c.arg[0] = (vLf125 << 0) | (vLf134 << 16);
+	c.arg[1] = vHf;
+	c.arg[2] = peakf | (peakv << 16);
 	UsbSendPacket((BYTE *)&c, sizeof(c));
 }
 
+void MeasureAntennaTuningHf(void)
+{
+	int vHf = 0;	// in mV
+
+	DbpString("Measuring HF antenna, press button to exit");
+
+	for (;;) {
+		// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+		SpinDelay(20);
+		// Vref = 3300mV, and an 10:1 voltage divider on the input
+		// can measure voltages up to 33000 mV
+		vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
+	
+		Dbprintf("%d mV",vHf);
+		if (BUTTON_PRESS()) break;
+	}
+	DbpString("cancelled");
+}
+
+
 void SimulateTagHfListen(void)
 {
 	BYTE *dest = (BYTE *)BigBuf;
@@ -230,13 +274,10 @@ void SimulateTagHfListen(void)
 
 void ReadMem(int addr)
 {
-	const DWORD *data = ((DWORD *)addr);
-	int i;
+	const BYTE *data = ((BYTE *)addr);
 
-	DbpString("Reading memory at address");
-	DbpIntegers(0, 0, addr);
-	for (i = 0; i < 8; i+= 2)
-		DbpIntegers(0, data[i], data[i+1]);
+	Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",
+		addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
 }
 
 /* osimage version information is linked in */
@@ -267,7 +308,7 @@ void SendVersion(void)
 	DbpString(temp);
 }
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 // samy's sniff and repeat routine
 void SamyRun()
 {
@@ -322,8 +363,7 @@ void SamyRun()
 			SpinDelay(500);
 
 			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-			DbpString("Recorded");
-			DbpIntegers(selected, high[selected], low[selected]);
+			Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]);
 
 			LEDsoff();
 			LED(selected + 1, 0);
@@ -353,7 +393,7 @@ void SamyRun()
 				// wait for button to be released
 				while(BUTTON_PRESS())
 					WDT_HIT();
-				DbpIntegers(selected, high[selected], low[selected]);
+				Dbprintf("%x %x %x", selected, high[selected], low[selected]);
 				CmdHIDsimTAG(high[selected], low[selected], 0);
 				DbpString("Done playing");
 				if (BUTTON_HELD(1000) > 0)
@@ -431,17 +471,15 @@ void ListenReaderField(int limit)
 	lf_av=lf_max=ReadAdc(ADC_CHAN_LF);
 
 	if(limit != HF_ONLY) {
-		DbpString("LF 125/134 Baseline:");
-		DbpIntegers(lf_av,0,0);
-		lf_baseline= lf_av;
+		Dbprintf("LF 125/134 Baseline: %d", lf_av);
+		lf_baseline = lf_av;
 	}
 
 	hf_av=hf_max=ReadAdc(ADC_CHAN_HF);
 
 	if (limit != LF_ONLY) {
-		DbpString("HF 13.56 Baseline:");
-		DbpIntegers(hf_av,0,0);
-		hf_baseline= hf_av;
+		Dbprintf("HF 13.56 Baseline: %d", hf_av);
+		hf_baseline = hf_av;
 	}
 
 	for(;;) {
@@ -472,9 +510,8 @@ void ListenReaderField(int limit)
 			lf_av_new= ReadAdc(ADC_CHAN_LF);
 			// see if there's a significant change
 			if(abs(lf_av - lf_av_new) > 10) {
-				DbpString("LF 125/134 Field Change:");
-				DbpIntegers(lf_av,lf_av_new,lf_count);
-				lf_av= lf_av_new;
+				Dbprintf("LF 125/134 Field Change: %x %x %x", lf_av, lf_av_new, lf_count);
+				lf_av = lf_av_new;
 				if (lf_av > lf_max)
 					lf_max = lf_av;
 				lf_count= 0;
@@ -491,9 +528,8 @@ void ListenReaderField(int limit)
 			hf_av_new= ReadAdc(ADC_CHAN_HF);
 			// see if there's a significant change
 			if(abs(hf_av - hf_av_new) > 10) {
-				DbpString("HF 13.56 Field Change:");
-				DbpIntegers(hf_av,hf_av_new,hf_count);
-				hf_av= hf_av_new;
+				Dbprintf("HF 13.56 Field Change: %x %x %x", hf_av, hf_av_new, hf_count);
+				hf_av = hf_av_new;
 				if (hf_av > hf_max)
 					hf_max = hf_av;
 				hf_count= 0;
@@ -532,17 +568,20 @@ void ListenReaderField(int limit)
 void UsbPacketReceived(BYTE *packet, int len)
 {
 	UsbCommand *c = (UsbCommand *)packet;
+	UsbCommand ack;
+	ack.cmd = CMD_ACK;
 
 	switch(c->cmd) {
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
-			AcquireRawAdcSamples125k(c->ext1);
+			AcquireRawAdcSamples125k(c->arg[0]);
+			UsbSendPacket((BYTE*)&ack, sizeof(ack));
 			break;
 #endif
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
-			ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);
+			ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
 			break;
 #endif
 
@@ -558,38 +597,47 @@ void UsbPacketReceived(BYTE *packet, int len)
 
 #ifdef WITH_ISO15693
 		case CMD_READER_ISO_15693:
-			ReaderIso15693(c->ext1);
+			ReaderIso15693(c->arg[0]);
 			break;
 #endif
 
 		case CMD_READER_LEGIC_RF:
-			LegicRfReader();
-			break;
+			LegicRfReader(c->arg[0], c->arg[1]);
+			break;
 
 #ifdef WITH_ISO15693
 		case CMD_SIMTAG_ISO_15693:
-			SimTagIso15693(c->ext1);
+			SimTagIso15693(c->arg[0]);
 			break;
 #endif
 
 #ifdef WITH_ISO14443b
 		case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
-			AcquireRawAdcSamplesIso14443(c->ext1);
+			AcquireRawAdcSamplesIso14443(c->arg[0]);
 			break;
 #endif
 
 #ifdef WITH_ISO14443b
 		case CMD_READ_SRI512_TAG:
-			ReadSRI512Iso14443(c->ext1);
+			ReadSRI512Iso14443(c->arg[0]);
 			break;
+               case CMD_READ_SRIX4K_TAG:
+                       ReadSRIX4KIso14443(c->arg[0]);
+                       break;
 #endif
 
 #ifdef WITH_ISO14443a
 		case CMD_READER_ISO_14443a:
-			ReaderIso14443a(c->ext1);
+			ReaderIso14443a(c->arg[0]);
 			break;
 #endif
 
+#ifdef WITH_ISO14443a
+		case CMD_READER_MIFARE:
+			ReaderMifare(c->arg[0]);
+			break;
+#endif
+      
 #ifdef WITH_ISO14443b
 		case CMD_SNOOP_ISO_14443:
 			SnoopIso14443();
@@ -614,31 +662,31 @@ void UsbPacketReceived(BYTE *packet, int len)
 		
 #ifdef WITH_ISO14443a
 		case CMD_SIMULATE_TAG_ISO_14443a:
-			SimulateIso14443aTag(c->ext1, c->ext2);  // ## Simulate iso14443a tag - pass tag type & UID
+			SimulateIso14443aTag(c->arg[0], c->arg[1]);  // ## Simulate iso14443a tag - pass tag type & UID
 			break;
 #endif
 
-		case CMD_SIMULATE_TAG_LEGIC_RF:
-			LegicRfSimulate();
-			break;
-
 		case CMD_MEASURE_ANTENNA_TUNING:
 			MeasureAntennaTuning();
 			break;
 
+		case CMD_MEASURE_ANTENNA_TUNING_HF:
+			MeasureAntennaTuningHf();
+			break;
+
 		case CMD_LISTEN_READER_FIELD:
-			ListenReaderField(c->ext1);
+			ListenReaderField(c->arg[0]);
 			break;
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_HID_DEMOD_FSK:
 			CmdHIDdemodFSK(0, 0, 0, 1);				// Demodulate HID tag
 			break;
 #endif
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_HID_SIM_TAG:
-			CmdHIDsimTAG(c->ext1, c->ext2, 1);					// Simulate HID tag by ID
+			CmdHIDsimTAG(c->arg[0], c->arg[1], 1);					// Simulate HID tag by ID
 			break;
 #endif
 
@@ -648,15 +696,15 @@ void UsbPacketReceived(BYTE *packet, int len)
 			LED_D_OFF(); // LED D indicates field ON or OFF
 			break;
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_READ_TI_TYPE:
 			ReadTItag();
 			break;
 #endif
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_WRITE_TI_TYPE:
-			WriteTItag(c->ext1,c->ext2,c->ext3);
+			WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
 			break;
 #endif
 
@@ -667,36 +715,38 @@ void UsbPacketReceived(BYTE *packet, int len)
 			} else {
 				n.cmd = CMD_DOWNLOADED_RAW_BITS_TI_TYPE;
 			}
-			n.ext1 = c->ext1;
-			memcpy(n.d.asDwords, BigBuf+c->ext1, 12*sizeof(DWORD));
+			n.arg[0] = c->arg[0];
+			memcpy(n.d.asDwords, BigBuf+c->arg[0], 12*sizeof(DWORD));
 			UsbSendPacket((BYTE *)&n, sizeof(n));
 			break;
 		}
 
 		case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
 			BYTE *b = (BYTE *)BigBuf;
-			memcpy(b+c->ext1, c->d.asBytes, 48);
+			memcpy(b+c->arg[0], c->d.asBytes, 48);
+			//Dbprintf("copied 48 bytes to %i",b+c->arg[0]);
+			UsbSendPacket((BYTE*)&ack, sizeof(ack));
 			break;
 		}
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_SIMULATE_TAG_125K:
 			LED_A_ON();
-			SimulateTagLowFrequency(c->ext1, 1);
+			SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
 			LED_A_OFF();
 			break;
 #endif
 
 		case CMD_READ_MEM:
-			ReadMem(c->ext1);
+			ReadMem(c->arg[0]);
 			break;
 
 		case CMD_SET_LF_DIVISOR:
-			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->ext1);
+			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);
 			break;
 
 		case CMD_SET_ADC_MUX:
-			switch(c->ext1) {
+			switch(c->arg[0]) {
 				case 0: SetAdcMuxFor(GPIO_MUXSEL_LOPKD); break;
 				case 1: SetAdcMuxFor(GPIO_MUXSEL_LORAW); break;
 				case 2: SetAdcMuxFor(GPIO_MUXSEL_HIPKD); break;
@@ -708,9 +758,9 @@ void UsbPacketReceived(BYTE *packet, int len)
 			SendVersion();
 			break;
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		case CMD_LF_SIMULATE_BIDIR:
-			SimulateTagLowFrequencyBidir(c->ext1, c->ext2);
+			SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
 			break;
 #endif
 
@@ -719,7 +769,7 @@ void UsbPacketReceived(BYTE *packet, int len)
 			LCDReset();
 			break;
 		case CMD_LCD:
-			LCDSend(c->ext1);
+			LCDSend(c->arg[0]);
 			break;
 #endif
 		case CMD_SETUP_WRITE:
@@ -746,13 +796,13 @@ void UsbPacketReceived(BYTE *packet, int len)
 		case CMD_DEVICE_INFO: {
 			UsbCommand c;
 			c.cmd = CMD_DEVICE_INFO;
-			c.ext1 = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
-			if(common_area.flags.bootrom_present) c.ext1 |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
+			c.arg[0] = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
+			if(common_area.flags.bootrom_present) c.arg[0] |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
 			UsbSendPacket((BYTE*)&c, sizeof(c));
 		}
 			break;
 		default:
-			DbpString("unknown command");
+			Dbprintf("%s: 0x%04x","unknown command:",c->cmd);
 			break;
 	}
 }
@@ -823,7 +873,7 @@ void  __attribute__((noreturn)) AppMain(void)
 		UsbPoll(FALSE);
 		WDT_HIT();
 
-#ifdef DWITH_LF
+#ifdef WITH_LF
 		if (BUTTON_HELD(1000) > 0)
 			SamyRun();
 #endif