Commit a2d18e91 authored by zwelch's avatar zwelch
Browse files

Properly encapsulate core hasKHZ variable.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2165 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 55be316d
......@@ -100,13 +100,13 @@ static jtag_event_callback_t *jtag_event_callbacks;
/* speed in kHz*/
static int speed_khz = 0;
/* flag if the kHz speed was defined */
bool hasKHz = false;
static bool hasKHz = false;
static int jtag_speed = 0;
struct jtag_interface_s *jtag = NULL;
/* configuration */
jtag_interface_t *jtag_interface = NULL;
static int jtag_speed = 0;
void jtag_set_error(int error)
{
......@@ -1188,6 +1188,7 @@ int jtag_set_speed(int speed)
jtag_speed = speed;
/* this command can be called during CONFIG,
* in which case jtag isn't initialized */
hasKHz = !jtag;
return jtag ? jtag->speed(speed) : ERROR_OK;
}
......
......@@ -39,8 +39,6 @@
#include <strings.h>
#endif
extern bool hasKHz;
extern const Jim_Nvp nvp_jtag_tap_event[];
/* jtag interfaces (parport, FTDI-USB, TI-USB, ...)
......@@ -994,11 +992,8 @@ static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd,
return retval;
}
cur_speed = speed_div1;
retval = jtag_set_speed(cur_speed);
}
else
hasKHz = true;
retval = jtag_set_speed(cur_speed);
}
cur_speed = jtag_get_speed_khz();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment