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

baremetal: add openocd pipelining support

Browse Source 
Change-Id: Idcfdd42f741319f81cc378687451693facdb955f
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tim Sander
2014-06-05 11:24:30 +02:00
committed by hjk
parent 3012a9b4ee
commit ea11a233fe
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/baremetal/baremetaldeviceconfigurationwizardsetuppage.ui
View File

@@ -30,7 +30,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLineEdit" name="hostNameLineEdit"> <widget class="QLineEdit" name="hostNameLineEdit">
<property name="text"> <property name="text">
<string>localhost</string> <string>|openocd -c &quot;gdb_port pipe&quot; -c &quot;log_output openocd.log;&quot; -f board/stm3241g_eval_stlink.cfg</string>
</property> </property>
</widget> </widget>
</item> </item>

5
src/plugins/baremetal/baremetalruncontrolfactory.cpp
View File

@@ -98,6 +98,9 @@ DebuggerStartParameters BareMetalRunControlFactory::startParameters(const BareMe
params.projectBuildDirectory = buildConfig->buildDirectory().toString(); params.projectBuildDirectory = buildConfig->buildDirectory().toString();
params.projectSourceFiles = project->files(Project::ExcludeGeneratedFiles); params.projectSourceFiles = project->files(Project::ExcludeGeneratedFiles);
} }
if (device->sshParameters().host.startsWith(QLatin1Char('|'))) //gdb pipe mode enabled
params.remoteChannel = device->sshParameters().host;
else
params.remoteChannel = device->sshParameters().host + QLatin1String(":") + QString::number(device->sshParameters().port); params.remoteChannel = device->sshParameters().host + QLatin1String(":") + QString::number(device->sshParameters().port);
params.remoteSetupNeeded = false; // qml stuff, not needed params.remoteSetupNeeded = false; // qml stuff, not needed
params.commandsAfterConnect = device->gdbInitCommands().toLatin1(); params.commandsAfterConnect = device->gdbInitCommands().toLatin1();
@@ -109,7 +112,7 @@ DebuggerStartParameters BareMetalRunControlFactory::startParameters(const BareMe
if (ds) { if (ds) {
if (!params.commandsAfterConnect.endsWith("\n")) if (!params.commandsAfterConnect.endsWith("\n"))
params.commandsAfterConnect.append("\n"); params.commandsAfterConnect.append("\n");
params.commandsAfterConnect.append(ds->gdbCommands().toLocal8Bit()); params.commandsAfterConnect.append(ds->gdbCommands().toLatin1());
} }
} }
} }

3
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View File

@@ -251,7 +251,8 @@ void GdbRemoteServerEngine::callTargetRemote()
// Don't touch channels with explicitly set protocols. // Don't touch channels with explicitly set protocols.
if (!channel.startsWith("tcp:") && !channel.startsWith("udp:") if (!channel.startsWith("tcp:") && !channel.startsWith("udp:")
&& !channel.startsWith("file:") && channel.contains(':')) && !channel.startsWith("file:") && channel.contains(':')
&& !channel.startsWith('|'))
{ {
// "Fix" the IPv6 case with host names without '['...']' // "Fix" the IPv6 case with host names without '['...']'
if (!channel.startsWith('[') && channel.count(':') >= 2) { if (!channel.startsWith('[') && channel.count(':') >= 2) {