imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libjaylink: Update to latest master branch 

The changes since the last update are mainly related to the build
system, preparations and cleanups for the upcoming release.

If there are no bugs reported, this will be the last update before the
libjaylink 0.1.0 release.

Change-Id: I4cec9bb61159f6153690aaf39c1d12ba0baacf9b
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3886
Tested-by: jenkins
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
This commit is contained in:
Marc Schink 2016-11-16 14:21:52 +01:00 committed by Paul Fertser
parent 2e0e11b766
commit a2942c95c8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jtag/drivers/jlink.c
View File

@ -674,7 +674,7 @@ static int jlink_init(void)
}
}
jtag_command_version = JAYLINK_JTAG_V2;
jtag_command_version = JAYLINK_JTAG_VERSION_2;
if (jaylink_has_cap(caps, JAYLINK_DEV_CAP_GET_HW_VERSION)) {
ret = jaylink_get_hardware_version(devh, &hwver);
@ -690,7 +690,7 @@ static int jlink_init(void)
LOG_INFO("Hardware version: %u.%02u", hwver.major, hwver.minor);
if (hwver.major >= 5)
jtag_command_version = JAYLINK_JTAG_V3;
jtag_command_version = JAYLINK_JTAG_VERSION_3;
}
if (iface == JAYLINK_TIF_SWD) {
@ -1008,10 +1008,10 @@ COMMAND_HANDLER(jlink_handle_jlink_jtag_command)
if (!CMD_ARGC) {
switch (jtag_command_version) {
case JAYLINK_JTAG_V2:
case JAYLINK_JTAG_VERSION_2:
version = 2;
break;
case JAYLINK_JTAG_V3:
case JAYLINK_JTAG_VERSION_3:
version = 3;
break;
default:
@ -1027,10 +1027,10 @@ COMMAND_HANDLER(jlink_handle_jlink_jtag_command)
switch (tmp) {
case 2:
jtag_command_version = JAYLINK_JTAG_V2;
jtag_command_version = JAYLINK_JTAG_VERSION_2;
break;
case 3:
jtag_command_version = JAYLINK_JTAG_V3;
jtag_command_version = JAYLINK_JTAG_VERSION_3;
break;
default:
command_print(CMD_CTX, "Invalid argument: %s.", CMD_ARGV[0]);

2
src/jtag/drivers/libjaylink

@ -1 +1 @@
Subproject commit 58a409dcbc83b63417d5dc2b4c3cb0bd3e0e53fd
Subproject commit dfa9bc8e91b0c3a89df3ceaf78c93780fd0a186e