David Brownell <david-b@pacbell.net> Accomodate targets which don't support various...

[openocd.git] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 16e4fecdb9cc3e5a1c31c9761399a7a465af09a9..381e774e882e2dd3bae13981e0b864c66aa06705 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -559,6 +559,11 @@ static int target_soft_reset_halt_imp(struct target_s *target)
                LOG_ERROR("Target not examined yet");
                return ERROR_FAIL;
        }
+       if (!target->type->soft_reset_halt_imp) {
+               LOG_ERROR("Target %s does not support soft_reset_halt",
+                               target->cmd_name);
+               return ERROR_FAIL;
+       }
        return target->type->soft_reset_halt_imp(target);
 }
 
@@ -1760,7 +1765,7 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
                                        value = buf_to_str(reg->value,
                                                        reg->size, 16);
                                        command_print(cmd_ctx,
-                                                       "(%i) %s (/%u): 0x%s%s",
+                                                       "(%i) %s (/%" PRIu32 "): 0x%s%s",
                                                        count, reg->name,
                                                        reg->size, value,
                                                        reg->dirty
@@ -1768,7 +1773,7 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
                                                                : "");
                                        free(value);
                                } else {
-                                       command_print(cmd_ctx, "(%i) %s (/%u)",
+                                       command_print(cmd_ctx, "(%i) %s (/%" PRIu32 ")",
                                                          count, reg->name,
                                                          reg->size) ;
                                }
@@ -4035,6 +4040,13 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                }
                if (!target->tap->enabled)
                        goto err_tap_disabled;
+               if (!target->type->assert_reset
+                               || !target->type->deassert_reset) {
+                       Jim_SetResult_sprintf(interp,
+                                       "No target-specific reset for %s",
+                                       target->cmd_name);
+                       return JIM_ERR;
+               }
                /* determine if we should halt or not. */
                target->reset_halt = !!a;
                /* When this happens - all workareas are invalid. */