From cd7f89f6bcc954da3ffa5b9b9eca49c32e152e7d Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 9 Jun 2009 08:40:10 +0000 Subject: Add get and set accessors for jtag_speed: - Setter calls the interface driver callback to improve core encapsulation. - Use getter in standard JTAG interface drivers and ZY1000 minidriver. git-svn-id: svn://svn.berlios.de/openocd/trunk@2159 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/tcl.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/jtag/tcl.c') diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 8836b484..ed24498b 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -960,14 +960,11 @@ static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cm LOG_DEBUG("handle jtag speed"); int cur_speed = 0; - cur_speed = jtag_speed = strtoul(args[0], NULL, 0); + cur_speed = strtoul(args[0], NULL, 0); + retval = jtag_set_speed(cur_speed); - /* this command can be called during CONFIG, - * in which case jtag isn't initialized */ - if (jtag) - retval = jtag->speed(cur_speed); } - command_print(cmd_ctx, "jtag_speed: %d", jtag_speed); + command_print(cmd_ctx, "jtag_speed: %d", jtag_get_speed()); return retval; } @@ -994,9 +991,9 @@ static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, jtag_set_speed_khz(0); return retval; } - cur_speed = jtag_speed = speed_div1; + cur_speed = speed_div1; - retval = jtag->speed(cur_speed); + retval = jtag_set_speed(cur_speed); } else hasKHz = true; @@ -1005,7 +1002,7 @@ static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, cur_speed = jtag_get_speed_khz(); if (jtag != NULL) { - retval = jtag->speed_div(jtag_speed, &cur_speed); + retval = jtag->speed_div(jtag_get_speed(), &cur_speed); if (ERROR_OK != retval) return retval; } -- cgit v1.2.3