FIX: the #define M_PI is now optional. Moved a bunch of header invocations into...

[proxmark3-svn] / client / ui.h

diff --git a/client/ui.h b/client/ui.h
index 6a45fcfdabb65a545478bcf77d5f9a31a41331b0..9603c84251479b2debce3b4bcf24675f18be5419 100644 (file)
--- a/client/ui.h
+++ b/client/ui.h
@@ -10,11 +10,25 @@
 
 #ifndef UI_H__
 #define UI_H__
-
+#define _USE_MATH_DEFINES
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <time.h>
+#include <readline/readline.h>
+#include <pthread.h>
 #include <math.h>
 #include <complex.h>
+#include "loclass/cipherutils.h"
 #include "util.h"
+#include "cmdmain.h"
+#include "cmddata.h"
+#include "graph.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264338327
+#endif
 void ShowGui(void);
 void HideGraphWindow(void);
 void ShowGraphWindow(void);
@@ -27,13 +41,5 @@ extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault;
 extern int offline;
 extern int flushAfterWrite;   //buzzy
 
-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 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 );
-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