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

BareMetal: Add 'GDBSERVER' prefix to GDB-specific provider identifiers

Browse Source 
Change-Id: I511664932e2cc102e30ac6a2087f0f8e6db56bc3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2019-11-27 15:49:55 +03:00
parent 7827eb92ce
commit c0cc33d184
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/baremetal/baremetalconstants.h
View File

@@ -37,10 +37,10 @@ const char MENU_ID[] = "BareMetal.Menu";
const char DEBUG_SERVER_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.DebugServerProvidersOptions"; const char DEBUG_SERVER_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.DebugServerProvidersOptions";
// Debugger Server Provider Ids // Debugger Server Provider Ids
const char OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd"; const char GDBSERVER_OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd";
const char JLINK_PROVIDER_ID[] = "BareMetal.GdbServerProvider.JLink"; const char GDBSERVER_JLINK_PROVIDER_ID[] = "BareMetal.GdbServerProvider.JLink";
const char DEFAULT_PROVIDER_ID[] = "BareMetal.GdbServerProvider.Default"; const char GDBSERVER_DEFAULT_PROVIDER_ID[] = "BareMetal.GdbServerProvider.Default";
const char STLINK_UTIL_PROVIDER_ID[] = "BareMetal.GdbServerProvider.STLinkUtil"; const char GDBSERVER_STLINK_UTIL_PROVIDER_ID[] = "BareMetal.GdbServerProvider.STLinkUtil";
// Toolchain types. // Toolchain types.
const char IAREW_TOOLCHAIN_TYPEID[] = "BareMetal.ToolChain.Iar"; const char IAREW_TOOLCHAIN_TYPEID[] = "BareMetal.ToolChain.Iar";

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

