X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_interface.c;h=81cac4886d26181b631f8602a970d9e893c429b5;hp=397eeeae3f259778184632f638f4be6762126b1b;hb=1e6970dafdccfec388d1a816c2019f9c6b26e338;hpb=549d9bc72cbca3ba352e6b4bcd6e31d9fd9a0bc7 diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 397eeeae3f..81cac4886d 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -37,12 +37,21 @@ #include -static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, 0}, 0, 0 }; +static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0}, 0, 0 }; int hl_interface_open(enum hl_transports tr) { LOG_DEBUG("hl_interface_open"); + enum reset_types jtag_reset_config = jtag_get_reset_config(); + + if (jtag_reset_config & RESET_CNCT_UNDER_SRST) { + if (jtag_reset_config & RESET_SRST_NO_GATING) + hl_if.param.connect_under_reset = true; + else + LOG_WARNING("\'srst_nogate\' reset_config option is required"); + } + /* set transport mode */ hl_if.param.transport = tr; @@ -63,7 +72,7 @@ int hl_interface_init_target(struct target *t) * can setup the private pointer in the tap structure * if the interface match the tap idcode */ - res = hl_if.layout->api->idcode(hl_if.fd, &t->tap->idcode); + res = hl_if.layout->api->idcode(hl_if.handle, &t->tap->idcode); if (res != ERROR_OK) return res; @@ -75,7 +84,8 @@ int hl_interface_init_target(struct target *t) uint32_t expected = t->tap->expected_ids[ii]; /* treat "-expected-id 0" as a "don't-warn" wildcard */ - if (!expected || (t->tap->idcode == expected)) { + if (!expected || !t->tap->idcode || + (t->tap->idcode == expected)) { found = 1; break; } @@ -105,25 +115,12 @@ static int hl_interface_quit(void) { LOG_DEBUG("hl_interface_quit"); - return ERROR_OK; -} - -static int hl_interface_speed(int speed) -{ - LOG_DEBUG("hl_interface_speed: ignore speed %d", speed); - - return ERROR_OK; -} - -static int hl_speed_div(int speed, int *khz) -{ - *khz = speed; - return ERROR_OK; -} + 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; -static int hl_khz(int khz, int *jtag_speed) -{ - *jtag_speed = khz; return ERROR_OK; } @@ -136,14 +133,13 @@ static int hl_interface_execute_queue(void) int hl_interface_init_reset(void) { - enum reset_types jtag_reset_config = jtag_get_reset_config(); - - if (jtag_reset_config & RESET_CNCT_UNDER_SRST) { - if (jtag_reset_config & RESET_SRST_NO_GATING) { - jtag_add_reset(0, 1); - hl_if.layout->api->assert_srst(hl_if.fd, 0); - } else - LOG_WARNING("\'srst_nogate\' reset_config option is required"); + /* incase the adapter has not already handled asserting srst + * we will attempt it again */ + if (hl_if.param.connect_under_reset) { + jtag_add_reset(0, 1); + hl_if.layout->api->assert_srst(hl_if.handle, 0); + } else { + jtag_add_reset(0, 0); } return ERROR_OK; @@ -218,7 +214,7 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command) return ERROR_OK; } -COMMAND_HANDLER(hl_interface_handle_api_command) +COMMAND_HANDLER(stlink_interface_handle_api_command) { if (CMD_ARGC != 1) return ERROR_COMMAND_SYNTAX_ERROR; @@ -233,30 +229,55 @@ COMMAND_HANDLER(hl_interface_handle_api_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; +} + static const struct command_registration hl_interface_command_handlers[] = { { - .name = "stlink_device_desc", + .name = "hla_device_desc", .handler = &hl_interface_handle_device_desc_command, .mode = COMMAND_CONFIG, .help = "set the a device description of the adapter", .usage = "description_string", }, { - .name = "stlink_serial", + .name = "hla_serial", .handler = &hl_interface_handle_serial_command, .mode = COMMAND_CONFIG, .help = "set the serial number of the adapter", .usage = "serial_string", }, { - .name = "stlink_layout", + .name = "hla_layout", .handler = &hl_interface_handle_layout_command, .mode = COMMAND_CONFIG, .help = "set the layout of the adapter", .usage = "layout_name", }, { - .name = "stlink_vid_pid", + .name = "hla_vid_pid", .handler = &hl_interface_handle_vid_pid_command, .mode = COMMAND_CONFIG, .help = "the vendor and product ID of the adapter", @@ -264,23 +285,27 @@ static const struct command_registration hl_interface_command_handlers[] = { }, { .name = "stlink_api", - .handler = &hl_interface_handle_api_command, + .handler = &stlink_interface_handle_api_command, .mode = COMMAND_CONFIG, .help = "set the desired stlink api level", .usage = "api version 1 or 2", }, + { + .name = "trace", + .handler = &interface_handle_trace_command, + .mode = COMMAND_CONFIG, + .help = "configure trace reception", + .usage = "source_lock_hz [destination_path]", + }, COMMAND_REGISTRATION_DONE }; struct jtag_interface hl_interface = { - .name = "stlink", + .name = "hla", .supported = 0, .commands = hl_interface_command_handlers, .transports = hl_transports, .init = hl_interface_init, .quit = hl_interface_quit, - .speed = hl_interface_speed, - .speed_div = hl_speed_div, - .khz = hl_khz, .execute_queue = hl_interface_execute_queue, };