CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool.

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index d50ef640e593c60bb70f730c796b3df9620984d5..3ba9dd68eb3b9ff8c4eb00a9aa5e166313fc7805 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -10,20 +10,15 @@
 // executes.
 //-----------------------------------------------------------------------------
 #include "usb_cdc.h"
 // executes.
 //-----------------------------------------------------------------------------
 #include "usb_cdc.h"

-//#include "cmd.h"

 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"

-#include <stdarg.h>

 #include "legicrf.h"
 #include "legicrf.h"

-#include "hitag2.h"
-#include "hitagS.h"

 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"

-#include "pcf7931.h"

 
 #ifdef WITH_LCD
  #include "LCD.h"
 
 #ifdef WITH_LCD
  #include "LCD.h"


@@ -76,6 +71,28 @@ void PrintToSendBuffer(void){
        Dbhexdump(ToSendMax, ToSend, 0);
 }
 
        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.
 //=============================================================================
 //=============================================================================
 // 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 AvgAdc(int ch) // was static - merlok
 {

-       int i;
-       int a = 0;
-
+       int i, a = 0;

        for(i = 0; i < 32; ++i)
                a += ReadAdc(ch);
 
        for(i = 0; i < 32; ++i)
                a += ReadAdc(ch);
 


@@ -238,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);
 
        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();
 }
 
        LEDsoff();
 }
 


@@ -370,21 +383,24 @@ void StandAloneMode()
 #endif
 
 #ifdef WITH_ISO14443a_StandAlone
 #endif
 
 #ifdef WITH_ISO14443a_StandAlone

+
+typedef struct {
+       uint8_t uid[10];
+       uint8_t uidlen;
+       uint8_t atqa[2];
+       uint8_t sak;
+} __attribute__((__packed__)) card_clone_t;
+

 void StandAloneMode14a()
 {
        StandAloneMode();
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
 void StandAloneMode14a()
 {
        StandAloneMode();
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 

-       int selected = 0;
-       int playing = 0, iGotoRecord = 0, iGotoClone = 0;
+       int selected = 0, playing = 0, iGotoRecord = 0, iGotoClone = 0;

        int cardRead[OPTS] = {0};
        int cardRead[OPTS] = {0};

-       uint8_t readUID[10] = {0};
-       uint32_t uid_1st[OPTS]={0};
-       uint32_t uid_2nd[OPTS]={0};
-       uint32_t uid_tmp1 = 0;
-       uint32_t uid_tmp2 = 0;
-       iso14a_card_select_t hi14a_card[OPTS];

 
 

+       card_clone_t uids[OPTS];
+       iso14a_card_select_t card_info[OPTS];

        uint8_t params = (MAGIC_SINGLE | MAGIC_DATAIN);
                                        
        LED(selected + 1, 0);
        uint8_t params = (MAGIC_SINGLE | MAGIC_DATAIN);
                                        
        LED(selected + 1, 0);


@@ -406,9 +422,6 @@ void StandAloneMode14a()
                        Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
                        /* need this delay to prevent catching some weird data */
                        SpinDelay(500);
                        Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
                        /* need this delay to prevent catching some weird data */
                        SpinDelay(500);

-                       /* Code for reading from 14a tag */
-                       uint8_t uid[10] = {0};
-                       uint32_t cuid = 0;

                        iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
                        for ( ; ; )
                        iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
                        for ( ; ; )


@@ -419,9 +432,9 @@ void StandAloneMode14a()
                                                Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
                                                break;
                                        }
                                                Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
                                                break;
                                        }

-                                       else if (cardRead[(selected+1)%OPTS]) {
+                                       else if (cardRead[(selected+1) % OPTS]) {

                                                Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
                                                Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);

-                                               selected = (selected+1)%OPTS;
+                                               selected = (selected+1) % OPTS;

                                                break; // playing = 1;
                                        }
                                        else {
                                                break; // playing = 1;
                                        }
                                        else {


@@ -429,39 +442,33 @@ void StandAloneMode14a()
                                                SpinDelay(300);
                                        }
                                }
                                                SpinDelay(300);
                                        }
                                }