@@ -58,7 +58,7 @@ const char additionalArgumentsKeyC[] = "BareMetal.JLinkGdbServerProvider.Additio
// JLinkGdbServerProvider // JLinkGdbServerProvider
JLinkGdbServerProvider::JLinkGdbServerProvider() JLinkGdbServerProvider::JLinkGdbServerProvider()
: GdbServerProvider(Constants::JLINK_PROVIDER_ID) : GdbServerProvider(Constants::GDBSERVER_JLINK_PROVIDER_ID)
{ {
setInitCommands(defaultInitCommands()); setInitCommands(defaultInitCommands());
setResetCommands(defaultResetCommands()); setResetCommands(defaultResetCommands());
@@ -193,7 +193,7 @@ GdbServerProviderConfigWidget *JLinkGdbServerProvider::configurationWidget()
JLinkGdbServerProviderFactory::JLinkGdbServerProviderFactory() JLinkGdbServerProviderFactory::JLinkGdbServerProviderFactory()
{ {
setId(Constants::JLINK_PROVIDER_ID); setId(Constants::GDBSERVER_JLINK_PROVIDER_ID);
setDisplayName(tr("JLink")); setDisplayName(tr("JLink"));
} }
@@ -205,7 +205,7 @@ GdbServerProvider *JLinkGdbServerProviderFactory::create()
bool JLinkGdbServerProviderFactory::canRestore(const QVariantMap &data) const bool JLinkGdbServerProviderFactory::canRestore(const QVariantMap &data) const
{ {
const QString id = idFromMap(data); const QString id = idFromMap(data);
return id.startsWith(Constants::JLINK_PROVIDER_ID + QLatin1Char(':')); return id.startsWith(Constants::GDBSERVER_JLINK_PROVIDER_ID + QLatin1Char(':'));
} }
GdbServerProvider *JLinkGdbServerProviderFactory::restore(const QVariantMap &data) GdbServerProvider *JLinkGdbServerProviderFactory::restore(const QVariantMap &data)

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

@@ -53,7 +53,7 @@ const char additionalArgumentsKeyC[] = "BareMetal.OpenOcdGdbServerProvider.Addit
// OpenOcdGdbServerProvider // OpenOcdGdbServerProvider
OpenOcdGdbServerProvider::OpenOcdGdbServerProvider() OpenOcdGdbServerProvider::OpenOcdGdbServerProvider()
: GdbServerProvider(Constants::OPENOCD_PROVIDER_ID) : GdbServerProvider(Constants::GDBSERVER_OPENOCD_PROVIDER_ID)
{ {
setInitCommands(defaultInitCommands()); setInitCommands(defaultInitCommands());
setResetCommands(defaultResetCommands()); setResetCommands(defaultResetCommands());
@@ -196,7 +196,7 @@ GdbServerProviderConfigWidget *OpenOcdGdbServerProvider::configurationWidget()
OpenOcdGdbServerProviderFactory::OpenOcdGdbServerProviderFactory() OpenOcdGdbServerProviderFactory::OpenOcdGdbServerProviderFactory()
{ {
setId(Constants::OPENOCD_PROVIDER_ID); setId(Constants::GDBSERVER_OPENOCD_PROVIDER_ID);
setDisplayName(tr("OpenOCD")); setDisplayName(tr("OpenOCD"));
} }
@@ -208,7 +208,7 @@ GdbServerProvider *OpenOcdGdbServerProviderFactory::create()
bool OpenOcdGdbServerProviderFactory::canRestore(const QVariantMap &data) const bool OpenOcdGdbServerProviderFactory::canRestore(const QVariantMap &data) const
{ {
const QString id = idFromMap(data); const QString id = idFromMap(data);
return id.startsWith(Constants::OPENOCD_PROVIDER_ID + QLatin1Char(':')); return id.startsWith(Constants::GDBSERVER_OPENOCD_PROVIDER_ID + QLatin1Char(':'));
} }
GdbServerProvider *OpenOcdGdbServerProviderFactory::restore(const QVariantMap &data) GdbServerProvider *OpenOcdGdbServerProviderFactory::restore(const QVariantMap &data)

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

@@ -54,7 +54,7 @@ const char transportLayerKeyC[] = "BareMetal.StLinkUtilGdbServerProvider.Transpo
// StLinkUtilGdbServerProvider // StLinkUtilGdbServerProvider
StLinkUtilGdbServerProvider::StLinkUtilGdbServerProvider() StLinkUtilGdbServerProvider::StLinkUtilGdbServerProvider()
: GdbServerProvider(Constants::STLINK_UTIL_PROVIDER_ID) : GdbServerProvider(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID)
{ {
setInitCommands(defaultInitCommands()); setInitCommands(defaultInitCommands());
setResetCommands(defaultResetCommands()); setResetCommands(defaultResetCommands());
@@ -193,7 +193,7 @@ GdbServerProviderConfigWidget *StLinkUtilGdbServerProvider::configurationWidget(
StLinkUtilGdbServerProviderFactory::StLinkUtilGdbServerProviderFactory() StLinkUtilGdbServerProviderFactory::StLinkUtilGdbServerProviderFactory()
{ {
setId(Constants::STLINK_UTIL_PROVIDER_ID); setId(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID);
setDisplayName(tr("ST-LINK Utility")); setDisplayName(tr("ST-LINK Utility"));
} }
@@ -205,7 +205,7 @@ GdbServerProvider *StLinkUtilGdbServerProviderFactory::create()
bool StLinkUtilGdbServerProviderFactory::canRestore(const QVariantMap &data) const bool StLinkUtilGdbServerProviderFactory::canRestore(const QVariantMap &data) const
{ {
const QString id = idFromMap(data); const QString id = idFromMap(data);
return id.startsWith(Constants::STLINK_UTIL_PROVIDER_ID + QLatin1Char(':')); return id.startsWith(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID + QLatin1Char(':'));
} }
GdbServerProvider *StLinkUtilGdbServerProviderFactory::restore(const QVariantMap &data) GdbServerProvider *StLinkUtilGdbServerProviderFactory::restore(const QVariantMap &data)