projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect memset parameters in lf t55xx wipe
[proxmark3-svn]
/
client
/
proxmark3.c
diff --git
a/client/proxmark3.c
b/client/proxmark3.c
index 059cc345ef8f670bee72bbe650236672c7d3816c..2f370308f9cb4bcb3a1d09bcd89fe414161efe6f 100644
(file)
--- a/
client/proxmark3.c
+++ b/
client/proxmark3.c
@@
-24,7
+24,7
@@
#include "ui.h"
#include "sleep.h"
#include "cmdparser.h"
#include "ui.h"
#include "sleep.h"
#include "cmdparser.h"
-#include "cmd
main
.h"
+#include "cmd
hw
.h"
// a global mutex to prevent interlaced printing from different threads
pthread_mutex_t print_lock;
// a global mutex to prevent interlaced printing from different threads
pthread_mutex_t print_lock;
@@
-105,6
+105,8
@@
static void *main_loop(void *targ) {
if (arg->usb_present == 1) {
rarg.run = 1;
pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
if (arg->usb_present == 1) {
rarg.run = 1;
pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
+ // cache Version information now:
+ CmdVersion(NULL);
}
FILE *script_file = NULL;
}
FILE *script_file = NULL;
@@
-144,12
+146,9
@@
static void *main_loop(void *targ) {
}
if (!script_file) {
}
if (!script_file) {
- PrintAndLog("FOO!!");
cmd = readline(PROXPROMPT);
cmd = readline(PROXPROMPT);
- PrintAndLog("BAR!!");
}
}
- PrintAndLog("SNAFU!!");
if (cmd) {
while(cmd[strlen(cmd) - 1] == ' ')
if (cmd) {
while(cmd[strlen(cmd) - 1] == ' ')
Impressum
,
Datenschutz