Merge branch 'master' into GenericTracing 58/head
authorMartin Holst Swende <martin@swende.se>
Tue, 10 Feb 2015 20:25:14 +0000 (21:25 +0100)
committerMartin Holst Swende <martin@swende.se>
Tue, 10 Feb 2015 20:25:14 +0000 (21:25 +0100)
Conflicts:
armsrc/iso14443a.c

1  2 
armsrc/appmain.c
armsrc/apps.h
armsrc/iso14443a.c

Simple merge
diff --cc armsrc/apps.h
Simple merge
index 05ffb941735a300d68c92ea8d80ca249f2b245e1,103f25e691cfa6106cfabe7ffd47ced9e29720d9..a7102168e09d75522e1e35ac02526136a464a57d
@@@ -2197,9 -2266,10 +2199,10 @@@ void Mifare1ksim(uint8_t flags, uint8_
  
        // free eventually allocated BigBuf memory but keep Emulator Memory
        BigBuf_free_keep_EM();
        // clear trace
 -    iso14a_clear_trace();
 -      iso14a_set_tracing(TRUE);
 +      clear_trace();
 +      set_tracing(TRUE);
  
        // Authenticate response - nonce
        uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
                        }
                }
        }
 -      if (MF_DBGLEVEL >= 1)   Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",    tracing, traceLen);
 +      if (MF_DBGLEVEL >= 1)   Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",    tracing, BigBuf_get_traceLen());
+       
  }
  
  
Impressum, Datenschutz