diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-09 08:41:08 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-09 08:41:08 +0000 |
| commit | a2d18e9111d3bd9a504e15b16a5d8b4bdbded29b (patch) | |
| tree | e07bc873c1b6b410c3a542b0566a4de2f045471d | |
| parent | 55be316dbf13dcb1cc54c41330ac37960e82630e (diff) | |
| download | openocd_libswd-a2d18e9111d3bd9a504e15b16a5d8b4bdbded29b.tar.gz openocd_libswd-a2d18e9111d3bd9a504e15b16a5d8b4bdbded29b.tar.bz2 openocd_libswd-a2d18e9111d3bd9a504e15b16a5d8b4bdbded29b.tar.xz openocd_libswd-a2d18e9111d3bd9a504e15b16a5d8b4bdbded29b.zip | |
Properly encapsulate core hasKHZ variable.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2165 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | src/jtag/core.c | 5 | ||||
| -rw-r--r-- | src/jtag/tcl.c | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c index 165e1966..d838e29b 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -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; } diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 1ec307ab..99ed1a36 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -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(); |