X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cc70dd6b600f8343c023bad284b1d1e219e41ca8..53d5dc643f592124676b4290c8f81e6039e9abc7:/armsrc/appmain.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index ead92c48..d4b22465 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -10,20 +10,15 @@ // executes. //----------------------------------------------------------------------------- #include "usb_cdc.h" -//#include "cmd.h" #include "proxmark3.h" #include "apps.h" #include "util.h" #include "printf.h" #include "string.h" -#include #include "legicrf.h" -#include "hitag2.h" -#include "hitagS.h" #include "lfsampling.h" #include "BigBuf.h" #include "mifareutil.h" -#include "pcf7931.h" #ifdef WITH_LCD #include "LCD.h" @@ -76,6 +71,28 @@ void PrintToSendBuffer(void){ Dbhexdump(ToSendMax, ToSend, 0); } +void print_result(char *name, uint8_t *buf, size_t len) { + uint8_t *p = buf; + + if ( len % 16 == 0 ) { + for(; p-buf < len; p += 16) + Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", + name, + p-buf, + len, + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15] + ); + } + else { + for(; p-buf < len; p += 8) + Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x", + name, + p-buf, + len, + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + } +} + //============================================================================= // Debug print functions, to go out over USB, to the usual PC-side client. //============================================================================= @@ -182,9 +199,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); @@ -194,9 +209,11 @@ int AvgAdc(int ch) // was static - merlok void MeasureAntennaTuning(void) { - uint8_t* LF_Results = BigBuf_malloc(256); + uint8_t LF_Results[256]; int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV + + memset(LF_Results, 0, sizeof(LF_Results)); LED_B_ON(); /* @@ -210,7 +227,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--) { WDT_HIT(); FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i); @@ -227,9 +244,6 @@ void MeasureAntennaTuning(void) { } } - // 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); @@ -239,8 +253,6 @@ void MeasureAntennaTuning(void) { cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134 << 16), vHf, peakf | (peakv << 16), LF_Results, 256); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); - - BigBuf_free(); BigBuf_Clear_ext(false); LEDsoff(); } @@ -1030,19 +1042,15 @@ void UsbPacketReceived(uint8_t *packet, int len) 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; - case CMD_READER_ISO_15693: ReaderIso15693(c->arg[0]); break; @@ -1055,17 +1063,17 @@ 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; + case CMD_LEGIC_INFO: + LegicRfInfo(); + break; + case CMD_LEGIC_ESET: + LegicEMemSet(c->arg[0], c->arg[1], c->d.asBytes); break; #endif @@ -1195,7 +1203,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 @@ -1226,7 +1233,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: @@ -1280,19 +1287,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; iarg[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: {