feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BareMetal: Allow stlink_version to stay unspecified

Browse Source 
Fixes: QTCREATORBUG-26928
Change-Id: Ia6dedb62c1e41472e176d8d247c7967fe5a430ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-01-26 10:19:53 +01:00
parent ca5d52dcd6
commit 748cc38c26
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
View File

@@ -96,7 +96,8 @@ CommandLine StLinkUtilGdbServerProvider::command() const
if (!m_resetBoard) if (!m_resetBoard)
cmd.addArg("--no-reset"); cmd.addArg("--no-reset");
cmd.addArg("--stlink_version=" + QString::number(m_transport)); if (m_transport != UnspecifiedTransport)
cmd.addArg("--stlink_version=" + QString::number(m_transport));
cmd.addArg("--listen_port=" + QString::number(channel().port())); cmd.addArg("--listen_port=" + QString::number(channel().port()));
cmd.addArg("--verbose=" + QString::number(m_verboseLevel)); cmd.addArg("--verbose=" + QString::number(m_verboseLevel));
@@ -301,6 +302,9 @@ void StLinkUtilGdbServerProviderConfigWidget::populateTransportLayers()
m_transportLayerComboBox->insertItem( m_transportLayerComboBox->insertItem(
m_transportLayerComboBox->count(), tr("ST-LINK/V2"), m_transportLayerComboBox->count(), tr("ST-LINK/V2"),
StLinkUtilGdbServerProvider::RawUsb); StLinkUtilGdbServerProvider::RawUsb);
m_transportLayerComboBox->insertItem(
m_transportLayerComboBox->count(), tr("Keep unspecified"),
StLinkUtilGdbServerProvider::UnspecifiedTransport);
} }
void StLinkUtilGdbServerProviderConfigWidget::setFromProvider() void StLinkUtilGdbServerProviderConfigWidget::setFromProvider()

2
src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
View File

@@ -42,7 +42,7 @@ namespace Internal {
class StLinkUtilGdbServerProvider final : public GdbServerProvider class StLinkUtilGdbServerProvider final : public GdbServerProvider
{ {
public: public:
enum TransportLayer { ScsiOverUsb = 1, RawUsb = 2 }; enum TransportLayer { ScsiOverUsb = 1, RawUsb = 2, UnspecifiedTransport };
QVariantMap toMap() const final; QVariantMap toMap() const final;
bool fromMap(const QVariantMap &data) final; bool fromMap(const QVariantMap &data) final;