target: fix display halt message logic

If a target is run from gdb and then stopped from OpenOCD telnet interface,
halt does not show message with status and PC registers.

While on it rename 'display' to 'verbose_halt_msg' and use bool type
instead of int.

Change-Id: Ibe6589015b302e0be97258b06938c297745436a5
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4475
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>

diff --git a/src/openocd.c b/src/openocd.c
index 1874530cb2fc4d053052835e19febf591c1599e2..d5d7ebe8768211c97a81caa6320520cf73c65ee6 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -87,13 +87,13 @@ static int log_target_callback_event_handler(struct target *target,
 {
        switch (event) {
                case TARGET_EVENT_GDB_START:
 {
        switch (event) {
                case TARGET_EVENT_GDB_START:

-                       target->display = 0;
+                       target->verbose_halt_msg = false;

                        break;
                case TARGET_EVENT_GDB_END:
                        break;
                case TARGET_EVENT_GDB_END:

-                       target->display = 1;
+                       target->verbose_halt_msg = true;

                        break;
                case TARGET_EVENT_HALTED:
                        break;
                case TARGET_EVENT_HALTED:

-                       if (target->display) {
+                       if (target->verbose_halt_msg) {

                                /* do not display information when debugger caused the halt */
                                target_arch_state(target);
                        }
                                /* do not display information when debugger caused the halt */
                                target_arch_state(target);
                        }

diff --git a/src/target/target.c b/src/target/target.c
index 4552034ec2f1d0430c159b485e8bb5a16c30cb00..10426023a47c3c5ef1580051e5d9dc0e1bc706d5 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2959,6 +2959,9 @@ COMMAND_HANDLER(handle_halt_command)
        LOG_DEBUG("-");
 
        struct target *target = get_current_target(CMD_CTX);
        LOG_DEBUG("-");
 
        struct target *target = get_current_target(CMD_CTX);

+
+       target->verbose_halt_msg = true;
+

        int retval = target_halt(target);
        if (ERROR_OK != retval)
                return retval;
        int retval = target_halt(target);
        if (ERROR_OK != retval)
                return retval;


@@ -5579,7 +5582,7 @@ static int target_create(Jim_GetOptInfo *goi)
        target->next                = NULL;
        target->arch_info           = NULL;
 
        target->next                = NULL;
        target->arch_info           = NULL;
 

-       target->display             = 1;
+       target->verbose_halt_msg        = true;

 
        target->halt_issued                     = false;
 
 
        target->halt_issued                     = false;
 

diff --git a/src/target/target.h b/src/target/target.h
index 0ce4a137add309953fe169283bbb6edeb4048dd2..7a8a80f30438eaff7cffd81d68b16e3c384fe15c 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -176,7 +176,7 @@ struct target {
        void *private_config;                           /* pointer to target specific config data (for jim_configure hook) */
        struct target *next;                            /* next target in list */
 
        void *private_config;                           /* pointer to target specific config data (for jim_configure hook) */
        struct target *next;                            /* next target in list */
 

-       int display;                                            /* display async info in telnet session. Do not display
+       bool verbose_halt_msg;                          /* display async info in telnet session. Do not display

                                                                                 * lots of halted/resumed info when stepping in debugger. */
        bool halt_issued;                                       /* did we transition to halted state? */
        int64_t halt_issued_time;                       /* Note time when halt was issued */
                                                                                 * lots of halted/resumed info when stepping in debugger. */
        bool halt_issued;                                       /* did we transition to halted state? */
        int64_t halt_issued_time;                       /* Note time when halt was issued */