ham-ref/flrig
1
0
Fork 0
mirror of https://git.code.sf.net/p/fldigi/flrig synced 2026-08-13 17:28:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

BigSur serial ports

Browse source 
* Modify port discovery for Big Sur naming convention
This commit is contained in:
David Freese 2020-12-20 09:42:25 -06:00
parent 290c27e622
commit ea2e4e8f11
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/support/dialogs.cxx
View file

@ -292,25 +292,25 @@ out:
void init_port_combos() void init_port_combos()
{ {
clear_combos(); std::string pname;
struct stat st;
const char* tty_fmt[] = { const char* tty_fmt[] = {
"/dev/cu.*", "/dev/cu.*",
"/dev/tty.*" "/dev/tty.*"
}; };
struct stat st;
glob_t gbuf; glob_t gbuf;
bool is_serial;
clear_combos();
for (size_t i = 0; i < sizeof(tty_fmt)/sizeof(*tty_fmt); i++) { for (size_t i = 0; i < sizeof(tty_fmt)/sizeof(*tty_fmt); i++) {
glob(tty_fmt[i], 0, NULL, &gbuf); glob(tty_fmt[i], 0, NULL, &gbuf);
for (size_t j = 0; j < gbuf.gl_pathc; j++) { for (size_t j = 0; j < gbuf.gl_pathc; j++) {
if ( !(stat(gbuf.gl_pathv[j], &st) == 0 && S_ISCHR(st.st_mode)) || pname = gbuf.gl_pathv[j];
strstr(gbuf.gl_pathv[j], "modem") ) is_serial = (stat(gbuf.gl_pathv[j], &st) == 0 && S_ISCHR(st.st_mode));
continue; if ( is_serial || pname.find("modem") != std::string::npos ) {
LOG_WARN("Found serial port %s", gbuf.gl_pathv[j]); LOG_WARN ("Found serial port %s", gbuf.gl_pathv[j]);
add_combos(gbuf.gl_pathv[j]); add_combos (gbuf.gl_pathv[j]);
}
} }
globfree(&gbuf); globfree(&gbuf);
} }