Browse Source

Revert "When calling openocd from a shell like this:"

This reverts commit e8641695c6

Original premise was wrong. Proper command is "shutdown", not "exit".

Change-Id: I07f5fe0dda9c24abe53628da986bfda0e406bb4a
Signed-off-by: Alex Austin <alex.austin@spectrumdsi.com>
Reviewed-on: http://openocd.zylin.com/757
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>
tags/v0.6.0-rc1
Alex Austin 9 years ago
committed by Peter Stuge
parent
commit
10fd274cfe
3 changed files with 7 additions and 13 deletions
  1. +6
    -10
      src/helper/command.c
  2. +1
    -1
      src/helper/log.h
  3. +0
    -2
      src/openocd.c

+ 6
- 10
src/helper/command.c View File

@@ -118,15 +118,10 @@ static void command_log_capture_finish(struct log_capture_state *state)
static int command_retval_set(Jim_Interp *interp, int retval)
{
int *return_retval = Jim_GetAssocData(interp, "retval");
if (retval == ERROR_COMMAND_CLOSE_CONNECTION) {
if (return_retval != NULL)
*return_retval = 0;
return JIM_EXIT;
} else {
if (return_retval != NULL)
*return_retval = retval;
return (retval == ERROR_OK) ? JIM_OK : JIM_ERR;
}
if (return_retval != NULL)
*return_retval = retval;

return (retval == ERROR_OK) ? JIM_OK : JIM_ERR;
}

extern struct command_context *global_cmd_ctx;
@@ -676,7 +671,8 @@ int command_run_line(struct command_context *context, char *line)
}
return retval;
} else if (retcode == JIM_EXIT) {
return ERROR_OK_EXIT;
/* ignore.
* exit(Jim_GetExitCode(interp)); */
} else {
const char *result;
int reslen;


+ 1
- 1
src/helper/log.h View File

@@ -138,5 +138,5 @@ extern int debug_level;
* make no assumptions about what went wrong and try to handle the problem.
*/
#define ERROR_FAIL (-4)
#define ERROR_OK_EXIT (-5)
#endif /* LOG_H */

+ 0
- 2
src/openocd.c View File

@@ -279,8 +279,6 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
return EXIT_FAILURE;

ret = parse_config_file(cmd_ctx);
if (ret == ERROR_OK_EXIT)
return ERROR_OK;
if (ret != ERROR_OK)
return EXIT_FAILURE;



Loading…
Cancel
Save