#include "proxgui.h"
#include "cmdmain.h"
#include "uart.h"
-#include "messages.h"
#include "ui.h"
+#include "sleep.h"
static serial_port sp;
+static UsbCommand txcmd;
+static volatile 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 {
//}
byte_t rx[0x1000000];
+byte_t* prx = rx;
static void *uart_receiver(void *targ) {
struct receiver_arg *arg = (struct receiver_arg*)targ;
while (arg->run) {
rxlen = sizeof(UsbCommand);
- if (uart_receive(sp,rx,&rxlen)) {
- if ((rxlen % sizeof(UsbCommand)) != 0) {
- PrintAndLog("ERROR: received %03zd bytes, which does not seem to be one or more command(s)\n",rxlen );
+ if (uart_receive(sp,prx,&rxlen)) {
+ prx += rxlen;
+ if (((prx-rx) % sizeof(UsbCommand)) != 0) {
continue;
}
- cmd_count = rxlen / sizeof(UsbCommand);
-// printf("received %zd bytes, which represents %zd commands\n",rxlen, cmd_count);
+ cmd_count = (prx-rx) / sizeof(UsbCommand);
+ // printf("received %d bytes, which represents %d commands\n",(prx-rx), cmd_count);
for (size_t i=0; i<cmd_count; i++) {
UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
}
}
+ prx = rx;
+
+ if(txcmd_pending) {
+ if (!uart_send(sp,(byte_t*)&txcmd,sizeof(UsbCommand))) {
+ PrintAndLog("Sending bytes to proxmark failed");
+ }
+ txcmd_pending = false;
+ }
}
pthread_exit(NULL);
return NULL;
}
-
static void *main_loop(void *targ) {
struct main_loop_arg *arg = (struct main_loop_arg*)targ;
struct receiver_arg rarg;
nl = strrchr(script_cmd_buf, '\n');
if (nl) *nl = '\0';
- if ((cmd = (char*) malloc(strlen(script_cmd_buf))) != NULL)
+ if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL)
{
memset(cmd, 0, strlen(script_cmd_buf));
strcpy(cmd, script_cmd_buf);
}
int main(int argc, char* argv[]) {
+ srand(time(0));
if (argc < 2) {
printf("syntax: %s <port>\n\n",argv[0]);
+ printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
return 1;
}
offline = 0;
}
*/
+
sp = uart_open(argv[1]);
if (sp == INVALID_SERIAL_PORT) {
printf("ERROR: invalid serial port\n");
marg.usb_present = 0;
offline = 1;
+ } else if (sp == CLAIMED_SERIAL_PORT) {
+ printf("ERROR: serial port is claimed by another process\n");
+ marg.usb_present = 0;
+ offline = 1;
} else {
marg.usb_present = 1;
offline = 0;