X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/aa41c6058a4c5768d524a711af846f43ca7a236c..04d2721b3c7c4113e627d3f953835bde932065db:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a3f507d6..88ade851 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -36,7 +36,8 @@
 // is the order in which they go out on the wire.
 //=============================================================================
 
-uint8_t ToSend[512];
+#define TOSEND_BUFFER_SIZE (9*MAX_FRAME_SIZE + 1 + 1 + 2)  // 8 data bits and 1 parity bit per payload byte, 1 correction bit, 1 SOC bit, 2 EOC bits 
+uint8_t ToSend[TOSEND_BUFFER_SIZE];
 int ToSendMax;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
@@ -67,7 +68,7 @@ void ToSendStuffBit(int b)
 
 	ToSendBit++;
 
-	if(ToSendBit >= sizeof(ToSend)) {
+	if(ToSendMax >= sizeof(ToSend)) {
 		ToSendBit = 0;
 		DbpString("ToSendStuffBit overflowed!");
 	}
@@ -81,40 +82,12 @@ void DbpString(char *str)
 {
   byte_t len = strlen(str);
   cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
-//	/* this holds up stuff unless we're connected to usb */
-//	if (!UsbConnected())
-//		return;
-//
-//	UsbCommand c;
-//	c.cmd = CMD_DEBUG_PRINT_STRING;
-//	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((uint8_t *)&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)
 {
   cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
-//	/* this holds up stuff unless we're connected to usb */
-//	if (!UsbConnected())
-//		return;
-//
-//	UsbCommand c;
-//	c.cmd = CMD_DEBUG_PRINT_INTEGERS;
-//	c.arg[0] = x1;
-//	c.arg[1] = x2;
-//	c.arg[2] = x3;
-//
-//	UsbSendPacket((uint8_t *)&c, sizeof(c));
-//	// XXX
-//	SpinDelay(50);
 }
 #endif
 
@@ -195,15 +168,11 @@ int AvgAdc(int ch) // was static - merlok
 
 void MeasureAntennaTuning(void)
 {
-	uint8_t *dest = (uint8_t *)BigBuf+FREE_BUFFER_OFFSET;
+	uint8_t LF_Results[256];
 	int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0 
 	int vLf125 = 0, vLf134 = 0, vHf = 0;	// in mV
 
-//	UsbCommand c;
-
-  LED_B_ON();
-	DbpString("Measuring antenna characteristics, please wait...");
-	memset(dest,0,sizeof(FREE_BUFFER_SIZE));
+	LED_B_ON();
 
 /*
  * Sweeps the useful LF range of the proxmark from
@@ -216,7 +185,7 @@ void MeasureAntennaTuning(void)
   
   	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-	for (i=255; i>19; i--) {
+	for (i=255; i>=19; i--) {
     WDT_HIT();
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
 		SpinDelay(20);
@@ -226,16 +195,18 @@ void MeasureAntennaTuning(void)
 		if (i==95) 	vLf125 = adcval; // voltage at 125Khz
 		if (i==89) 	vLf134 = adcval; // voltage at 134Khz
 
-		dest[i] = adcval>>8; // scale int to fit in byte for graphing purposes
-		if(dest[i] > peak) {
+		LF_Results[i] = adcval>>8; // scale int to fit in byte for graphing purposes
+		if(LF_Results[i] > peak) {
 			peakv = adcval;
-			peak = dest[i];
+			peak = LF_Results[i];
 			peakf = i;
 			//ptr = i;
 		}
 	}
 
-  LED_A_ON();
+	for (i=18; i >= 0; i--) LF_Results[i] = 0;
+	
+	LED_A_ON();
 	// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
   	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
@@ -244,18 +215,11 @@ void MeasureAntennaTuning(void)
 	// can measure voltages up to 33000 mV
 	vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
 
-//	c.cmd = CMD_MEASURED_ANTENNA_TUNING;
-//	c.arg[0] = (vLf125 << 0) | (vLf134 << 16);
-//	c.arg[1] = vHf;
-//	c.arg[2] = peakf | (peakv << 16);
-
-  DbpString("Measuring complete, sending report back to host");
-  cmd_send(CMD_MEASURED_ANTENNA_TUNING,vLf125|(vLf134<<16),vHf,peakf|(peakv<<16),0,0);
-//	UsbSendPacket((uint8_t *)&c, sizeof(c));
+	cmd_send(CMD_MEASURED_ANTENNA_TUNING,vLf125|(vLf134<<16),vHf,peakf|(peakv<<16),LF_Results,256);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-  LED_A_OFF();
-  LED_B_OFF();
-  return;
+	LED_A_OFF();
+	LED_B_OFF();
+	return;
 }
 
 void MeasureAntennaTuningHf(void)
@@ -340,7 +304,7 @@ extern struct version_information version_information;
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end;
 void SendVersion(void)
 {
-	char temp[256]; /* Limited data payload in USB packets */
+	char temp[512]; /* Limited data payload in USB packets */
 	DbpString("Prox/RFID mark3 RFID instrument");
 
 	/* Try to find the bootrom version information. Expect to find a pointer at
@@ -389,13 +353,13 @@ void SamyRun()
 
 	int selected = 0;
 	int playing = 0;
+	int cardRead = 0;
 
 	// Turn on selected LED
 	LED(selected + 1, 0);
 
 	for (;;)
 	{
-//		UsbPoll(FALSE);
 		usb_poll();
     WDT_HIT();
 
@@ -404,7 +368,7 @@ void SamyRun()
 		SpinDelay(300);
 
 		// Button was held for a second, begin recording
-		if (button_pressed > 0)
+		if (button_pressed > 0 && cardRead == 0)
 		{
 			LEDsoff();
 			LED(selected + 1, 0);
@@ -430,6 +394,40 @@ void SamyRun()
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
 			playing = 0;
+			
+			cardRead = 1;
+	
+		}
+
+		else if (button_pressed > 0 && cardRead == 1)
+		{
+					LEDsoff();
+					LED(selected + 1, 0);
+					LED(LED_ORANGE, 0);
+
+					// record
+					Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
+
+					// wait for button to be released
+					while(BUTTON_PRESS())
+						WDT_HIT();
+
+					/* need this delay to prevent catching some weird data */
+					SpinDelay(500);
+
+					CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
+					Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
+
+					LEDsoff();
+					LED(selected + 1, 0);
+					// Finished recording
+
+					// If we were previously playing, set playing off
+					// so next button push begins playing what we recorded
+					playing = 0;
+					
+					cardRead = 0;
+			
 		}
 
 		// Change where to record (or begin playing)
@@ -643,20 +641,23 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			cmd_send(CMD_ACK,0,0,0,0,0);
 			break;
 		case CMD_HID_DEMOD_FSK:
-			CmdHIDdemodFSK(0, 0, 0, 1);					// Demodulate HID tag
+			CmdHIDdemodFSK(c->arg[0], 0, 0, 1);
 			break;
 		case CMD_HID_SIM_TAG:
-			CmdHIDsimTAG(c->arg[0], c->arg[1], 1);					// Simulate HID tag by ID
+			CmdHIDsimTAG(c->arg[0], c->arg[1], 1);
 			break;
-		case CMD_HID_CLONE_TAG: // Clone HID tag by ID to T55x7
+		case CMD_HID_CLONE_TAG:
 			CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
 			break;
 		case CMD_IO_DEMOD_FSK:
-			CmdIOdemodFSK(1, 0, 0, 1);					// Demodulate IO tag
+			CmdIOdemodFSK(c->arg[0], 0, 0, 1);
 			break;
-		case CMD_IO_CLONE_TAG: // Clone IO tag by ID to T55x7
+		case CMD_IO_CLONE_TAG:
 			CopyIOtoT55x7(c->arg[0], c->arg[1], c->d.asBytes[0]);
 			break;
+		case CMD_EM410X_DEMOD:
+			CmdEM410xdemod(c->arg[0], 0, 0, 1);
+			break;
 		case CMD_EM410X_WRITE_TAG:
 			WriteEM410x(c->arg[0], c->arg[1], c->arg[2]);
 			break;
@@ -674,10 +675,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_LF_SIMULATE_BIDIR:
 			SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
 			break;
-		case CMD_INDALA_CLONE_TAG:					// Clone Indala 64-bit tag by UID to T55x7
+		case CMD_INDALA_CLONE_TAG:
 			CopyIndala64toT55x7(c->arg[0], c->arg[1]);					
 			break;
-		case CMD_INDALA_CLONE_TAG_L:					// Clone Indala 224-bit tag by UID to T55x7
+		case CMD_INDALA_CLONE_TAG_L:
 			CopyIndala224toT55x7(c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3], c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]);
 			break;
 		case CMD_T55XX_READ_BLOCK:
