From 5da60668dcabe5d452ed56eee04671d5438935b7 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 21 Oct 2017 13:07:07 +0200 Subject: [PATCH] chg: Serialnumber is shorter. Will be better for OSX ppl --- client/proxmark3.c | 4 ++-- common/usb_cdc.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/proxmark3.c b/client/proxmark3.c index 4add7f259..ec1030d1d 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -30,7 +30,7 @@ #if defined (_WIN32) #define SERIAL_PORT_H "com3" #elif defined(__APPLE__) -#define SERIAL_PORT_H "/dev/cu.usbmodem888888" +#define SERIAL_PORT_H "/dev/cu.usbmodem888" #else #define SERIAL_PORT_H "/dev/ttyACM0" #endif @@ -109,6 +109,7 @@ static bool hookUpPM3() { static void *uart_receiver(void *targ) { struct receiver_arg *arg = (struct receiver_arg*)targ; size_t rxlen; + bool tmpsignal; int counter_to_offline = 0; while (arg->run) { @@ -124,7 +125,6 @@ static void *uart_receiver(void *targ) { } prx = rx; - bool tmpsignal; __atomic_load(&txcmd_pending, &tmpsignal, __ATOMIC_SEQ_CST); if ( tmpsignal ) { bool res = uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand)); diff --git a/common/usb_cdc.c b/common/usb_cdc.c index 1a099823f..c284c8a4b 100644 --- a/common/usb_cdc.c +++ b/common/usb_cdc.c @@ -376,9 +376,11 @@ static const char StrProduct[] = { }; static const char StrSerialNumber[] = { - 18, // Length + 8, // Length 0x03, // Type is string - '8',0,'8',0,'8',0,'8',0,'8',0,'8',0,'8',0,'8',0 + '8',0, + '8',0, + '8',0 }; // size inkluderar sitt egna fält.