X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3e750be37cd8e3231ae02260be6899391d206cb4..42c235e7efdac01da7e7ef3e4e442557fe50198d:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 549feff0..4eabb319 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -182,9 +182,7 @@ static int ReadAdc(int ch)
 
 int AvgAdc(int ch) // was static - merlok
 {
-	int i;
-	int a = 0;
-
+	int i, a = 0;
 	for(i = 0; i < 32; ++i)
 		a += ReadAdc(ch);
 
@@ -1052,22 +1050,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_SIMULATE_TAG_LEGIC_RF:
 			LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
 			break;
-
 		case CMD_WRITER_LEGIC_RF:
-			LegicRfWriter( c->arg[0], c->arg[1], c->arg[2]);
-			break;
-
-		case CMD_RAW_WRITER_LEGIC_RF:
-			LegicRfRawWriter(c->arg[0], c->arg[1], c->arg[2]);
+			LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
-
 		case CMD_READER_LEGIC_RF:
 			LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
-			break;
-			
+			break;			
 		case CMD_LEGIC_INFO:
 			LegicRfInfo();
 			break;
+		case CMD_LEGIC_ESET:
+			LegicEMemSet(c->arg[0], c->arg[1], c->d.asBytes);
+			break;
 #endif
 
 #ifdef WITH_ISO14443b
@@ -1196,7 +1190,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_MIFARE_DESFIRE:
 			MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
 			break;
-
 		case CMD_MIFARE_COLLECT_NONCES:
 			break;
 #endif
@@ -1227,7 +1220,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_READER_ICLASS_REPLAY:
 		    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
 			break;
-	case CMD_ICLASS_EML_MEMSET:
+		case CMD_ICLASS_EML_MEMSET:
 			emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
 			break;
 		case CMD_ICLASS_WRITEBLOCK:
@@ -1281,19 +1274,36 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			LED_B_ON();
 			uint8_t *BigBuf = BigBuf_get_addr();
 			size_t len = 0;
-			for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {
-				len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE);
-				cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,BigBuf_get_traceLen(),BigBuf+c->arg[0]+i,len);
+			size_t startidx = c->arg[0];
+			uint8_t isok = FALSE;
+			// arg0 = startindex
+			// arg1 = length bytes to transfer
+			// arg2 = RFU
+			//Dbprintf("transfer to client parameters: %llu | %llu | %llu", c->arg[0], c->arg[1], c->arg[2]);
+			
+			for(size_t i = 0; i < c->arg[1]; i += USB_CMD_DATA_SIZE) {
+				len = MIN( (c->arg[1] - i), USB_CMD_DATA_SIZE);
+				isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), BigBuf + startidx + i, len);
+				if (!isok) 
+					Dbprintf("transfer to client failed ::  | bytes %d", len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
-			cmd_send(CMD_ACK,1,0,BigBuf_get_traceLen(),getSamplingConfig(),sizeof(sample_config));
+			cmd_send(CMD_ACK, 1, 0, BigBuf_get_traceLen(), getSamplingConfig(), sizeof(sample_config));
 			LED_B_OFF();
 			break;
 		}
 		case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
+			// iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
+			// to be able to use this one for uploading data to device 
+			// arg1 = 0 upload for LF usage 
+			//        1 upload for HF usage
+			if ( c->arg[1] == 0 )
+				FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+			else 
+				FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 			uint8_t *b = BigBuf_get_addr();
 			memcpy( b + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
-			cmd_send(CMD_ACK,0,0,0,0,0);
+			cmd_send(CMD_ACK,1,0,0,0,0);
 			break;
 		}
 		case CMD_DOWNLOAD_EML_BIGBUF: {