Minor fixes to iso14443a annotations

[proxmark3-svn] / common / lfdemod.h

diff --git a/common/lfdemod.h b/common/lfdemod.h
index 5e4e0fc7d4ca54be7e54adcd1d9d6dce3ca22de7..a2eb2c7828d6c4a01c9b33701d1f6291b162b86e 100644 (file)
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -1,28 +1,42 @@
-// Copyright (C) 2014 
+// Copyright (C) 2014

 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------

-// Low frequency commands
+// Low frequency demod related commands
+// marshmellow
+// note that many of these demods are not the slickest code and they often rely
+//   on peaks and clock instead of converting to clean signal. 
+//   

 //-----------------------------------------------------------------------------
 
 #ifndef LFDEMOD_H__
 #define LFDEMOD_H__
 #include <stdint.h>
 
 //-----------------------------------------------------------------------------
 
 #ifndef LFDEMOD_H__
 #define LFDEMOD_H__
 #include <stdint.h>
 

-int DetectClock2(uint8_t dest[], size_t size, int clock);
-int askmandemod(uint8_t *BinStream,uint32_t *BitLen,int *clk, int *invert);
-uint64_t Em410xDecode(uint8_t BitStream[],uint32_t BitLen);
-int manrawdemod(uint8_t *BitStream, int *bitLen);
-int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert);
-int HIDdemodFSK(uint8_t *dest, size_t size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);
+int DetectASKClock(uint8_t dest[], size_t size, int clock);
+int askmandemod(uint8_t *BinStream, size_t *size, int *clk, int *invert);
+uint64_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx);
+int ManchesterEncode(uint8_t *BitStream, size_t size);
+int manrawdecode(uint8_t *BitStream, size_t *size);
+int BiphaseRawDecode(uint8_t * BitStream, size_t *size, int offset, int invert);
+int askrawdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert);
+int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);

 int IOdemodFSK(uint8_t *dest, size_t size);
 int IOdemodFSK(uint8_t *dest, size_t size);

-int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert);
-uint32_t bytebits_to_byte(uint8_t* src, int numbits);
-
-//
-#define MAX_BitStream_LEN (1024*128)
-//extern int BitStreamLen;
+int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow);
+uint32_t bytebits_to_byte(uint8_t* src, size_t numbits);
+int pskNRZrawDemod(uint8_t *dest, size_t *size, int *clk, int *invert);
+void psk1TOpsk2(uint8_t *BitStream, size_t size);
+int DetectpskNRZClock(uint8_t dest[], size_t size, int clock);
+int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
+void pskCleanWave(uint8_t *bitStream, size_t size);
+int PyramiddemodFSK(uint8_t *dest, size_t size);
+int AWIDdemodFSK(uint8_t *dest, size_t size);
+size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen);
+uint16_t countFC(uint8_t *BitStream, size_t size);
+uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fcLow);
+int getHiLo(uint8_t *BitStream, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
+size_t ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);

 
 #endif
 
 #endif