X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8fd25db30c2684725ed3a75036a01a2af3da206b..316493876a7783c9f195eb81a2d5e4212e4b9476:/armsrc/appmain.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index a2c12803..4eabb319 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1274,25 +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; 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 not only for LF, I use c->arg[1] + // 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: {