dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Browse Source 
Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c
This commit is contained in:
iceman1001
2015-02-10 21:53:16 +01:00
parent 1e3a799d47 24cbeb3d27
commit 4ecde0e1ff
17 changed files with 1286 additions and 1285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
armsrc/apps.h
View File

@@ -157,8 +157,7 @@ void ReaderIso14443a(UsbCommand * c);
bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *parity);
void iso14a_set_trigger(bool enable);
void iso14a_clear_trace();
void iso14a_set_tracing(bool enable);
void RAMFUNC SniffMifare(uint8_t param);
/// epa.h