- Fixed regression introduced in 890 when "fixing warnings" for target_call_timer_callbacks_now().

target_call_timer_callbacks_now() did the same as target_call_timer_callbacks().

- Reduced keep_alive()'s job to only deal with GDB keep  alive problems.

git-svn-id: svn://svn.berlios.de/openocd/trunk@985 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 3 insertions, 1 deletions

diff --git a/src/target/target.c b/src/target/target.c
index 695f827a..aef58d3e 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -812,6 +812,8 @@ static int target_call_timer_callbacks_check_time(int checktime)
 	target_timer_callback_t *next_callback;
 	struct timeval now;
 
+	keep_alive();
+
 	gettimeofday(&now, NULL);
 
 	while (callback)
@@ -856,7 +858,7 @@ int target_call_timer_callbacks(void)
 /* invoke periodic callbacks immediately */
 int target_call_timer_callbacks_now(void)
 {
-	return target_call_timer_callbacks();
+	return target_call_timer_callbacks_check_time(0);
 }
 
 int target_alloc_working_area(struct target_s *target, u32 size, working_area_t **area)