]> git.gag.com Git - fw/openocd/commitdiff
jtag: cmsis-dap: use macro SWJ_PIN_SRST in place of magic value
authorAntonio Borneo <borneo.antonio@gmail.com>
Fri, 11 Jan 2019 10:23:40 +0000 (11:23 +0100)
committerMatthias Welwarsky <matthias@welwarsky.de>
Wed, 23 Jan 2019 15:27:13 +0000 (15:27 +0000)
While connecting under reset, use the already defined macro
SWJ_PIN_SRST to assert the srst pin.

Change-Id: Icebed462c0fe8f8c15f6522dc56625aa580b8858
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4846
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
src/jtag/drivers/cmsis_dap_usb.c

index 9d6bf7fc04b491bc6efbf1dc9f0391580bf6a2fb..bd8d0bec7cd5215e1ceacdf3f954606bc71c3a16 100644 (file)
@@ -1096,7 +1096,7 @@ static int cmsis_dap_init(void)
 
        if (jtag_reset_config & RESET_CNCT_UNDER_SRST) {
                if (jtag_reset_config & RESET_SRST_NO_GATING) {
-                       retval = cmsis_dap_cmd_DAP_SWJ_Pins(0, (1 << 7), 0, NULL);
+                       retval = cmsis_dap_cmd_DAP_SWJ_Pins(0, SWJ_PIN_SRST, 0, NULL);
                        if (retval != ERROR_OK)
                                return ERROR_FAIL;
                        LOG_INFO("Connecting under reset");