#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "sleep.h"
+#include <inttypes.h>
#include "proxmark3.h"
+#include "util.h"
+#include "util_posix.h"
#include "flash.h"
#include "uart.h"
#include "usb_cmd.h"
#ifdef _WIN32
# define unlink(x)
+#else
+# include <unistd.h>
#endif
static serial_port sp;
void cmd_debug(UsbCommand* UC) {
// Debug
printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
- printf(" cmd[len=%zd]: %016"llx"\n",sizeof(UC->cmd),UC->cmd);
- printf(" arg0[len=%zd]: %016"llx"\n",sizeof(UC->arg[0]),UC->arg[0]);
- printf(" arg1[len=%zd]: %016"llx"\n",sizeof(UC->arg[1]),UC->arg[1]);
- printf(" arg2[len=%zd]: %016"llx"\n",sizeof(UC->arg[2]),UC->arg[2]);
+ printf(" cmd[len=%zd]: %016" PRIx64 "\n",sizeof(UC->cmd),UC->cmd);
+ printf(" arg0[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[0]),UC->arg[0]);
+ printf(" arg1[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[1]),UC->arg[1]);
+ printf(" arg2[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[2]),UC->arg[2]);
printf(" data[len=%zd]: ",sizeof(UC->d.asBytes));
for (size_t i=0; i<16; i++) {
printf("%02x",UC->d.asBytes[i]);
byte_t* prx = prxcmd;
size_t rxlen;
while (true) {
- rxlen = sizeof(UsbCommand) - (prx-prxcmd);
- if (uart_receive(sp,prx,&rxlen)) {
+ if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-prxcmd), &rxlen)) {
prx += rxlen;
if ((prx-prxcmd) >= sizeof(UsbCommand)) {
return;
fprintf(stderr,"Waiting for Proxmark to appear on %s",serial_port_name);
do {
- sleep(1);
+ msleep(1000);
fprintf(stderr, ".");
} while (!OpenProxmark(0));
fprintf(stderr," Found.\n");