zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
__archive__
Alex Austin 2012-07-20 12:58:14 +00:00 committed by Peter Stuge
parent 5e4ee571cc
commit 10fd274cfe
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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) static int command_retval_set(Jim_Interp *interp, int retval)
{ {
int *return_retval = Jim_GetAssocData(interp, "retval"); int *return_retval = Jim_GetAssocData(interp, "retval");
if (retval == ERROR_COMMAND_CLOSE_CONNECTION) { if (return_retval != NULL)
if (return_retval != NULL) *return_retval = retval;
*return_retval = 0;
return JIM_EXIT; return (retval == ERROR_OK) ? JIM_OK : JIM_ERR;
} else {
if (return_retval != NULL)
*return_retval = retval;
return (retval == ERROR_OK) ? JIM_OK : JIM_ERR;
}
} }
extern struct command_context *global_cmd_ctx; extern struct command_context *global_cmd_ctx;
@ -676,7 +671,8 @@ int command_run_line(struct command_context *context, char *line)
} }
return retval; return retval;
} else if (retcode == JIM_EXIT) { } else if (retcode == JIM_EXIT) {
return ERROR_OK_EXIT; /* ignore.
* exit(Jim_GetExitCode(interp)); */
} else { } else {
const char *result; const char *result;
int reslen; int reslen;

2
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. * make no assumptions about what went wrong and try to handle the problem.
*/ */
#define ERROR_FAIL (-4) #define ERROR_FAIL (-4)
#define ERROR_OK_EXIT (-5)
#endif /* LOG_H */ #endif /* LOG_H */

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; return EXIT_FAILURE;
ret = parse_config_file(cmd_ctx); ret = parse_config_file(cmd_ctx);
if (ret == ERROR_OK_EXIT)
return ERROR_OK;
if (ret != ERROR_OK) if (ret != ERROR_OK)
return EXIT_FAILURE; return EXIT_FAILURE;