From 7784b89e33c17f78b8e93bc651756a75673af334 Mon Sep 17 00:00:00 2001
From: John-Michael Baier <j.baier@mit-xperts.com>
Date: Wed, 9 Dec 2020 22:32:13 +0100
Subject: [PATCH] lock the device, fix baudrate setting

---
 src/tools/ebuspicloader.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/tools/ebuspicloader.cpp b/src/tools/ebuspicloader.cpp
index 2cb573b8..1d1ef6ac 100644
--- a/src/tools/ebuspicloader.cpp
+++ b/src/tools/ebuspicloader.cpp
@@ -568,23 +568,28 @@ int openSerial(std::string port) {
     return -1;
   }
 
-  // backup terminal settings
-  if (tcgetattr(fd, &termios_original)!=0) {
-    memset(&termios_original, 0, sizeof(termios_original));
+  if (flock(fd, LOCK_EX|LOCK_NB)) {
+    close(fd);
+    std::cerr<<"unable to lock "<<port<<std::endl;
+    return -1;
   }
 
+  // backup terminal settings
+  tcgetattr(fd, &termios_original);
+
   // configure terminal settings
-  struct termios termios = termios_original;
+  struct termios termios;
+  memset(&termios, 0, sizeof(termios));
 
   if (cfsetspeed(&termios, BAUDRATE)!=0) {
     std::cerr<<"unable to set speed "<<std::endl;
     close(fd);
     return -1;
   }
-  termios.c_iflag = 0;//IGNPAR;//IGNBRK|IGNPAR|IGNCR;
-  termios.c_oflag = 0;
-  termios.c_cflag = CS8 | CREAD | CLOCAL;
-  termios.c_lflag = 0;
+  termios.c_iflag |= 0;//IGNPAR;//IGNBRK|IGNPAR|IGNCR;
+  termios.c_oflag |= 0;
+  termios.c_cflag |= CS8 | CREAD | CLOCAL;
+  termios.c_lflag |= 0;
   termios.c_cc[VMIN] = 1;
   termios.c_cc[VTIME] = 0;
   if (tcsetattr(fd, TCSANOW, &termios)!=0) {