@@ -686,13 +687,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_T55XX_WRITE_BLOCK:
 			T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
 			break;
-		case CMD_T55XX_READ_TRACE: // Clone HID tag by ID to T55x7
+		case CMD_T55XX_READ_TRACE:
 			T55xxReadTrace();
 			break;
-		case CMD_PCF7931_READ: // Read PCF7931 tag
+		case CMD_PCF7931_READ:
 			ReadPCF7931();
 			cmd_send(CMD_ACK,0,0,0,0,0);
-//      	UsbSendPacket((uint8_t*)&ack, sizeof(ack));
 			break;
 		case CMD_EM4X_READ_WORD:
 			EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
@@ -738,7 +738,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			ReaderIso15693(c->arg[0]);
 			break;
 		case CMD_SIMTAG_ISO_15693:
-			SimTagIso15693(c->arg[0]);
+			SimTagIso15693(c->arg[0], c->d.asBytes);
 			break;
 #endif
 
@@ -787,6 +787,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_SIMULATE_TAG_ISO_14443a:
 			SimulateIso14443aTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
 			break;
+			
 		case CMD_EPA_PACE_COLLECT_NONCE:
 			EPA_PACE_Collect_Nonce(c);
 			break;
@@ -800,8 +801,17 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_MIFAREU_READBL:
 			MifareUReadBlock(c->arg[0],c->d.asBytes);
 			break;