-                               if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid, true, 0))
+                               if (!iso14443a_select_card(NULL, &card_info[selected], NULL, true, 0))

                                        continue;
                                else
                                {
                                        continue;
                                else
                                {

-                                       Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
-                                       memcpy(readUID,uid,10*sizeof(uint8_t));
-                                       uint8_t *dst = (uint8_t *)&uid_tmp1;
-                                       // Set UID byte order
-                                       for (int i=0; i<4; i++)
-                                               dst[i] = uid[3-i];
-                                       dst = (uint8_t *)&uid_tmp2;
-                                       for (int i=0; i<4; i++)
-                                               dst[i] = uid[7-i];
-                                       if (uid_1st[(selected+1)%OPTS] == uid_tmp1 && uid_2nd[(selected+1)%OPTS] == uid_tmp2) {
+                                       Dbprintf("Read UID:"); 
+                                       Dbhexdump(card_info[selected].uidlen, card_info[selected].uid, 0);
+                                       
+                                       if (memcmp(uids[(selected+1)%OPTS].uid, card_info[selected].uid, card_info[selected].uidlen ) == 0 ) {

                                                Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
                                        }
                                        else {
                                                Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
                                        }
                                        else {

-                                               if (uid_tmp2) {
-                                                       Dbprintf("Bank[%d] received a 7-byte UID",selected);
-                                                       uid_1st[selected] = (uid_tmp1)>>8;
-                                                       uid_2nd[selected] = (uid_tmp1<<24) + (uid_tmp2>>8);
-                                               }
-                                               else {
-                                                       Dbprintf("Bank[%d] received a 4-byte UID",selected);
-                                                       uid_1st[selected] = uid_tmp1;
-                                                       uid_2nd[selected] = uid_tmp2;
-                                               }
+                                               
+                                               uids[selected].sak = card_info[selected].sak;
+                                               uids[selected].uidlen = card_info[selected].uidlen;                                             
+                                               memcpy(uids[selected].uid , card_info[selected].uid, uids[selected].uidlen);                                            
+                                               memcpy(uids[selected].atqa, card_info[selected].atqa, 2);
+                                                                                               
+                                               if (uids[selected].uidlen > 4)
+                                                       Dbprintf("Bank[%d] received a 7-byte UID", selected);
+                                               else
+                                                       Dbprintf("Bank[%d] received a 4-byte UID", selected);

                                        break;
                                }
                        }
                        }
                                        break;
                                }
                        }
                        }

-                       Dbprintf("ATQA = %02X%02X",hi14a_card[selected].atqa[0],hi14a_card[selected].atqa[1]);
-                       Dbprintf("SAK = %02X",hi14a_card[selected].sak);
+                       Dbprintf("ATQA = %02X%02X", uids[selected].atqa[0], uids[selected].atqa[1]);
+                       Dbprintf("SAK = %02X", uids[selected].sak);

                        LEDsoff();
                        LED(LED_GREEN,  200);
                        LED(LED_ORANGE, 200);
                        LEDsoff();
                        LED(LED_GREEN,  200);
                        LED(LED_ORANGE, 200);


@@ -484,8 +491,11 @@ void StandAloneMode14a()
                        LED(selected + 1, 0);
                        LED(LED_ORANGE, 250);
 
                        LED(selected + 1, 0);
                        LED(LED_ORANGE, 250);
 

+                       // magiccards holds 4bytes uid.
+                       uint64_t tmpuid = bytes_to_num(uids[selected].uid, 4);
+                       

                        // record
                        // record

-                       Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]);
+                       Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, tmpuid & 0xFFFFFFFF);

 
                        // wait for button to be released
                        // Delay cloning until card is in place
 
                        // wait for button to be released
                        // Delay cloning until card is in place


