dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Actually track USB uarts, eliminiate unnecessary passing / pointer to _is_usb_uart

This commit is contained in:
Nate Weibley 2015-05-13 15:28:19 -04:00
parent d43b0513ce
commit b55361b472
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/mavlink/mavlink_main.cpp
View File

@ -575,7 +575,7 @@ int Mavlink::get_component_id()
} }
#ifndef __PX4_POSIX #ifndef __PX4_POSIX
int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *uart_config_original, bool *is_usb) int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *uart_config_original)
{ {
/* process baud rate */ /* process baud rate */
int speed; int speed;
@ -640,7 +640,7 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
/* Try to set baud rate */ /* Try to set baud rate */
struct termios uart_config; struct termios uart_config;
int termios_state; int termios_state;
*is_usb = false; _is_usb_uart = false;
/* Back up the original uart configuration to restore it after exit */ /* Back up the original uart configuration to restore it after exit */
if ((termios_state = tcgetattr(_uart_fd, uart_config_original)) < 0) { if ((termios_state = tcgetattr(_uart_fd, uart_config_original)) < 0) {
@ -665,6 +665,8 @@ int Mavlink::mavlink_open_uart(int baud, const char *uart_name, struct termios *
return -1; return -1;
} }
} else {
_is_usb_uart = true;
} }
if ((termios_state = tcsetattr(_uart_fd, TCSANOW, &uart_config)) < 0) { if ((termios_state = tcsetattr(_uart_fd, TCSANOW, &uart_config)) < 0) {
@ -1350,7 +1352,7 @@ Mavlink::task_main(int argc, char *argv[])
struct termios uart_config_original; struct termios uart_config_original;
/* default values for arguments */ /* default values for arguments */
_uart_fd = mavlink_open_uart(_baudrate, _device_name, &uart_config_original, &_is_usb_uart); _uart_fd = mavlink_open_uart(_baudrate, _device_name, &uart_config_original);
if (_uart_fd < 0) { if (_uart_fd < 0) {
warn("could not open %s", _device_name); warn("could not open %s", _device_name);

2
src/modules/mavlink/mavlink_main.h
View File

@ -387,7 +387,7 @@ private:
void mavlink_update_system(); void mavlink_update_system();
#ifndef __PX4_QURT #ifndef __PX4_QURT
int mavlink_open_uart(int baudrate, const char *uart_name, struct termios *uart_config_original, bool *is_usb); int mavlink_open_uart(int baudrate, const char *uart_name, struct termios *uart_config_original);
#endif #endif
static unsigned int interval_from_rate(float rate); static unsigned int interval_from_rate(float rate);