Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / ui.h

diff --git a/client/ui.h b/client/ui.h
index f599ef3c559c3b1466d06cd8152c34cfd0802545..6a45fcfdabb65a545478bcf77d5f9a31a41331b0 100644 (file)
--- a/client/ui.h
+++ b/client/ui.h
@@ -11,6 +11,8 @@
 #ifndef UI_H__
 #define UI_H__
 
 #ifndef UI_H__
 #define UI_H__
 

+#include <math.h>
+#include <complex.h>

 #include "util.h"
 
 void ShowGui(void);
 #include "util.h"
 
 void ShowGui(void);


@@ -25,11 +27,13 @@ extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault;
 extern int offline;
 extern int flushAfterWrite;   //buzzy
 
 extern int offline;
 extern int flushAfterWrite;   //buzzy
 

-int manchester_decode(const int * data, const size_t len, uint8_t * dataout);
+int manchester_decode( int * data, const size_t len, uint8_t * dataout,  size_t dataoutlen);

 int GetT55x7Clock( const int * data, const size_t len, int high );
 int GetT55x7Clock( const int * data, const size_t len, int high );

-int DetectFirstTransition(const int * data, const size_t len, int high, int low);
+int DetectFirstTransition(const int * data, const size_t len, int low);

 void PrintPaddedManchester( uint8_t * bitStream, size_t len, size_t blocksize);
 void ManchesterDiffDecodedString( const uint8_t *bitStream, size_t len, uint8_t invert );
 void PrintPaddedManchester( uint8_t * bitStream, size_t len, size_t blocksize);
 void ManchesterDiffDecodedString( const uint8_t *bitStream, size_t len, uint8_t invert );

-int ManchesterConvertFrom255(const int * data, const size_t len, uint8_t * dataout, int high, int low, int clock, int startIndex);
-int ManchesterConvertFrom1(const int * data, const size_t len, uint8_t * dataout, int clock, int startIndex);
+int ManchesterConvertFrom255(const int * data, const size_t len, uint8_t * dataout,int dataoutlen, int high, int low, int clock, int startIndex);
+int ManchesterConvertFrom1(const int * data, const size_t len, uint8_t * dataout, int dataoutlen, int clock, int startIndex);
+void iceFsk2(int * data, const size_t len);
+void iceFsk3(int * data, const size_t len);

 #endif
 #endif