X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4469412e88d37b988729fed47c6bc21d98cc6e88..1c07ca92c3b9338697a0f2fc0e41790164815aeb:/common/lfdemod.h diff --git a/common/lfdemod.h b/common/lfdemod.h index f4ed9107..7bd3ce40 100644 --- a/common/lfdemod.h +++ b/common/lfdemod.h @@ -13,10 +13,11 @@ #ifndef LFDEMOD_H__ #define LFDEMOD_H__ -#include +#include // for uint_32+ +#include // for bool //generic -uint8_t justNoise(uint8_t *BitStream, size_t size); +uint8_t justNoise(uint8_t *bits, size_t size); size_t addParity(uint8_t *BitSource, uint8_t *dest, uint8_t sourceLen, uint8_t pLen, uint8_t pType); int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType); int BiphaseRawDecode(uint8_t * BitStream, size_t *size, int offset, int invert); @@ -29,6 +30,7 @@ uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t f int DetectNRZClock(uint8_t dest[], size_t size, int clock); int DetectPSKClock(uint8_t dest[], size_t size, int clock); int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low); +bool DetectST(uint8_t buffer[], size_t *size, int *foundclock); int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow); int getHiLo(uint8_t *BitStream, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo); uint32_t manchesterEncode2Bytes(uint16_t datain); @@ -44,7 +46,7 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t //tag specific int AWIDdemodFSK(uint8_t *dest, size_t *size); -uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo); +int Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo); int FDXBdemodBI(uint8_t *dest, size_t *size); int gProxII_Demod(uint8_t BitStream[], size_t *size); int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo); @@ -54,5 +56,9 @@ int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, ui int PyramiddemodFSK(uint8_t *dest, size_t *size); int VikingDemod_AM(uint8_t *dest, size_t *size); int PrescoDemod(uint8_t *dest, size_t *size); - +int NedapDemod(uint8_t *dest, size_t *size); +int JablotronDemod(uint8_t *dest, size_t *size); +int Visa2kDemod_AM(uint8_t *dest, size_t *size); +int NoralsyDemod_AM(uint8_t *dest, size_t *size); +int IdteckDemodPSK(uint8_t *dest, size_t *size); #endif