X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f2c2b174cdf702045d5fdd59aecf5dac8e8b44f2..11c2df83d230d9896367f21e2a208b297489d2ee:/armsrc/apps.h diff --git a/armsrc/apps.h b/armsrc/apps.h index 928ac4e5..314c9640 100644 --- a/armsrc/apps.h +++ b/armsrc/apps.h @@ -28,7 +28,7 @@ //#include "des.h" //#include "aes.h" #include "desfire.h" - +#include "iso14443b.h" extern const uint8_t OddByteParity[256]; extern int rsamples; // = 0; @@ -101,7 +101,7 @@ void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode /// iso14443.h void SimulateIso14443bTag(void); void AcquireRawAdcSamplesIso14443b(uint32_t parameter); -void ReadSTMemoryIso14443b(uint32_t); +void ReadSTMemoryIso14443b(uint8_t numofblocks); void RAMFUNC SnoopIso14443b(void); void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]); @@ -147,7 +147,6 @@ void MifareCIdent(); // is "magic chinese" card? void MifareUSetPwd(uint8_t arg0, uint8_t *datain); void OnSuccessMagic(); void OnErrorMagic(uint8_t reason); -void MifareCollectNonces(uint32_t arg0, uint32_t arg1); //desfire void Mifare_DES_Auth1(uint8_t arg0,uint8_t *datain);