Fixed gaffes in reset script handling + improved error
messages a bit. The file and line # of the syntax error in a reset script is now printed. git-svn-id: svn://svn.berlios.de/openocd/trunk@1042 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
0a3b6213bb
commit
bc25d4fa5e
|
@ -436,7 +436,8 @@ static int NEW_target_process_reset(struct command_context_s *cmd_ctx, enum targ
|
|||
sprintf( buf, "ocd_process_reset %s", n->name );
|
||||
retval = Jim_Eval( interp, buf );
|
||||
|
||||
if(retval != JIM_ERR){
|
||||
if(retval != JIM_OK) {
|
||||
Jim_PrintErrorMessage(interp);
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
|
||||
|
@ -3112,7 +3113,10 @@ target_handle_event( target_t *target, enum target_event e )
|
|||
e,
|
||||
Jim_Nvp_value2name_simple( nvp_target_event, e )->name,
|
||||
Jim_GetString( teap->body, NULL ) );
|
||||
Jim_EvalObj( interp, teap->body );
|
||||
if (Jim_EvalObj( interp, teap->body )!=JIM_OK)
|
||||
{
|
||||
Jim_PrintErrorMessage(interp);
|
||||
}
|
||||
}
|
||||
teap = teap->next;
|
||||
}
|
||||
|
@ -3215,7 +3219,7 @@ target_configure( Jim_GetOptInfo *goi,
|
|||
}
|
||||
|
||||
if( goi->isconfigure ){
|
||||
if( goi->argc == 0 ){
|
||||
if( goi->argc != 1 ){
|
||||
Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
|
||||
return JIM_ERR;
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@ reset_config trst_and_srst srst_pulls_trst
|
|||
jtag_device 4 0x1 0xf 0xe
|
||||
|
||||
target arm7tdmi little 0 arm7tdmi-s_r4
|
||||
[new_target_name] configure -event old-post_reset {} {
|
||||
[new_target_name] configure -event old-post_reset {
|
||||
# Force target into ARM state
|
||||
soft_reset_halt
|
||||
#do not remap 0x0000-0x0020 to anything but the flash
|
||||
|
|
Loading…
Reference in New Issue