Comms refactor (prerequisite of libproxmark work) (#371)

* Refactor the comms code only from PR#346, without comms_globals.h.
* OSX: Add note for example serial port
This commit is contained in:
Michael Farrell 2017-10-27 06:54:27 +11:00 committed by pwpiwi
parent e17660d5f7
commit afdcb8c159
19 changed files with 540 additions and 334 deletions

View file

@ -21,7 +21,7 @@
double CursorScaleFactor = 1;
int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
int offline;
int flushAfterWrite = 0; //buzzy
bool flushAfterWrite = false; //buzzy
int GridOffset = 0;
bool GridLocked = false;
bool showDemod = true;
@ -62,7 +62,6 @@ void PrintAndLog(char *fmt, ...)
}
#else
// We are using libedit (OSX), which doesn't support this flag.
int need_hack = 0;
#endif
va_start(argptr, fmt);
@ -72,6 +71,9 @@ void PrintAndLog(char *fmt, ...)
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);
@ -79,6 +81,7 @@ void PrintAndLog(char *fmt, ...)
rl_redisplay();
free(saved_line);
}
#endif
if (logging && logfile) {
vfprintf(logfile, fmt, argptr2);
@ -100,3 +103,8 @@ void SetLogFilename(char *fn)
{
logfilename = fn;
}
void SetFlushAfterWrite(bool flush_after_write) {
flushAfterWrite = flush_after_write;
}