X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3612a8a8e2b3118e0bcb4ea0ef9a6c59d3635696..9ca155ba443e8f2a9feb7640f4b461842cce9e35:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ed89fe98..501f07a5 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -124,6 +124,29 @@ void Dbprintf(const char *fmt, ...) {
 	DbpString(output_string);
 }
 
+// prints HEX & ASCII
+void Dbhexdump(int len, uint8_t *d) {
+	int l=0,i;
+	char ascii[9];
+
+	while (len>0) {
+		if (len>8) l=8;
+		else l=len;
+		
+		memcpy(ascii,d,l);
+		ascii[l]=0;	
+		
+		// filter safe ascii
+		for (i=0;i<l;i++) 
+			if (ascii[i]<32 || ascii[i]>126) ascii[i]='.';
+
+		Dbprintf("%-8s %*D",ascii,l,d," ");
+
+		len-=8;
+		d+=8;		
+	}
+}
+
 //-----------------------------------------------------------------------------
 // Read an ADC channel and block till it completes, then return the result
 // in ADC units (0 to 1023). Also a routine to average 32 samples and
@@ -148,7 +171,7 @@ static int ReadAdc(int ch)
 	return d;
 }
 
-static int AvgAdc(int ch)
+int AvgAdc(int ch) // was static - merlok
 {
 	int i;
 	int a = 0;
@@ -598,6 +621,24 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 #endif
 
+#ifdef WITH_ISO15693
+		case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
+			RecordRawAdcSamplesIso15693();
+			break;
+			
+		case CMD_ISO_15693_COMMAND:
+			DirectTag15693Command(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+			break;
+					
+		case CMD_ISO_15693_FIND_AFI:
+			BruteforceIso15693Afi(c->arg[0]);
+			break;	
+			
+		case CMD_ISO_15693_DEBUG:
+			SetDebugIso15693(c->arg[0]);
+			break;
+			
+#endif
 		case CMD_BUFF_CLEAR:
 			BufferClear();
 			break;
@@ -643,7 +684,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 
 #ifdef WITH_ISO14443a
 		case CMD_READER_ISO_14443a:
-			ReaderIso14443a(c->arg[0]);
+			ReaderIso14443a(c, &ack);
 			break;
 #endif
 
@@ -653,6 +694,28 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 #endif
 
+#ifdef WITH_ISO14443a
+		case CMD_MIFARE_READBL:
+			MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			break;
+		case CMD_MIFARE_READSC:
+			MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			break;
+		case CMD_MIFARE_WRITEBL:
+			MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			break;
+		case CMD_MIFARE_NESTED:
+			MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			break;
+		case CMD_MIFARE_CHKKEYS:
+			MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			break;
+		case CMD_SIMULATE_MIFARE_CARD:
+			Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			break;
+			
+#endif
+
 #ifdef WITH_ISO14443b
 		case CMD_SNOOP_ISO_14443:
 			SnoopIso14443();
@@ -665,6 +728,13 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 #endif
 
+#ifdef WITH_ISO14443a
+		// Makes use of ISO14443a FPGA Firmware
+		case CMD_SNOOP_ICLASS:
+			SnoopIClass();
+			break;
+#endif
+
 		case CMD_SIMULATE_TAG_HF_LISTEN:
 			SimulateTagHfListen();
 			break;
@@ -732,7 +802,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			}
 			n.arg[0] = c->arg[0];
 			memcpy(n.d.asDwords, BigBuf+c->arg[0], 12*sizeof(uint32_t));
+			LED_B_ON();
 			UsbSendPacket((uint8_t *)&n, sizeof(n));
+			LED_B_OFF();
 			break;
 		}
 
@@ -858,6 +930,8 @@ void  __attribute__((noreturn)) AppMain(void)
 	// Load the FPGA image, which we have stored in our flash.
 	FpgaDownloadAndGo();
 
+	StartTickCount();
+	
 #ifdef WITH_LCD
 
 	LCDInit();