Merge pull request #9 from doegox/addhelpm

[proxmark3-svn] / armsrc / iclass.c

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index ced29424f28498f7c4b44ac1b8daa2be11282999..e876132e74fa68d103de8d76dace64194a5d7d65 100644 (file)
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -691,7 +691,7 @@ void RAMFUNC SnoopIClass(void)
     
     // reset traceLen to 0
     iso14a_set_tracing(TRUE);
-    iso14a_clear_tracelen();
+    iso14a_clear_trace();
     iso14a_set_trigger(FALSE);
 
     // The DMA buffer, used to stream samples from the FPGA
@@ -1168,9 +1168,9 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
                }
                
                if (tracing) {
-                       LogTrace(receivedCmd,len, 0, Uart.parityBits, TRUE);
+                       LogTrace(receivedCmd,len, rsamples, Uart.parityBits, TRUE);
                        if (respdata != NULL) {
-                               LogTrace(respdata,respsize, 0, SwapBits(GetParity(respdata,respsize),respsize), FALSE);
+                               LogTrace(respdata,respsize, rsamples, SwapBits(GetParity(respdata,respsize),respsize), FALSE);
                        }
                        if(traceLen > TRACE_SIZE) {
                                DbpString("Trace full");
@@ -1349,7 +1349,7 @@ void ReaderTransmitIClass(uint8_t* frame, int len)
        LED_A_ON();
 
   // Store reader command in buffer
-  if (tracing) LogTrace(frame,len,0,par,TRUE);
+  if (tracing) LogTrace(frame,len,rsamples,par,TRUE);
 }
 
 //-----------------------------------------------------------------------------
@@ -1407,7 +1407,8 @@ int ReaderReceiveIClass(uint8_t* receivedAnswer)
 {
   int samples = 0;
   if (!GetIClassAnswer(receivedAnswer,160,&samples,0)) return FALSE;
-  if (tracing) LogTrace(receivedAnswer,Demod.len,samples,Demod.parityBits,FALSE);
+  rsamples += samples;
+  if (tracing) LogTrace(receivedAnswer,Demod.len,rsamples,Demod.parityBits,FALSE);
   if(samples == 0) return FALSE;
   return Demod.len;
 }