@@ -531,15 +541,12 @@ void StandAloneMode14a()
                                playing = 1;
                        }
                        else {
                                playing = 1;
                        }
                        else {

-                               Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0],oldBlock0[1],oldBlock0[2],oldBlock0[3]);
-                               memcpy(newBlock0,oldBlock0,16);
-                               // Copy uid_1st for bank (2nd is for longer UIDs not supported if classic)
+                               Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
+                               memcpy(newBlock0, oldBlock0, 16);

 
 

-                               newBlock0[0] = uid_1st[selected]>>24;
-                               newBlock0[1] = 0xFF & (uid_1st[selected]>>16);
-                               newBlock0[2] = 0xFF & (uid_1st[selected]>>8);
-                               newBlock0[3] = 0xFF & (uid_1st[selected]);
-                               newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3];
+                               // Copy uid for bank (2nd is for longer UIDs not supported if classic)
+                               memcpy(newBlock0, uids[selected].uid, 4);
+                               newBlock0[4] = newBlock0[0] ^ newBlock0[1] ^ newBlock0[2] ^ newBlock0[3];

 
                                // arg0 = workFlags, arg1 = blockNo, datain
                                MifareCSetBlock(params, 0, newBlock0);
 
                                // arg0 = workFlags, arg1 = blockNo, datain
                                MifareCSetBlock(params, 0, newBlock0);


@@ -574,23 +581,36 @@ void StandAloneMode14a()
                                        WDT_HIT();
                                        int button_action = BUTTON_HELD(1000);
                                        if (button_action == 0) { // No button action, proceed with sim
                                        WDT_HIT();
                                        int button_action = BUTTON_HELD(1000);
                                        if (button_action == 0) { // No button action, proceed with sim

-                                               uint8_t data[512] = {0}; // in case there is a read command received we shouldn't break
-                                               uint8_t flags = ( uid_2nd[selected] > 0x00 ) ? FLAG_7B_UID_IN_DATA : FLAG_4B_UID_IN_DATA;
-                                               num_to_bytes(uid_1st[selected], 3, data);
-                                               num_to_bytes(uid_2nd[selected], 4, data);
+
+                                               uint8_t flags = FLAG_4B_UID_IN_DATA;
+                                               uint8_t data[USB_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
+
+                                               memcpy(data, uids[selected].uid, uids[selected].uidlen);

                                                
                                                

-                                               Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected);
-                                               if (hi14a_card[selected].sak == 8 && hi14a_card[selected].atqa[0] == 4 && hi14a_card[selected].atqa[1] == 0) {
-                                                       DbpString("Mifare Classic");
-                                                       SimulateIso14443aTag(1, flags, data); // Mifare Classic
+                                               uint64_t tmpuid = bytes_to_num(uids[selected].uid, uids[selected].uidlen);
+                                                                       
+                                               if (  uids[selected].uidlen == 7 ) {
+                                                       flags = FLAG_7B_UID_IN_DATA;
+                                                       Dbprintf("Simulating ISO14443a tag with uid: %02x%08x [Bank: %u]", tmpuid >> 32, tmpuid & 0xFFFFFFFF , selected);
+                                               } else {
+                                                       Dbprintf("Simulating ISO14443a tag with uid: %08x [Bank: %u]", tmpuid & 0xFFFFFFFF , selected);

                                                }
                                                }

-                                               else if (hi14a_card[selected].sak == 0 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 0) {
+                                               
+                                               if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Classic 1k");
+                                                       SimulateIso14443aTag(1, flags, data);
+                                               } else if (uids[selected].sak == 0x18 && uids[selected].atqa[0] == 0x02 && uids[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Classic 4k (4b uid)");
+                                                       SimulateIso14443aTag(8, flags, data);
+                                               } else if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Classic 4k (7b uid)");
+                                                       SimulateIso14443aTag(8, flags, data);
+                                               } else if (uids[selected].sak == 0x00 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {

                                                        DbpString("Mifare Ultralight");
                                                        DbpString("Mifare Ultralight");

-                                                       SimulateIso14443aTag(2, flags, data); // Mifare Ultralight
-                                               }
-                                               else if (hi14a_card[selected].sak == 20 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 3) {
+                                                       SimulateIso14443aTag(2, flags, data);
+                                               } else if (uids[selected].sak == 0x20 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0x03) {

                                                        DbpString("Mifare DESFire");
                                                        DbpString("Mifare DESFire");

-                                                       SimulateIso14443aTag(3, flags, data); // Mifare DESFire
+                                                       SimulateIso14443aTag(3, flags, data);

                                                }
                                                else {
                                                        Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
                                                }
                                                else {
                                                        Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");


@@ -985,10 +1005,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_EM4X_READ_WORD:
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_EM4X_READ_WORD:

-                       EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
+                       EM4xReadWord(c->arg[0], c->arg[1], c->arg[2]);

                        break;
                case CMD_EM4X_WRITE_WORD:
                        break;
                case CMD_EM4X_WRITE_WORD:

-                       EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+                       EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);

                        break;
                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
                        break;
                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);


@@ -996,6 +1016,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
         case CMD_VIKING_CLONE_TAG:
                        CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);
             break;
         case CMD_VIKING_CLONE_TAG:
                        CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);
             break;

