Revert "dbg: Watchdog resets while 'hw tune lf'"

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 48869fd1049f2914f01c636b5d28280f1cf35f8b..8faed6e86cae50f34849dcd4b53b8337cfb03528 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,27 +9,31 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
 // UI utilities
 //-----------------------------------------------------------------------------
 

-#include <stdarg.h>
+#include <stdbool.h>
+#ifndef EXTERNAL_PRINTANDLOG

 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>

-#include <stdbool.h>
+#include <stdarg.h>

 #include <readline/readline.h>
 #include <pthread.h>
 #include <readline/readline.h>
 #include <pthread.h>

+#endif

 
 #include "ui.h"
 
 double CursorScaleFactor = 1;
 int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
 int offline;
 
 #include "ui.h"
 
 double CursorScaleFactor = 1;
 int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
 int offline;

-bool flushAfterWrite = false;  //buzzy
+int flushAfterWrite = 0;  //buzzy

 int GridOffset = 0;
 bool GridLocked = false;
 bool showDemod = true;
 
 int GridOffset = 0;
 bool GridLocked = false;
 bool showDemod = true;
 

-extern pthread_mutex_t print_lock;
-

 static char *logfilename = "proxmark3.log";
 
 static char *logfilename = "proxmark3.log";
 

+#ifndef EXTERNAL_PRINTANDLOG
+// Declared in proxmark3.c
+extern pthread_mutex_t print_lock;
+

 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;
 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;


@@ -62,6 +66,7 @@ void PrintAndLog(char *fmt, ...)
        }
 #else
        // We are using libedit (OSX), which doesn't support this flag.
        }
 #else
        // We are using libedit (OSX), which doesn't support this flag.

+       int need_hack = 0;

 #endif
        
        va_start(argptr, fmt);
 #endif
        
        va_start(argptr, fmt);


@@ -71,9 +76,6 @@ void PrintAndLog(char *fmt, ...)
        va_end(argptr);
        printf("\n");
 
        va_end(argptr);
        printf("\n");
 

-       // This needs to be wrapped in ifdefs, as this if optimisation is disabled,
-       // this block won't be removed, and it'll fail at the linker.
-#ifdef RL_STATE_READCMD

        if (need_hack) {
                rl_restore_prompt();
                rl_replace_line(saved_line, 0);
        if (need_hack) {
                rl_restore_prompt();
                rl_replace_line(saved_line, 0);


@@ -81,7 +83,6 @@ void PrintAndLog(char *fmt, ...)
                rl_redisplay();
                free(saved_line);
        }
                rl_redisplay();
                free(saved_line);
        }

-#endif

        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);
        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);


@@ -97,14 +98,9 @@ void PrintAndLog(char *fmt, ...)
        //release lock
        pthread_mutex_unlock(&print_lock);  
 }
        //release lock
        pthread_mutex_unlock(&print_lock);  
 }

-
+#endif

 
 void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }
 
 void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }

-
-void SetFlushAfterWrite(bool flush_after_write) {
-       flushAfterWrite = flush_after_write;
-}
-