From d2bb14e36a03cc187ca090a0da418acccb4098b4 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Thu, 19 Jun 2014 00:47:17 +0200 Subject: swd: Convert API to asynchronous Change-Id: I859568dbb2ad4e92411980751c3f747bd70638b8 Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/1959 Tested-by: jenkins Reviewed-by: Andrey Yurovsky Reviewed-by: Paul Fertser --- src/jtag/drivers/cmsis_dap_usb.c | 31 ++++++++++++++---- src/jtag/swd.h | 70 +++++++++++++++++++--------------------- 2 files changed, 58 insertions(+), 43 deletions(-) (limited to 'src/jtag') diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c index 8c815230..180a91b4 100644 --- a/src/jtag/drivers/cmsis_dap_usb.c +++ b/src/jtag/drivers/cmsis_dap_usb.c @@ -479,8 +479,13 @@ static int cmsis_dap_cmd_DAP_Delay(uint16_t delay_us) } #endif -static int cmsis_dap_swd_read_reg(uint8_t cmd, uint32_t *value) +static int queued_retval; + +static void cmsis_dap_swd_read_reg(struct adiv5_dap *dap, uint8_t cmd, uint32_t *value) { + if (queued_retval != ERROR_OK) + return; + uint8_t *buffer = cmsis_dap_handle->packet_buffer; int retval; uint32_t val; @@ -497,7 +502,8 @@ static int cmsis_dap_swd_read_reg(uint8_t cmd, uint32_t *value) /* TODO - need better response checking */ if (retval != ERROR_OK || buffer[1] != 0x01) { LOG_ERROR("CMSIS-DAP: Read Error (0x%02" PRIx8 ")", buffer[2]); - return buffer[2]; + queued_retval = buffer[2]; + return; } val = le_to_h_u32(&buffer[3]); @@ -506,11 +512,14 @@ static int cmsis_dap_swd_read_reg(uint8_t cmd, uint32_t *value) if (value) *value = val; - return retval; + queued_retval = retval; } -static int cmsis_dap_swd_write_reg(uint8_t cmd, uint32_t value) +static void cmsis_dap_swd_write_reg(struct adiv5_dap *dap, uint8_t cmd, uint32_t value) { + if (queued_retval != ERROR_OK) + return; + uint8_t *buffer = cmsis_dap_handle->packet_buffer; DEBUG_IO("CMSIS-DAP: Write Reg 0x%02" PRIx8 " 0x%08" PRIx32, cmd, value); @@ -531,6 +540,13 @@ static int cmsis_dap_swd_write_reg(uint8_t cmd, uint32_t value) retval = buffer[2]; } + queued_retval = retval; +} + +static int cmsis_dap_swd_run(struct adiv5_dap *dap) +{ + int retval = queued_retval; + queued_retval = ERROR_OK; return retval; } @@ -994,9 +1010,10 @@ static const struct command_registration cmsis_dap_command_handlers[] = { }; static const struct swd_driver cmsis_dap_swd_driver = { - .init = cmsis_dap_swd_init, - .read_reg = cmsis_dap_swd_read_reg, - .write_reg = cmsis_dap_swd_write_reg, + .init = cmsis_dap_swd_init, + .read_reg = cmsis_dap_swd_read_reg, + .write_reg = cmsis_dap_swd_write_reg, + .run = cmsis_dap_swd_run, }; const char *cmsis_dap_transport[] = {"cmsis-dap", NULL}; diff --git a/src/jtag/swd.h b/src/jtag/swd.h index b75a83e3..5d00ab35 100644 --- a/src/jtag/swd.h +++ b/src/jtag/swd.h @@ -20,6 +20,8 @@ #ifndef SWD_H #define SWD_H +#include + /* Bits in SWD command packets, written from host to target * first bit on the wire is START */ @@ -53,51 +55,47 @@ static inline uint8_t swd_cmd(bool is_read, bool is_ap, uint8_t regnum) /* SWD_ACK_* bits are defined in */ -/* - * FOR NOW ... SWD driver ops are synchronous and return ACK - * status ... no queuing. - * - * Individual ops are request/response, and fast-fail permits much - * better fault handling. Upper layers may queue if desired. - */ - struct swd_driver { /** - * Initialize the debug link so it can perform - * synchronous SWD operations. + * Initialize the debug link so it can perform SWD operations. * @param trn value from WCR: how many clocks * to not drive the SWDIO line at certain points in * the SWD protocol (at least 1 clock). * * As an example, this would switch a dual-mode debug adapter * into SWD mode and out of JTAG mode. - * - * @return ERROR_OK on success, else a negative fault code. + * + * @return ERROR_OK on success, else a negative fault code. */ int (*init)(uint8_t trn); - /** - * Synchronous read of an AP or DP register. - * - * @param cmd with APnDP/RnW/addr/parity bits - * @param where to store value to read from register - * - * @return SWD_ACK_* code for the transaction - * or (negative) fault code - */ - int (*read_reg)(uint8_t cmd, uint32_t *value); - - /** - * Synchronous write of an AP or DP register. - * - * @param cmd with APnDP/RnW/addr/parity bits - * @param value to be written to the register - * - * @return SWD_ACK_* code for the transaction - * or (negative) fault code - */ - int (*write_reg)(uint8_t cmd, uint32_t value); + /** + * Queued read of an AP or DP register. + * + * @param dap The DAP controlled by the SWD link. + * @param Command byte with APnDP/RnW/addr/parity bits + * @param Where to store value to read from register + */ + void (*read_reg)(struct adiv5_dap *dap, uint8_t cmd, uint32_t *value); + + /** + * Queued write of an AP or DP register. + * + * @param dap The DAP controlled by the SWD link. + * @param Command byte with APnDP/RnW/addr/parity bits + * @param Value to be written to the register + */ + void (*write_reg)(struct adiv5_dap *dap, uint8_t cmd, uint32_t value); + + /** + * Execute any queued transactions and collect the result. + * + * @param dap The DAP controlled by the SWD link. + * @return ERROR_OK on success, Ack response code on WAIT/FAULT + * or negative error code on other kinds of failure. + */ + int (*run)(struct adiv5_dap *dap); /** * Configures data collection from the Single-wire @@ -108,10 +106,10 @@ struct swd_driver { * is normally connected to a microcontroller's UART TX, * but which may instead be connected to SWO for use in * collecting ITM (and possibly ETM) trace data. - * - * @return ERROR_OK on success, else a negative fault code. + * + * @return ERROR_OK on success, else a negative fault code. */ - int *(*trace)(bool swo); + int *(*trace)(struct adiv5_dap *dap, bool swo); }; int swd_init_reset(struct command_context *cmd_ctx); -- cgit v1.2.3-18-g5258