+               case CMD_COTAG:
+                       Cotag(c->arg[0]);
+                       break;

 #endif
 
 #ifdef WITH_HITAG
 #endif
 
 #ifdef WITH_HITAG


@@ -1029,19 +1052,15 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
                        RecordRawAdcSamplesIso15693();
                        break;
                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_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_FIND_AFI:
                        BruteforceIso15693Afi(c->arg[0]);
                        break;  

-                       

                case CMD_ISO_15693_DEBUG:
                        SetDebugIso15693(c->arg[0]);
                        break;
                case CMD_ISO_15693_DEBUG:
                        SetDebugIso15693(c->arg[0]);
                        break;

-

                case CMD_READER_ISO_15693:
                        ReaderIso15693(c->arg[0]);
                        break;
                case CMD_READER_ISO_15693:
                        ReaderIso15693(c->arg[0]);
                        break;


@@ -1054,17 +1073,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_SIMULATE_TAG_LEGIC_RF:
                        LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
                        break;

-

                case CMD_WRITER_LEGIC_RF:
                case CMD_WRITER_LEGIC_RF:

-                       LegicRfWriter( c->arg[0], c->arg[1], c->arg[2]);
+                       LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

                        break;
                        break;

-
-               case CMD_RAW_WRITER_LEGIC_RF:
-                       LegicRfRawWriter(c->arg[0], c->arg[1], c->arg[2]);
-                       break;
-

                case CMD_READER_LEGIC_RF:
                        LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
                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
 
                        break;
 #endif
 


@@ -1194,7 +1213,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_DESFIRE:
                        MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
                        break;

-

                case CMD_MIFARE_COLLECT_NONCES:
                        break;
 #endif
                case CMD_MIFARE_COLLECT_NONCES:
                        break;
 #endif


@@ -1210,6 +1228,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
             break;
         case CMD_EMV_DUMP_CARD:
             EMVdumpcard();
             break;
         case CMD_EMV_DUMP_CARD:
             EMVdumpcard();

+                       break;

 #endif
 #ifdef WITH_ICLASS
                // Makes use of ISO14443a FPGA Firmware
 #endif
 #ifdef WITH_ICLASS
                // Makes use of ISO14443a FPGA Firmware


@@ -1225,7 +1244,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_READER_ICLASS_REPLAY:
                    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
                        break;
                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:
                        emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
                        break;
                case CMD_ICLASS_WRITEBLOCK:


@@ -1279,19 +1298,36 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        LED_B_ON();
                        uint8_t *BigBuf = BigBuf_get_addr();
                        size_t len = 0;
                        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
                        }
                        // 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: {
                        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);
                        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: {
                        break;
                }
                case CMD_DOWNLOAD_EML_BIGBUF: {