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

move uart_speed to conn struct and display baudrate only for real UART

Browse Source
This commit is contained in:
Philippe Teuwen
2019-04-27 01:15:52 +02:00
parent e9bfc3eb7a
commit 12937884f6
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uart/uart.h
View File

@@ -39,6 +39,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "common.h"
#include "comms.h"
#include "util_posix.h" // msclock
@@ -103,7 +104,6 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed);
/* Gets the current speed of the serial port, in baud.
*/
uint32_t uart_get_speed(const serial_port sp);
extern uint32_t uart_speed;
#endif // _UART_H_

8
uart/uart_posix.c
View File

@@ -60,9 +60,6 @@
# define SOL_TCP IPPROTO_TCP
#endif
// To memorise baudrate, we don't want to call get_speed systematically
uint32_t uart_speed;
typedef struct termios term_info;
typedef struct {
int fd; // Serial port file descriptor
@@ -214,8 +211,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
}
}
}
uart_speed = uart_get_speed(sp);
printf("[=] UART Setting serial baudrate %u\n", uart_speed);
conn.uart_speed = uart_get_speed(sp);
return sp;
}
@@ -422,7 +418,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
cfsetospeed(&ti, stPortSpeed);
bool result = tcsetattr(spu->fd, TCSANOW, &ti) != -1;
if (result)
uart_speed = uiPortSpeed;
conn.uart_speed = uiPortSpeed;
return result;
}

8
uart/uart_win32.c
View File

@@ -42,9 +42,6 @@
#ifdef _WIN32
#include <windows.h>
// To memorise baudrate, we don't want to call get_speed systematically
uint32_t uart_speed;
typedef struct {
HANDLE hPort; // Serial port handle
DCB dcb; // Device control settings
@@ -124,8 +121,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
}
}
}
uart_speed = uart_get_speed(sp);
printf("[=] UART Setting serial baudrate %u\n", uart_speed);
conn.uart_speed = uart_get_speed(sp);
return sp;
}
@@ -157,7 +153,7 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {
bool result = SetCommState(spw->hPort, &spw->dcb);
PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
if (result)
uart_speed = uiPortSpeed;
conn.uart_speed = uiPortSpeed;
return result;
}