target/espressif: fix upstream apptrace review comments

Author: erhankur

doc/openocd.texi

@@ -11147,10 +11147,16 @@ Dump trace memory to a file.
 
 @section Espressif Specific Commands
 
-@deffn {Command} {esp apptrace} (start file://<outfile> [<poll_period> [<trace_size> [<stop_tmo> [<wait4halt> [<skip_size>]]]]])
+@deffn {Command} {esp apptrace} (start <destination> [<poll_period> [<trace_size> [<stop_tmo> [<wait4halt> [<skip_size>]]]]])
 Starts
 @uref{https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/app_trace.html#application-level-tracing-library, application level tracing}.
-Data will be stored to specified destination.
+Data will be stored to specified destination. Available destinations are:
+@itemize @bullet
+@item @code{file://<outfile>} - Save trace logs into file.
+@item @code{tcp://<host>:<port>} - Send trace logs to tcp port on specified host. OpenOCD will act as a tcp client.
+@item @code{con:} - Print trace logs to the stdout.
+@end itemize
+Other parameters will be same for each destination.
 @itemize @bullet
 @item @code{poll_period} - trace data polling period in ms.
 @item @code{trace_size} - maximum trace data size.

src/flash/nor/esp_flash.c

@@ -831,7 +831,7 @@ static int esp_algo_flash_read_xfer(struct target *target, uint32_t block_id, ui
 	uint8_t *ptr = state->rd_buf;
 	while (ptr < state->rd_buf + len) {
 		uint32_t data_sz = 0;
-		ptr = state->rw.apptrace->usr_block_get(ptr, &data_sz);
+		ptr = state->rw.apptrace->usr_block_get(target, ptr, &data_sz);
 		if (data_sz > 0)
 			memcpy(state->rw.buffer + state->rw.total_count, ptr, data_sz);
 		ptr += data_sz;

src/flash/nor/esp_flash.h

@@ -39,7 +39,7 @@ struct esp_flash_apptrace_hw {
 		uint32_t block_id,
 		const uint8_t *data,
 		uint32_t size);
-	uint8_t *(*usr_block_get)(uint8_t * buffer, uint32_t * size);
+	uint8_t *(*usr_block_get)(struct target *target, uint8_t *buffer, uint32_t *size);
 	uint32_t (*block_max_size_get)(struct target *target);
 	uint32_t (*usr_block_max_size_get)(struct target *target);
 };