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

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 09479620a0afaefb1dd99b8cffe70204994fe38d..8faed6e86cae50f34849dcd4b53b8337cfb03528 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,36 +9,52 @@
 // 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 <time.h>
+#include <stdarg.h>

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

+#include <pthread.h>
+#endif

 
 #include "ui.h"
 
 
 #include "ui.h"
 

-double CursorScaleFactor;
-int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64;
+double CursorScaleFactor = 1;
+int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;

 int offline;
 int offline;

+int flushAfterWrite = 0;  //buzzy
+int GridOffset = 0;
+bool GridLocked = false;
+bool showDemod = true;

 
 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;
        int saved_point;
 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;
        int saved_point;

-  va_list argptr, argptr2;
-  static FILE *logfile = NULL;
-  static int logging=1;
+       va_list argptr, argptr2;
+       static FILE *logfile = NULL;
+       static int logging=1;

 
 

-  if (logging && !logfile) {
-    logfile=fopen(logfilename, "a");
-    if (!logfile) {
-      fprintf(stderr, "Can't open logfile, logging disabled!\n");
-      logging=0;
-    }
-  }
-       
+       // lock this section to avoid interlacing prints from different threads
+       pthread_mutex_lock(&print_lock);
+  
+       if (logging && !logfile) {
+               logfile=fopen(logfilename, "a");
+               if (!logfile) {
+                       fprintf(stderr, "Can't open logfile, logging disabled!\n");
+                       logging=0;
+               }
+       }
+
+#ifdef RL_STATE_READCMD
+       // We are using GNU readline.

        int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
        if (need_hack) {
        int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
        if (need_hack) {


@@ -48,13 +64,17 @@ void PrintAndLog(char *fmt, ...)
                rl_replace_line("", 0);
                rl_redisplay();
        }
                rl_replace_line("", 0);
                rl_redisplay();
        }

+#else
+       // We are using libedit (OSX), which doesn't support this flag.
+       int need_hack = 0;
+#endif

        
        

-  va_start(argptr, fmt);
-  va_copy(argptr2, argptr);
-  vprintf(fmt, argptr);
-  printf("          "); // cleaning prompt
-  va_end(argptr);
-  printf("\n");
+       va_start(argptr, fmt);
+       va_copy(argptr2, argptr);
+       vprintf(fmt, argptr);
+       printf("          "); // cleaning prompt
+       va_end(argptr);
+       printf("\n");

 
        if (need_hack) {
                rl_restore_prompt();
 
        if (need_hack) {
                rl_restore_prompt();


@@ -64,13 +84,21 @@ void PrintAndLog(char *fmt, ...)
                free(saved_line);
        }
        
                free(saved_line);
        }
        

-  if (logging && logfile) {
-    vfprintf(logfile, fmt, argptr2);
-    fprintf(logfile,"\n");
-    fflush(logfile);
-  }
-  va_end(argptr2);
+       if (logging && logfile) {
+               vfprintf(logfile, fmt, argptr2);
+               fprintf(logfile,"\n");
+               fflush(logfile);
+       }
+       va_end(argptr2);
+
+       if (flushAfterWrite == 1)  //buzzy
+       {
+               fflush(NULL);
+       }
+       //release lock
+       pthread_mutex_unlock(&print_lock);  

 }
 }

+#endif

 
 void SetLogFilename(char *fn)
 {
 
 void SetLogFilename(char *fn)
 {