dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed crash, when proxmark was claimed by other process

Browse Source
This commit is contained in:
roel@libnfc.org
2013-03-26 16:01:52 +00:00
parent a79e330de5
commit 4890730a5f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/flasher.c
View File

@@ -72,7 +72,7 @@ void CloseProxmark() {
int OpenProxmark(size_t i) { int OpenProxmark(size_t i) {
sp = uart_open(serial_port_name); sp = uart_open(serial_port_name);
if (sp == INVALID_SERIAL_PORT) { if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {
//poll once a second //poll once a second
return 0; return 0;
} }

5
client/proxmark3.c
View File

@@ -221,11 +221,16 @@ int main(int argc, char* argv[]) {
offline = 0; offline = 0;
} }
*/ */
sp = uart_open(argv[1]); sp = uart_open(argv[1]);
if (sp == INVALID_SERIAL_PORT) { if (sp == INVALID_SERIAL_PORT) {
printf("ERROR: invalid serial port\n"); printf("ERROR: invalid serial port\n");
marg.usb_present = 0; marg.usb_present = 0;
offline = 1; 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 { } else {
marg.usb_present = 1; marg.usb_present = 1;
offline = 0; offline = 0;