target/espressif: fix upstream review comments

Author: erhankur

doc/openocd.texi

@@ -11138,8 +11138,8 @@ Data will be stored to specified destination.
 @item @code{trace_size} - maximum trace data size.
 Tracing will be stopped automatically when that amount is reached.
 Use "-1" to disable the limitation.
-@item @code{stop_tmo} - Data receiption timeout in ms.
-Tracing will be stopped automatically when no data is received withn that period.
+@item @code{stop_tmo} - Data reception timeout in ms.
+Tracing will be stopped automatically when no data is received within that period.
 @item @code{wait4halt} - if non-zero then wait for target to be halted before tracing start.
 @item @code{skip_size} - amount of tracing data to be skipped before writing it to destination.
 @end itemize
@@ -11154,7 +11154,7 @@ Requests ongoing tracing status.
 @end deffn
 
 @deffn {Command} {esp apptrace} (dump file://<outfile>)
-Dumps tracing data from target buffer. It can be usefull to dump the latest data
+Dumps tracing data from target buffer. It can be useful to dump the latest data
 buffered on target for post-mortem analysis. For example when target starts tracing automatically
 w/o OpenOCD command and keeps only the latest data window which fit into the buffer.
 @uref{https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/app_trace.html#application-level-tracing-library, application level tracing}.

src/target/espressif/esp32_apptrace.c

@@ -318,9 +318,9 @@ int esp32_apptrace_dest_init(struct esp32_apptrace_dest dest[], const char *dest
 	return i;
 }
 
-int esp32_apptrace_dest_cleanup(struct esp32_apptrace_dest dest[], int max_dests)
+int esp32_apptrace_dest_cleanup(struct esp32_apptrace_dest dest[], unsigned int max_dests)
 {
-	for (int i = 0; i < max_dests; i++) {
+	for (unsigned int i = 0; i < max_dests; i++) {
 		if (dest[i].clean && dest[i].priv) {
 			int res = dest[i].clean(dest[i].priv);
 			dest[i].priv = NULL;
@@ -511,7 +511,9 @@ int esp32_apptrace_cmd_ctx_init(struct target *target, struct esp32_apptrace_cmd
 
 	cmd_ctx->running = 1;
 	if (cmd_ctx->mode != ESP_APPTRACE_CMD_MODE_SYNC) {
-		int res = target_register_timer_callback(esp32_apptrace_data_processor, 0, TARGET_TIMER_TYPE_PERIODIC,
+		int res = target_register_timer_callback(esp32_apptrace_data_processor,
+			0,
+			TARGET_TIMER_TYPE_PERIODIC,
 			cmd_ctx);
 		if (res != ERROR_OK) {
 			LOG_ERROR("Failed to start trace data timer callback (%d)!", res);
@@ -621,12 +623,11 @@ static int esp32_apptrace_cmd_init(struct target *target,
 	cmd_ctx->stop_tmo = -1.0;	/* infinite */
 	cmd_data->max_len = UINT32_MAX;
 	cmd_data->poll_period = 0 /*ms*/;
-	if (argc > 1) {
+	if (argc > 1)
 		/* parse remaining args */
 		esp32_apptrace_cmd_args_parse(cmd_ctx, cmd_data, &argv[1], argc - 1);
-	}
-	LOG_USER(
-		"App trace params: from %d cores, size %" PRId32 " bytes, stop_tmo %g s, poll period %" PRId32
+
+	LOG_USER("App trace params: from %d cores, size %" PRId32 " bytes, stop_tmo %g s, poll period %" PRId32
 		" ms, wait_rst %d, skip %" PRId32 " bytes", cmd_ctx->cores_num,
 		cmd_data->max_len,
 		cmd_ctx->stop_tmo,
@@ -880,7 +881,7 @@ int esp_apptrace_usr_block_write(const struct esp32_apptrace_hw *hw, struct targ
 	}
 
 	return hw->buffs_write(target,
-		sizeof(buf_sz) / sizeof(buf_sz[0]),
+		ARRAY_SIZE(buf_sz),
 		buf_sz,
 		bufs,
 		block_id,
@@ -956,7 +957,7 @@ static int esp32_apptrace_process_data(struct esp32_apptrace_cmd_ctx *ctx,
 	if (cmd_data->data_dest.log_progress)
 		LOG_USER("%" PRId32 " ", ctx->tot_len);
 	/* check for stop condition */
-	if ((ctx->tot_len > cmd_data->skip_len) && (ctx->tot_len - cmd_data->skip_len >= cmd_data->max_len)) {
+	if (ctx->tot_len > cmd_data->skip_len && (ctx->tot_len - cmd_data->skip_len >= cmd_data->max_len)) {
 		ctx->running = 0;
 		if (duration_measure(&ctx->read_time) != 0) {
 			LOG_ERROR("Failed to stop trace read time measure!");
@@ -1102,7 +1103,7 @@ static int esp32_apptrace_poll(void *priv)
 	/* LOG_DEBUG("Block %d (%d bytes) on target (%s)!", target_state[0].block_id,
 	 * target_state[0].data_len, target_name(ctx->cpus[0])); */
 	if (fired_target_num == UINT32_MAX) {
-		/* no data has been received, but block could be switched due to the data transfered
+		/* no data has been received, but block could be switched due to the data transferred
 		 * from host to target */
 		if (ctx->cores_num > 1) {
 			uint32_t max_block_id = 0, min_block_id = ctx->hw->max_block_id;
@@ -1621,7 +1622,7 @@ int esp32_cmd_apptrace_generic(struct target *target, int mode, const char **arg
 		}
 		s_at_cmd_ctx.stop_tmo = 0.01;	/* use small stop tmo */
 		s_at_cmd_ctx.process_data = esp32_apptrace_process_data;
-		/* check for exit signal and comand completion */
+		/* check for exit signal and command completion */
 		while (!openocd_is_shutdown_pending() && s_at_cmd_ctx.running) {
 			res = esp32_apptrace_poll(&s_at_cmd_ctx);
 			if (res != ERROR_OK) {

src/target/espressif/esp32_apptrace.h

@@ -114,7 +114,7 @@ void esp32_apptrace_cmd_args_parse(struct esp32_apptrace_cmd_ctx *cmd_ctx,
 	const char **argv,
 	int argc);
 int esp32_apptrace_dest_init(struct esp32_apptrace_dest dest[], const char *dest_paths[], unsigned int max_dests);
-int esp32_apptrace_dest_cleanup(struct esp32_apptrace_dest dest[], int max_dests);
+int esp32_apptrace_dest_cleanup(struct esp32_apptrace_dest dest[], unsigned int max_dests);
 int esp_apptrace_usr_block_write(const struct esp32_apptrace_hw *hw, struct target *target,
 	uint32_t block_id,
 	const uint8_t *data,

src/target/espressif/esp32_sysview.c

@@ -83,7 +83,6 @@ int esp32_sysview_cmd_init(struct target *target,
 {
 	int res;
 	struct esp32_sysview_cmd_data *cmd_data;
-	int core_num = cmd_ctx->cores_num;
 
 	if (argc < 1) {
 		LOG_ERROR("Not enough args! Need trace data destination!");
@@ -94,6 +93,8 @@ int esp32_sysview_cmd_init(struct target *target,
 	if (res)
 		return res;
 
+	int core_num = cmd_ctx->cores_num;
+
 	if (!mcore_format && argc < core_num) {
 		LOG_ERROR("Not enough args! Need %d trace data destinations!", core_num);
 		res = ERROR_FAIL;

src/target/espressif/esp_xtensa_apptrace.c

@@ -125,7 +125,7 @@ static int esp_xtensa_apptrace_data_reverse_read(struct xtensa *xtensa,
 		if (res != ERROR_OK)
 			return res;
 	}
-	for (unsigned int i = size / 4; i > 0; i--) {
+	for (unsigned int i = size / 4; i != 0; i--) {
 		res = xtensa_queue_dbg_reg_read(xtensa, XDMREG_TRAXDATA, &buffer[(i - 1) * 4]);
 		if (res != ERROR_OK)
 			return res;