diff options
Diffstat (limited to 'src/jtag/hla/hla_interface.c')
| -rw-r--r-- | src/jtag/hla/hla_interface.c | 64 |
1 files changed, 25 insertions, 39 deletions
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 85f083ce..a208e9fd 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -37,7 +37,7 @@ #include <target/target.h> -static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0, -1}, 0, 0 }; +static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, -1}, 0, 0 }; int hl_interface_open(enum hl_transports tr) { @@ -118,12 +118,6 @@ static int hl_interface_quit(void) { LOG_DEBUG("hl_interface_quit"); - if (hl_if.param.trace_f) { - fclose(hl_if.param.trace_f); - hl_if.param.trace_f = NULL; - } - hl_if.param.trace_source_hz = 0; - if (hl_if.layout->api->close) hl_if.layout->api->close(hl_if.handle); @@ -194,6 +188,28 @@ int hl_interface_override_target(const char **targetname) return ERROR_FAIL; } +int hl_interface_config_trace(bool enabled, enum tpio_pin_protocol pin_protocol, + uint32_t port_size, unsigned int *trace_freq) +{ + if (hl_if.layout->api->config_trace) + return hl_if.layout->api->config_trace(hl_if.handle, enabled, pin_protocol, + port_size, trace_freq); + else if (enabled) { + LOG_ERROR("The selected interface does not support tracing"); + return ERROR_FAIL; + } + + return ERROR_OK; +} + +int hl_interface_poll_trace(uint8_t *buf, size_t *size) +{ + if (hl_if.layout->api->poll_trace) + return hl_if.layout->api->poll_trace(hl_if.handle, buf, size); + + return ERROR_FAIL; +} + COMMAND_HANDLER(hl_interface_handle_device_desc_command) { LOG_DEBUG("hl_interface_handle_device_desc_command"); @@ -263,31 +279,6 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command) return ERROR_OK; } -COMMAND_HANDLER(interface_handle_trace_command) -{ - FILE *f = NULL; - unsigned source_hz; - - if ((CMD_ARGC < 1) || (CMD_ARGC > 2)) - return ERROR_COMMAND_SYNTAX_ERROR; - - COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], source_hz); - if (source_hz == 0) { - return ERROR_COMMAND_SYNTAX_ERROR; - } - - if (CMD_ARGC == 2) { - f = fopen(CMD_ARGV[1], "a"); - if (!f) - return ERROR_COMMAND_SYNTAX_ERROR; - } - - hl_if.param.trace_f = f; - hl_if.param.trace_source_hz = source_hz; - - return ERROR_OK; -} - COMMAND_HANDLER(interface_handle_hla_command) { if (CMD_ARGC != 1) @@ -333,13 +324,6 @@ static const struct command_registration hl_interface_command_handlers[] = { .usage = "(vid pid)* ", }, { - .name = "trace", - .handler = &interface_handle_trace_command, - .mode = COMMAND_CONFIG, - .help = "configure trace reception", - .usage = "source_lock_hz [destination_path]", - }, - { .name = "hla_command", .handler = &interface_handle_hla_command, .mode = COMMAND_EXEC, @@ -360,4 +344,6 @@ struct jtag_interface hl_interface = { .speed = &hl_interface_speed, .khz = &hl_interface_khz, .speed_div = &hl_interface_speed_div, + .config_trace = &hl_interface_config_trace, + .poll_trace = &hl_interface_poll_trace, }; |