Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Optimized USB port version check function

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-05-09 14:20:52 +08:00
parent 4a9e250930
commit 94df65e1d7
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DSView/pv/mainwindow.cpp
View File

@ -1456,13 +1456,24 @@ namespace pv
g_variant_unref(gvar); g_variant_unref(gvar);
} }
bool usb30_support = false;
gvar = _device_agent->get_config(NULL, NULL, SR_CONF_USB30_SUPPORT); gvar = _device_agent->get_config(NULL, NULL, SR_CONF_USB30_SUPPORT);
if (gvar != NULL) if (gvar != NULL)
{ {
usb30_support = g_variant_get_boolean(gvar); bool usb30_support = g_variant_get_boolean(gvar);
g_variant_unref(gvar); g_variant_unref(gvar);
dsv_info("The device's USB module version: %d.0", usb30_support ? 3 : 2);
int cable_ver = 1;
if (usb_speed == LIBUSB_SPEED_HIGH)
cable_ver = 2;
else if (usb_speed == LIBUSB_SPEED_SUPER)
cable_ver = 3;
else if (usb_speed == LIBUSB_SPEED_SUPER_PLUS)
cable_ver = 4;
dsv_info("The cable's USB port version: %d.0", cable_ver);
if (usb30_support && usb_speed == LIBUSB_SPEED_HIGH) if (usb30_support && usb_speed == LIBUSB_SPEED_HIGH)
show_error(L_S(STR_PAGE_DLG, S_ID(IDS_DLG_CHECK_USB_SPEED_ERROR), show_error(L_S(STR_PAGE_DLG, S_ID(IDS_DLG_CHECK_USB_SPEED_ERROR),
"Plug it into a USB 2.0 port will seriously affect its performance.\nPlease replug it into a USB 3.0 port.")); "Plug it into a USB 2.0 port will seriously affect its performance.\nPlease replug it into a USB 3.0 port."));
@ -1508,7 +1519,6 @@ namespace pv
dsv_info("The data save confirm end, auto switch to the new device."); dsv_info("The data save confirm end, auto switch to the new device.");
_is_auto_switch_device = false; _is_auto_switch_device = false;
_session->set_default_device(); _session->set_default_device();
check_usb_device_speed();
} }
} }
@ -1767,6 +1777,10 @@ namespace pv
} }
} }
calc_min_height(); calc_min_height();
if (_device_agent->is_hardware() && _device_agent->is_new_device()){
check_usb_device_speed();
}
break; break;
case DSV_MSG_DEVICE_OPTIONS_UPDATED: case DSV_MSG_DEVICE_OPTIONS_UPDATED:
@ -1846,7 +1860,6 @@ namespace pv
else else
{ {
_session->set_default_device(); _session->set_default_device();
check_usb_device_speed();
} }
} }
break; break;
@ -1872,8 +1885,6 @@ namespace pv
{ {
_is_auto_switch_device = false; _is_auto_switch_device = false;
_session->set_default_device(); _session->set_default_device();
if (_session->get_device()->is_new_device())
check_usb_device_speed();
} }
else else
{ {