adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

dap: implement DAP SWD sequence command

Browse source 
DAP SWD sequence command is a requirement to support CMSIS-DAPv2.
Raise supported version to "2.1.0".

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2023-08-31 18:01:51 +02:00 committed by Alberto Escolar
parent e31cdc00a0
commit 9a9afb0b54
2 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
subsys/dap/cmsis_dap.c
View file

@ -638,6 +638,52 @@ static uint16_t dap_transfer(struct dap_context *const ctx,
return retval; return retval;
} }
static uint16_t dap_swdp_sequence(struct dap_context *const ctx,
const uint8_t *const request,
uint8_t *const response)
{
const struct swdp_api *api = ctx->swdp_dev->api;
const uint8_t *request_data = request + 1;
uint8_t *response_data = response + 1;
uint8_t count = request[0];
uint8_t num_cycles;
uint32_t num_bytes;
bool input;
switch (ctx->debug_port) {
case DAP_PORT_SWD:
response[0] = DAP_OK;
break;
case DAP_PORT_JTAG:
default:
LOG_ERR("port unsupported");
response[0] = DAP_ERROR;
return 1U;
}
for (size_t i = 0; i < count; ++i) {
input = *request_data & BIT(7);
num_cycles = *request_data & BIT_MASK(7);
num_bytes = (num_cycles + 7) >> 3; /* rounded up to full bytes */
if (num_cycles == 0) {
num_cycles = 64;
}
request_data += 1;
if (input) {
api->swdp_input_sequence(ctx->swdp_dev, num_cycles, response_data);
response_data += num_bytes;
} else {
api->swdp_output_sequence(ctx->swdp_dev, num_cycles, request_data);
request_data += num_bytes;
}
}
return response_data - response;
}
/* /*
* Process SWD DAP_TransferBlock command and prepare response. * Process SWD DAP_TransferBlock command and prepare response.
* pyOCD counterpart is _encode_transfer_block_data. * pyOCD counterpart is _encode_transfer_block_data.
@ -865,6 +911,9 @@ static uint16_t dap_process_cmd(struct dap_context *const ctx,
case ID_DAP_SWDP_CONFIGURE: case ID_DAP_SWDP_CONFIGURE:
retval = dap_swdp_configure(ctx, request, response); retval = dap_swdp_configure(ctx, request, response);
break; break;
case ID_DAP_SWDP_SEQUENCE:
retval = dap_swdp_sequence(ctx, request, response);
break;
case ID_DAP_JTAG_SEQUENCE: case ID_DAP_JTAG_SEQUENCE:
LOG_ERR("JTAG sequence unsupported"); LOG_ERR("JTAG sequence unsupported");
retval = 1; retval = 1;

3
subsys/dap/cmsis_dap.h
View file

@ -22,7 +22,7 @@
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
/* Firmware Version */ /* Firmware Version */
#define DAP_FW_VER "1.10" #define DAP_FW_VER "2.1.0"
/* DAP Command IDs */ /* DAP Command IDs */
#define ID_DAP_INFO 0x00U #define ID_DAP_INFO 0x00U
@ -42,6 +42,7 @@
#define ID_DAP_SWJ_SEQUENCE 0x12U #define ID_DAP_SWJ_SEQUENCE 0x12U
#define ID_DAP_SWDP_CONFIGURE 0x13U #define ID_DAP_SWDP_CONFIGURE 0x13U
#define ID_DAP_SWDP_SEQUENCE 0x1DU
#define ID_DAP_JTAG_SEQUENCE 0x14U #define ID_DAP_JTAG_SEQUENCE 0x14U
#define ID_DAP_JTAG_CONFIGURE 0x15U #define ID_DAP_JTAG_CONFIGURE 0x15U