+		case CMD_MIFAREUC_AUTH1:
+			MifareUC_Auth1(c->arg[0],c->d.asBytes);
+			break;
+		case CMD_MIFAREUC_AUTH2:
+			MifareUC_Auth2(c->arg[0],c->d.asBytes);
+			break;
 		case CMD_MIFAREU_READCARD:
-			MifareUReadCard(c->arg[0],c->d.asBytes);
+			MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
+                        break;
+		case CMD_MIFAREUC_READCARD:
+			MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
                         break;
 		case CMD_MIFARE_READSC:
 			MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -843,17 +853,21 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 			
 		// Work with "magic Chinese" card
-		case CMD_MIFARE_EML_CSETBLOCK:
+		case CMD_MIFARE_CSETBLOCK:
 			MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
-		case CMD_MIFARE_EML_CGETBLOCK:
+		case CMD_MIFARE_CGETBLOCK:
 			MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
+		case CMD_MIFARE_CIDENT:
+			MifareCIdent();
+			break;
 			
 		// mifare sniffer
 		case CMD_MIFARE_SNIFFER:
 			SniffMifare(c->arg[0]);
 			break;
+
 #endif
 
 #ifdef WITH_ICLASS
@@ -899,18 +913,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 
 		case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K:
-//			UsbCommand n;
-//			if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) {
-//				n.cmd = CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K;
-//			} else {
-//				n.cmd = CMD_DOWNLOADED_RAW_BITS_TI_TYPE;
-//			}
-//			n.arg[0] = c->arg[0];
-      //			memcpy(n.d.asBytes, BigBuf+c->arg[0], 48); // 12*sizeof(uint32_t)
-      //			LED_B_ON();
-      //      usb_write((uint8_t *)&n, sizeof(n));
-      //			UsbSendPacket((uint8_t *)&n, sizeof(n));
-      //			LED_B_OFF();
 
 			LED_B_ON();
 			for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {
@@ -924,9 +926,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 
 		case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
 			uint8_t *b = (uint8_t *)BigBuf;
-			memcpy(b+c->arg[0], c->d.asBytes, 48);
-			//Dbprintf("copied 48 bytes to %i",b+c->arg[0]);
-//			UsbSendPacket((uint8_t*)&ack, sizeof(ack));
+			memcpy(b+c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
 			cmd_send(CMD_ACK,0,0,0,0,0);
 			break;
 		}	
@@ -984,7 +984,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_DEVICE_INFO: {
 			uint32_t dev_info = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
 			if(common_area.flags.bootrom_present) dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
-//			UsbSendPacket((uint8_t*)&c, sizeof(c));
 			cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);	
 			break;
 		}
@@ -1011,9 +1010,8 @@ void  __attribute__((noreturn)) AppMain(void)
 	LED_B_OFF();
 	LED_A_OFF();
 
-  // Init USB device`
+	// Init USB device
   usb_enable();
-//	UsbStart();
 
 	// The FPGA gets its clock from us from PCK0 output, so set that up.
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
@@ -1049,8 +1047,6 @@ void  __attribute__((noreturn)) AppMain(void)
         UsbPacketReceived(rx,rx_len);
       }
     }
-//		UsbPoll(FALSE);
-
 		WDT_HIT();
 
 #ifdef WITH_LF