Merge pull request #12 from k02a/patch-1

[proxmark3-svn] / client / uart.c

diff --git a/client/uart.c b/client/uart.c
index e3a6a57b7b68f16e77fb095ee3a79d2ee64fec5b..e538499bf6ea3a6bf933796a9ce4a58f37dac8dd 100644 (file)
--- a/client/uart.c
+++ b/client/uart.c
@@ -119,7 +119,12 @@ void uart_close(const serial_port sp) {
   fl.l_start  = 0;
   fl.l_len    = 0;
   fl.l_pid    = getpid();
   fl.l_start  = 0;
   fl.l_len    = 0;
   fl.l_pid    = getpid();

-  fcntl(spu->fd, F_SETLK, &fl);
+
+  // Does the system allows us to place a lock on this file descriptor
+  int err = fcntl(spu->fd, F_SETLK, &fl);
+  if ( err == -1) {
+     //perror("fcntl");
+  }  

   close(spu->fd);
   free(sp);
 }
   close(spu->fd);
   free(sp);
 }


@@ -369,7 +374,7 @@ serial_port uart_open(const char* pcPortName) {
   // Prepare the device control
   memset(&sp->dcb, 0, sizeof(DCB));
   sp->dcb.DCBlength = sizeof(DCB);
   // Prepare the device control
   memset(&sp->dcb, 0, sizeof(DCB));
   sp->dcb.DCBlength = sizeof(DCB);

-  if(!BuildCommDCBA("baud=9600 data=8 parity=N stop=1",&sp->dcb)) {
+  if(!BuildCommDCBA("baud=115200 parity=N data=8 stop=1",&sp->dcb)) {

                uart_close(sp);
                return INVALID_SERIAL_PORT;
        }
                uart_close(sp);
                return INVALID_SERIAL_PORT;
        }