Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openocd_nrf52_patch
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sam Calisch
openocd_nrf52_patch
Commits
37d5ac63
Commit
37d5ac63
authored
14 years ago
by
Tomek CEDRO
Committed by
Øyvind Harboe
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ADAPTER: Fixed transport selection mechanism to support transports other than jtag (if defined).
parent
9f40d41f
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/jtag/adapter.c
+3
-8
3 additions, 8 deletions
src/jtag/adapter.c
with
3 additions
and
8 deletions
src/jtag/adapter.c
+
3
−
8
View file @
37d5ac63
...
@@ -47,8 +47,7 @@
...
@@ -47,8 +47,7 @@
*/
*/
extern
struct
jtag_interface
*
jtag_interface
;
extern
struct
jtag_interface
*
jtag_interface
;
const
char
*
jtag_only
[]
=
{
"jtag"
,
NULL
};
static
int
static
int
jim_adapter_name
(
Jim_Interp
*
interp
,
int
argc
,
Jim_Obj
*
const
*
argv
)
jim_adapter_name
(
Jim_Interp
*
interp
,
int
argc
,
Jim_Obj
*
const
*
argv
)
...
@@ -93,9 +92,6 @@ static int default_srst_asserted(int *srst_asserted)
...
@@ -93,9 +92,6 @@ static int default_srst_asserted(int *srst_asserted)
return
ERROR_OK
;
return
ERROR_OK
;
}
}
const
char
*
jtag_only
[]
=
{
"jtag"
,
NULL
,
};
COMMAND_HANDLER
(
interface_transport_command
)
COMMAND_HANDLER
(
interface_transport_command
)
{
{
char
**
transports
;
char
**
transports
;
...
@@ -169,9 +165,8 @@ COMMAND_HANDLER(handle_interface_command)
...
@@ -169,9 +165,8 @@ COMMAND_HANDLER(handle_interface_command)
LOG_WARNING
(
"Adapter driver '%s' did not declare "
LOG_WARNING
(
"Adapter driver '%s' did not declare "
"which transports it allows; assuming "
"which transports it allows; assuming "
"legacy JTAG-only"
,
jtag_interface
->
name
);
"legacy JTAG-only"
,
jtag_interface
->
name
);
retval
=
allow_transports
(
CMD_CTX
,
retval
=
allow_transports
(
CMD_CTX
,
jtag_interface
->
transports
jtag_interface
->
transports
?
jtag_interface
->
transports
:
jtag_only
);
?
:
jtag_only
);
if
(
ERROR_OK
!=
retval
)
if
(
ERROR_OK
!=
retval
)
return
retval
;
return
retval
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment