CHG: 'lf snoop' - now automatically downloads samples after finished. (annoying...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a2c12803a864d667c66912e54a4110dc59f138a0..905fd3200406d73776c0d4ef2c4f1cf45d91966f 100644 (file)
--- 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 <stdarg.h>
 #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.
 //=============================================================================
@@ -992,6 +1009,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_COTAG:
+                       Cotag();
+                       break;
 #endif
 
 #ifdef WITH_HITAG
@@ -1025,19 +1045,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;
@@ -1274,25 +1290,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 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: {