DeforaNetworks/proxmark3
3
0
Fork 0
Code Releases Activity

Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450)

Browse Source 
This reverts commit afdcb8c159.
This commit is contained in:
pwpiwi
2017-10-27 09:56:46 +02:00
committed by GitHub
parent afdcb8c159
commit 3851172d81
19 changed files with 334 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/proxgui.cpp
+4 -10
View File
@@ -11,15 +11,11 @@
#include "proxgui.h"
#include "proxguiqt.h"
#include "proxmark3.h"
#include "uart.h"
static ProxGuiQT *gui = NULL;
static WorkerThread *main_loop_thread = NULL;
WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd,
bool usb_present, serial_port* sp)
: script_cmds_file(script_cmds_file), script_cmd(script_cmd),
usb_present(usb_present), sp(sp)
WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), usb_present(usb_present)
{
}
@@ -28,7 +24,7 @@ WorkerThread::~WorkerThread()
}
void WorkerThread::run() {
main_loop(script_cmds_file, script_cmd, usb_present, sp);
main_loop(script_cmds_file, script_cmd, usb_present);
}
extern "C" void ShowGraphWindow(void)
@@ -63,9 +59,7 @@ extern "C" void MainGraphics(void)
gui->MainLoop();
}
extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file,
char *script_cmd, bool usb_present,
serial_port* sp)
extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present)
{
#ifdef Q_WS_X11
bool useGUI = getenv("DISPLAY") != 0;
@@ -75,7 +69,7 @@ extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file,
if (!useGUI)
return;
main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present, sp);
main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present);
gui = new ProxGuiQT(argc, argv, main_loop_thread);
}