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

chg: revert logic

Browse Source
This commit is contained in:
iceman1001
2019-05-16 07:44:52 +02:00
parent c125b3e9fe
commit b206ecfad3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
uart/uart_posix.c
View File

@@ -74,11 +74,11 @@ struct timeval timeout = {
};
uint32_t newtimeout_value = 0;
bool newtimeout_nopending = true;
bool newtimeout_pending = false;
int uart_reconfigure_timeouts(uint32_t value) {
newtimeout_value = value;
__atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
__atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);
return PM3_SUCCESS;
}
@@ -302,7 +302,9 @@ int uart_send(const serial_port sp, const uint8_t *pbtTx, const uint32_t len) {
uint32_t pos = 0;
fd_set rfds;
struct timeval tv;
if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) == 0)
bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
if ( shall_update )
timeout.tv_usec = newtimeout_value * 1000;
while (pos < len) {

7
uart/uart_win32.c
View File

@@ -49,16 +49,17 @@ typedef struct {
} serial_port_windows;
uint32_t newtimeout_value = 0;
bool newtimeout_nopending = true;
bool newtimeout_pending = true;
int uart_reconfigure_timeouts(uint32_t value) {
newtimeout_value = value;
__atomic_clear(&newtimeout_nopending, __ATOMIC_SEQ_CST);
__atomic_test_and_set(&newtimeout_pending, __ATOMIC_SEQ_CST);
return PM3_SUCCESS;
}
static int uart_reconfigure_timeouts_polling(serial_port sp) {
if (__atomic_test_and_set(&newtimeout_nopending, __ATOMIC_SEQ_CST) != 0)
bool shall_update = __atomic_load_n(&newtimeout_pending, __ATOMIC_SEQ_CST);
if ( shall_update == false )
return PM3_SUCCESS;
serial_port_windows *spw;