zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jtag: drivers: cmsis-dap: add TRST handling 

Even when TRST and SRST are not present in reset_config we still should
set them appropriately (to 1) as we can't tristate them anyhow.

Change-Id: Iec5bcf09340136f5e6ccfb05fa2697c53fa6609f
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/3798
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
gitignore-build
Paul Fertser 2016-09-29 20:41:29 +03:00 committed by Andreas Fritiofson
parent 5fa3bfa074
commit 67c9a5561e
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/jtag/drivers/cmsis_dap_usb.c
View File

@ -118,6 +118,13 @@ static bool swd_mode;
* Bit 7: nRESET * Bit 7: nRESET
*/ */
#define SWJ_PIN_TCK (1<<0)
#define SWJ_PIN_TMS (1<<1)
#define SWJ_PIN_TDI (1<<2)
#define SWJ_PIN_TDO (1<<3)
#define SWJ_PIN_TRST (1<<5)
#define SWJ_PIN_SRST (1<<7)
/* CMSIS-DAP SWD Commands */ /* CMSIS-DAP SWD Commands */
#define CMD_DAP_SWD_CONFIGURE 0x13 #define CMD_DAP_SWD_CONFIGURE 0x13
@ -764,12 +771,12 @@ static int cmsis_dap_get_status(void)
if (retval == ERROR_OK) { if (retval == ERROR_OK) {
LOG_INFO("SWCLK/TCK = %d SWDIO/TMS = %d TDI = %d TDO = %d nTRST = %d nRESET = %d", LOG_INFO("SWCLK/TCK = %d SWDIO/TMS = %d TDI = %d TDO = %d nTRST = %d nRESET = %d",
(d & (0x01 << 0)) ? 1 : 0, /* Bit 0: SWCLK/TCK */ (d & SWJ_PIN_TCK) ? 1 : 0,
(d & (0x01 << 1)) ? 1 : 0, /* Bit 1: SWDIO/TMS */ (d & SWJ_PIN_TMS) ? 1 : 0,
(d & (0x01 << 2)) ? 1 : 0, /* Bit 2: TDI */ (d & SWJ_PIN_TDI) ? 1 : 0,
(d & (0x01 << 3)) ? 1 : 0, /* Bit 3: TDO */ (d & SWJ_PIN_TDO) ? 1 : 0,
(d & (0x01 << 5)) ? 1 : 0, /* Bit 5: nTRST */ (d & SWJ_PIN_TRST) ? 1 : 0,
(d & (0x01 << 7)) ? 1 : 0); /* Bit 7: nRESET */ (d & SWJ_PIN_SRST) ? 1 : 0);
} }
return retval; return retval;
@ -990,8 +997,17 @@ static int cmsis_dap_quit(void)
static void cmsis_dap_execute_reset(struct jtag_command *cmd) static void cmsis_dap_execute_reset(struct jtag_command *cmd)
{ {
int retval = cmsis_dap_cmd_DAP_SWJ_Pins(cmd->cmd.reset->srst ? 0 : (1 << 7), \ /* Set both TRST and SRST even if they're not enabled as
(1 << 7), 0, NULL); * there's no way to tristate them */
uint8_t pins = 0;
if (!cmd->cmd.reset->srst)
pins |= SWJ_PIN_SRST;
if (!cmd->cmd.reset->trst)
pins |= SWJ_PIN_TRST;
int retval = cmsis_dap_cmd_DAP_SWJ_Pins(pins,
SWJ_PIN_TRST | SWJ_PIN_SRST, 0, NULL);
if (retval != ERROR_OK) if (retval != ERROR_OK)
LOG_ERROR("CMSIS-DAP: Interface reset failed"); LOG_ERROR("CMSIS-DAP: Interface reset failed");
} }