X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/810f53792ea438c1b70eaa1f934db1e5c96220cb..ab6d8a4c479af53c4d5d8649a5ea2658bbad2d7c:/armsrc/apps.h diff --git a/armsrc/apps.h b/armsrc/apps.h index 1d23caa4..eed9f63a 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 @@ -23,12 +22,13 @@ #include "fpgaloader.h" #include "usb_cdc.h" #include "hitag2.h" +#include "hitagS.h" #include "mifare.h" #include "pcf7931.h" //#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[]); @@ -206,6 +206,13 @@ void SnoopHitag(uint32_t type); void SimulateHitagTag(bool tag_mem_supplied, byte_t* data); void ReaderHitag(hitag_function htf, hitag_data* htd); +//hitagS.h +void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data); +void ReadHitagS(hitag_function htf, hitag_data* htd); +void WritePageHitagS(hitag_function htf, hitag_data* htd,int page); +void check_challenges(bool file_given, byte_t* data); + + // cmd.h bool cmd_receive(UsbCommand* cmd); bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len);