target: remove legacy target events

These events have been deprecated for a number of years, update any
remaining scripts to the new events.

Change-Id: Ic31ff388545ac8b3a500045699ca92c541b13f12
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/634
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Tested-by: jenkins
Reviewed-by: Bill Traynor <wmat@alphatroop.com>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index b3556609f9c6d16071b5f8057f03a2c0850a9bc5..8d0ce620ce76e819880d41fc3f8d965277f4c219 100644 (file)
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -4255,12 +4255,6 @@ depending on whether the breakpoint is in RAM or read only memory.
 @* Before the target steps, gdb is trying to start/resume the target
 @item @b{halted}
 @* The target has halted
-@ignore
-@item @b{old-gdb_program_config}
-@* DO NOT USE THIS: Used internally
-@item @b{old-pre_resume}
-@* DO NOT USE THIS: Used internally
-@end ignore
 @item @b{reset-assert-pre}
 @* Issued as part of @command{reset} processing
 after @command{reset_init} was triggered

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 755c1e748ce82810fd6f338a0a00a155f0dc705e..1c0ee08fd80dca34876041f83d7c501dece66449 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -735,7 +735,6 @@ static int gdb_target_callback_event_handler(struct target *target,
                        target_call_event_callbacks(target, TARGET_EVENT_GDB_END);
                        break;
                case TARGET_EVENT_GDB_FLASH_ERASE_START:
-                       target_handle_event(target, TARGET_EVENT_OLD_gdb_program_config);
                        retval = jtag_execute_queue();
                        if (retval != ERROR_OK)
                                return retval;
@@ -1367,7 +1366,6 @@ static int gdb_step_continue_packet(struct connection *connection,
 
        if (packet[0] == 'c') {
                LOG_DEBUG("continue");
-               target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
                retval = target_resume(target, current, address, 0, 0); /* resume at current
                                                                         *address, don't handle
                                                                         *breakpoints, not debugging

diff --git a/src/target/target.c b/src/target/target.c
index 450a8bd0ec774d1c1b518015c3e4cf7dd49a4333..ddaa39ef66f702016012a1fdc6be5a6d50e3342d 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -156,8 +156,6 @@ static const char *target_strerror_safe(int err)
 }
 
 static const Jim_Nvp nvp_target_event[] = {
-       { .value = TARGET_EVENT_OLD_gdb_program_config , .name = "old-gdb_program_config" },
-       { .value = TARGET_EVENT_OLD_pre_resume         , .name = "old-pre_resume" },
 
        { .value = TARGET_EVENT_GDB_HALT, .name = "gdb-halt" },
        { .value = TARGET_EVENT_HALTED, .name = "halted" },
@@ -168,10 +166,7 @@ static const Jim_Nvp nvp_target_event[] = {
        { .name = "gdb-start", .value = TARGET_EVENT_GDB_START },
        { .name = "gdb-end", .value = TARGET_EVENT_GDB_END },
 
-       /* historical name */
-
-       { .value = TARGET_EVENT_RESET_START, .name = "reset-start" },
-
+       { .value = TARGET_EVENT_RESET_START,         .name = "reset-start" },
        { .value = TARGET_EVENT_RESET_ASSERT_PRE,    .name = "reset-assert-pre" },
        { .value = TARGET_EVENT_RESET_ASSERT,        .name = "reset-assert" },
        { .value = TARGET_EVENT_RESET_ASSERT_POST,   .name = "reset-assert-post" },
@@ -2507,7 +2502,6 @@ COMMAND_HANDLER(handle_resume_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct target *target = get_current_target(CMD_CTX);
-       target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
 
        /* with no CMD_ARGV, resume from current pc, addr = 0,
         * with one arguments, addr = CMD_ARGV[0],

diff --git a/src/target/target.h b/src/target/target.h
index b3025dcb575ffbd71c860f7914a0b3b1626c67fe..9bf32b62caeb1542cfdfcfc9cce848e28d5645ca 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -195,12 +195,6 @@ static inline const char *target_name(struct target *target)
 const char *debug_reason_name(struct target *t);
 
 enum target_event {
-       /* LD historical names
-        * - Prior to the great TCL change
-        * - June/July/Aug 2008
-        * - Duane Ellis */
-       TARGET_EVENT_OLD_gdb_program_config,
-       TARGET_EVENT_OLD_pre_resume,
 
        /* allow GDB to do stuff before others handle the halted event,
         * this is in lieu of defining ordering of invocation of events,

diff --git a/tcl/target/aduc702x.cfg b/tcl/target/aduc702x.cfg
index f06dc33f46982565c0e3f0fabf6651280338acfb..fca0a7f969fb9ddc78d9703d8cd4c2a4764bb0d2 100644 (file)
--- a/tcl/target/aduc702x.cfg
+++ b/tcl/target/aduc702x.cfg
@@ -50,4 +50,4 @@ proc watchdog_service {} {
 }
 
 $_TARGETNAME configure -event reset-halt-post {  watchdog_service }
-$_TARGETNAME configure -event old-pre_resume { global watchdog_hdl; after cancel $watchdog_hdl }
+$_TARGETNAME configure -event resume-start { global watchdog_hdl; after cancel $watchdog_hdl }