diff options
| author | Marc Schink <openocd-dev@marcschink.de> | 2016-11-16 14:21:52 +0100 |
|---|---|---|
| committer | Paul Fertser <fercerpav@gmail.com> | 2016-12-08 13:33:01 +0000 |
| commit | a2942c95c818f98a0f8605449a17b0a794ef9a50 (patch) | |
| tree | 0d4c44006c423d62163ce61b7d16441212aaf0c6 | |
| parent | 2e0e11b76645d6b38bc4986d8000e4e47e391596 (diff) | |
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>
| -rw-r--r-- | src/jtag/drivers/jlink.c | 12 | ||||
| m--------- | src/jtag/drivers/libjaylink | 0 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index e5bfd322..65ff81aa 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -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]); diff --git a/src/jtag/drivers/libjaylink b/src/jtag/drivers/libjaylink -Subproject 58a409dcbc83b63417d5dc2b4c3cb0bd3e0e53f +Subproject dfa9bc8e91b0c3a89df3ceaf78c93780fd0a186 |