projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fix and added line to changelog.
[proxmark3-svn]
/
client
/
flash.c
diff --git
a/client/flash.c
b/client/flash.c
index 4e222ece2c213a3c898f8ecfb60890256dc3e63a..7622e8a5b56553939ed805504ff28d8ecc4090a6 100644
(file)
--- a/
client/flash.c
+++ b/
client/flash.c
@@
-11,8
+11,11
@@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <inttypes.h>
+#include <unistd.h>
#include "proxmark3.h"
#include "proxmark3.h"
-#include "sleep.h"
+#include "util.h"
+#include "util_posix.h"
#include "flash.h"
#include "elf.h"
#include "proxendian.h"
#include "flash.h"
#include "elf.h"
#include "proxendian.h"
@@
-295,7
+298,7
@@
static int get_proxmark_state(uint32_t *state)
*state = resp.arg[0];
break;
default:
*state = resp.arg[0];
break;
default:
- fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04"
llx
"\n", resp.cmd);
+ fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04"
PRIx64
"\n", resp.cmd);
return -1;
break;
}
return -1;
break;
}
@@
-357,7
+360,7
@@
static int wait_for_ack(void)
UsbCommand ack;
ReceiveCommand(&ack);
if (ack.cmd != CMD_ACK) {
UsbCommand ack;
ReceiveCommand(&ack);
if (ack.cmd != CMD_ACK) {
- printf("Error: Unexpected reply 0x%04"
llx
" (expected ACK)\n", ack.cmd);
+ printf("Error: Unexpected reply 0x%04"
PRIx64
" (expected ACK)\n", ack.cmd);
return -1;
}
return 0;
return -1;
}
return 0;
Impressum
,
Datenschutz