summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-21 18:24:43 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-21 18:24:43 +0000
commitd0f32d0ed5045aa45578d19c5419cf5b323e4891 (patch)
treee7ab838d812268744b36207dc620c723cd57118a /src
parentfa33b3290307be8b46dd0ff817ff06f4b7492d86 (diff)
downloadopenocd_libswd-d0f32d0ed5045aa45578d19c5419cf5b323e4891.tar.gz
openocd_libswd-d0f32d0ed5045aa45578d19c5419cf5b323e4891.tar.bz2
openocd_libswd-d0f32d0ed5045aa45578d19c5419cf5b323e4891.tar.xz
openocd_libswd-d0f32d0ed5045aa45578d19c5419cf5b323e4891.zip
restart is a per-target action
git-svn-id: svn://svn.berlios.de/openocd/trunk@853 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/helper/startup.tcl8
-rw-r--r--src/server/gdb_server.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index acc4d318..a7697758 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -153,7 +153,11 @@ add_help_text script "<filename> - filename of OpenOCD script (tcl) to run"
-# Handle GDB 'R' packet. Can be overriden by configuration script
-proc gdb_restart {} {
+# Handle GDB 'R' packet. Can be overriden by configuration script,
+# but it's not something one would expect target scripts to do
+# normally
+proc ocd_gdb_restart {target_num} {
+ # Fix!!! we're resetting all targets here! Really we should reset only
+ # one target
reset halt
} \ No newline at end of file
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index e964a1d5..ffbd8d0d 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1950,7 +1950,7 @@ int gdb_input_inner(connection_t *connection)
break;
case 'R':
/* handle extended restart packet */
- command_run_linef(connection->cmd_ctx, "gdb_restart");
+ command_run_linef(connection->cmd_ctx, "ocd_gdb_restart %d", get_num_by_target(target));
break;
default:
/* ignore unkown packets */