From f0ba6342218d4eb264668655e3c24ad74d99c0f4 Mon Sep 17 00:00:00 2001 From: "roel@libnfc.org" Date: Fri, 7 Dec 2012 12:22:05 +0000 Subject: [PATCH] receiving/sending moved to one thread --- client/proxmark3.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/client/proxmark3.c b/client/proxmark3.c index e9d64c88..38a97716 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -25,14 +25,21 @@ #include "ui.h" static serial_port sp; +static UsbCommand txcmd; +static bool txcmd_pending = false; void SendCommand(UsbCommand *c) { #if 0 printf("Sending %d bytes\n", sizeof(UsbCommand)); #endif - if (!uart_send(sp,(byte_t*)c,sizeof(UsbCommand))) { - ERR("Sending bytes to proxmark failed"); +/* + if (txcmd_pending) { + ERR("Sending command failed, previous command is still pending"); } +*/ + while(txcmd_pending); + txcmd = *c; + txcmd_pending = true; } struct receiver_arg { @@ -79,6 +86,13 @@ static void *uart_receiver(void *targ) { UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand)))); } } + + if(txcmd_pending) { + if (!uart_send(sp,(byte_t*)&txcmd,sizeof(UsbCommand))) { + PrintAndLog("Sending bytes to proxmark failed"); + } + txcmd_pending = false; + } } pthread_exit(NULL); -- 2.39.5