X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetm.c;h=6a00c23a8b5600674ec85988272188bcdc5aea8c;hp=0246ae25e4ff93fccf9af716715bd906546138de;hb=7a3eec2b4d9dbb9533acfb271dbe91afa0727c8e;hpb=dc574aa1da291405c6778383c1ad3b252602aee7

diff --git a/src/target/etm.c b/src/target/etm.c
index 0246ae25e4..6a00c23a8b 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1701,7 +1699,7 @@ COMMAND_HANDLER(handle_etm_image_command)
 
 COMMAND_HANDLER(handle_etm_dump_command)
 {
-	struct fileio file;
+	struct fileio *file;
 	struct target *target;
 	struct arm *arm;
 	struct etm_context *etm_ctx;
@@ -1741,24 +1739,24 @@ COMMAND_HANDLER(handle_etm_dump_command)
 	if (fileio_open(&file, CMD_ARGV[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
 		return ERROR_FAIL;
 
-	fileio_write_u32(&file, etm_ctx->capture_status);
-	fileio_write_u32(&file, etm_ctx->control);
-	fileio_write_u32(&file, etm_ctx->trace_depth);
+	fileio_write_u32(file, etm_ctx->capture_status);
+	fileio_write_u32(file, etm_ctx->control);
+	fileio_write_u32(file, etm_ctx->trace_depth);
 
 	for (i = 0; i < etm_ctx->trace_depth; i++) {
-		fileio_write_u32(&file, etm_ctx->trace_data[i].pipestat);
-		fileio_write_u32(&file, etm_ctx->trace_data[i].packet);
-		fileio_write_u32(&file, etm_ctx->trace_data[i].flags);
+		fileio_write_u32(file, etm_ctx->trace_data[i].pipestat);
+		fileio_write_u32(file, etm_ctx->trace_data[i].packet);
+		fileio_write_u32(file, etm_ctx->trace_data[i].flags);
 	}
 
-	fileio_close(&file);
+	fileio_close(file);
 
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(handle_etm_load_command)
 {
-	struct fileio file;
+	struct fileio *file;
 	struct target *target;
 	struct arm *arm;
 	struct etm_context *etm_ctx;
@@ -1789,15 +1787,15 @@ COMMAND_HANDLER(handle_etm_load_command)
 		return ERROR_FAIL;
 
 	size_t filesize;
-	int retval = fileio_size(&file, &filesize);
+	int retval = fileio_size(file, &filesize);
 	if (retval != ERROR_OK) {
-		fileio_close(&file);
+		fileio_close(file);
 		return retval;
 	}
 
 	if (filesize % 4) {
 		command_print(CMD_CTX, "size isn't a multiple of 4, no valid trace data");
-		fileio_close(&file);
+		fileio_close(file);
 		return ERROR_FAIL;
 	}
 
@@ -1808,28 +1806,28 @@ COMMAND_HANDLER(handle_etm_load_command)
 
 	{
 		uint32_t tmp;
-		fileio_read_u32(&file, &tmp); etm_ctx->capture_status = tmp;
-		fileio_read_u32(&file, &tmp); etm_ctx->control = tmp;
-		fileio_read_u32(&file, &etm_ctx->trace_depth);
+		fileio_read_u32(file, &tmp); etm_ctx->capture_status = tmp;
+		fileio_read_u32(file, &tmp); etm_ctx->control = tmp;
+		fileio_read_u32(file, &etm_ctx->trace_depth);
 	}
 	etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
 	if (etm_ctx->trace_data == NULL) {
 		command_print(CMD_CTX, "not enough memory to perform operation");
-		fileio_close(&file);
+		fileio_close(file);
 		return ERROR_FAIL;
 	}
 
 	for (i = 0; i < etm_ctx->trace_depth; i++) {
 		uint32_t pipestat, packet, flags;
-		fileio_read_u32(&file, &pipestat);
-		fileio_read_u32(&file, &packet);
-		fileio_read_u32(&file, &flags);
+		fileio_read_u32(file, &pipestat);
+		fileio_read_u32(file, &packet);
+		fileio_read_u32(file, &flags);
 		etm_ctx->trace_data[i].pipestat = pipestat & 0xff;
 		etm_ctx->trace_data[i].packet = packet & 0xffff;
 		etm_ctx->trace_data[i].flags = flags;
 	}
 
-	fileio_close(&file);
+	fileio_close(file);
 
 	return ERROR_OK;
 }