Commit 9855a11e authored by David Brownell's avatar David Brownell
Browse files

ETM: update port drivers



Make both useful ETM port drivers (etb, etm_dummy) use the new
toplevel ETM handle, instead of the to-be-removed lower level one.

Do the same for the "oocd-trace" prototype too; and fix its
error reporting paths:  return failure codes, don't exit(), etc
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
parent 3ae44019
...@@ -353,8 +353,7 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm ...@@ -353,8 +353,7 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm
{ {
target_t *target; target_t *target;
jtag_tap_t *tap; jtag_tap_t *tap;
armv4_5_common_t *armv4_5; struct arm *arm;
arm7_9_common_t *arm7_9;
if (argc != 2) if (argc != 2)
{ {
...@@ -369,9 +368,10 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm ...@@ -369,9 +368,10 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm
return ERROR_FAIL; return ERROR_FAIL;
} }
if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) arm = target_to_arm(target);
if (!is_arm(arm))
{ {
command_print(cmd_ctx, "ETB: current target isn't an ARM7/ARM9 target"); command_print(cmd_ctx, "ETB: '%s' isn't an ARM", args[0]);
return ERROR_FAIL; return ERROR_FAIL;
} }
...@@ -382,11 +382,11 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm ...@@ -382,11 +382,11 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm
return ERROR_FAIL; return ERROR_FAIL;
} }
if (arm7_9->etm_ctx) if (arm->etm)
{ {
etb_t *etb = malloc(sizeof(etb_t)); etb_t *etb = malloc(sizeof(etb_t));
arm7_9->etm_ctx->capture_driver_priv = etb; arm->etm->capture_driver_priv = etb;
etb->tap = tap; etb->tap = tap;
etb->cur_scan_chain = 0xffffffff; etb->cur_scan_chain = 0xffffffff;
......
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
static int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
target_t *target; target_t *target;
armv4_5_common_t *armv4_5; struct arm *arm;
arm7_9_common_t *arm7_9;
target = get_target(args[0]); target = get_target(args[0]);
...@@ -39,15 +38,16 @@ static int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, ch ...@@ -39,15 +38,16 @@ static int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, ch
return ERROR_FAIL; return ERROR_FAIL;
} }
if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) arm = target_to_arm(target);
if (!is_arm(arm))
{ {
command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); command_print(cmd_ctx, "target '%s' isn't an ARM", args[0]);
return ERROR_FAIL; return ERROR_FAIL;
} }
if (arm7_9->etm_ctx) if (arm->etm)
{ {
arm7_9->etm_ctx->capture_driver_priv = NULL; arm->etm->capture_driver_priv = NULL;
} }
else else
{ {
......
...@@ -292,29 +292,28 @@ etm_capture_driver_t oocd_trace_capture_driver = ...@@ -292,29 +292,28 @@ etm_capture_driver_t oocd_trace_capture_driver =
static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
target_t *target; target_t *target;
armv4_5_common_t *armv4_5; struct arm *arm;
arm7_9_common_t *arm7_9;
if (argc != 2) if (argc != 2)
{ {
LOG_ERROR("incomplete 'oocd_trace config <target> <tty>' command"); LOG_ERROR("incomplete 'oocd_trace config <target> <tty>' command");
exit(-1); return ERROR_FAIL;
} }
target = get_current_target(cmd_ctx); target = get_current_target(cmd_ctx);
arm = target_to_arm(target);
if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) if (!is_arm(arm))
{ {
command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); command_print(cmd_ctx, "current target isn't an ARM");
return ERROR_OK; return ERROR_FAIL;
} }
if (arm7_9->etm_ctx) if (arm->etm)
{ {
oocd_trace_t *oocd_trace = malloc(sizeof(oocd_trace_t)); oocd_trace_t *oocd_trace = malloc(sizeof(oocd_trace_t));
arm7_9->etm_ctx->capture_driver_priv = oocd_trace; arm->etm->capture_driver_priv = oocd_trace;
oocd_trace->etm_ctx = arm7_9->etm_ctx; oocd_trace->etm_ctx = arm->etm;
/* copy name of TTY device used to communicate with OpenOCD + trace */ /* copy name of TTY device used to communicate with OpenOCD + trace */
oocd_trace->tty = strndup(args[1], 256); oocd_trace->tty = strndup(args[1], 256);
...@@ -330,32 +329,32 @@ static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, c ...@@ -330,32 +329,32 @@ static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, c
static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
target_t *target; target_t *target;
armv4_5_common_t *armv4_5; struct arm *arm;
arm7_9_common_t *arm7_9;
oocd_trace_t *oocd_trace; oocd_trace_t *oocd_trace;
uint32_t status; uint32_t status;
target = get_current_target(cmd_ctx); target = get_current_target(cmd_ctx);
if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) arm = target_to_arm(target);
if (!is_arm(arm))
{ {
command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); command_print(cmd_ctx, "current target isn't an ARM");
return ERROR_OK; return ERROR_FAIL;
} }
if (!arm7_9->etm_ctx) if (!arm->etm)
{ {
command_print(cmd_ctx, "current target doesn't have an ETM configured"); command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_OK; return ERROR_FAIL;
} }
if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0) if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0)
{ {
command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'");
return ERROR_OK; return ERROR_FAIL;
} }
oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv; oocd_trace = (oocd_trace_t*)arm->etm->capture_driver_priv;
oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status); oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
...@@ -370,33 +369,33 @@ static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, c ...@@ -370,33 +369,33 @@ static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, c
static int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
target_t *target; target_t *target;
armv4_5_common_t *armv4_5; struct arm *arm;
arm7_9_common_t *arm7_9;
oocd_trace_t *oocd_trace; oocd_trace_t *oocd_trace;
size_t bytes_written; size_t bytes_written;
uint8_t cmd_array[1]; uint8_t cmd_array[1];
target = get_current_target(cmd_ctx); target = get_current_target(cmd_ctx);
if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) arm = target_to_arm(target);
if (!is_arm(arm))
{ {
command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); command_print(cmd_ctx, "current target isn't an ARM");
return ERROR_OK; return ERROR_FAIL;
} }
if (!arm7_9->etm_ctx) if (!arm->etm)
{ {
command_print(cmd_ctx, "current target doesn't have an ETM configured"); command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_OK; return ERROR_FAIL;
} }
if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0) if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0)
{ {
command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'");
return ERROR_OK; return ERROR_FAIL;
} }
oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv; oocd_trace = (oocd_trace_t*)arm->etm->capture_driver_priv;
cmd_array[0] = 0xf0; cmd_array[0] = 0xf0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment