X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0db11b71efad3781186cc2da9f31686a6562d065..2813c42f98c0b40251c4a6c0289720c9a60db485:/armsrc/apps.h diff --git a/armsrc/apps.h b/armsrc/apps.h index a556a6e7..314c9640 100644 --- a/armsrc/apps.h +++ b/armsrc/apps.h @@ -8,7 +8,6 @@ //----------------------------------------------------------------------------- // Definitions internal to the app source. //----------------------------------------------------------------------------- - #ifndef __APPS_H #define __APPS_H @@ -29,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; @@ -102,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[]); @@ -148,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);