X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetm.c;h=ddeb9226e501ebe5b381fb22fa4462d60c833d6e;hp=17516e9cbfa8b84e714ef1d22fc5d84d460caff2;hb=24d9f0cfa0ee84e927d84957cab22c6571fa3185;hpb=009f5c2af0b35d8551aa422475482d2da09675f2

diff --git a/src/target/etm.c b/src/target/etm.c
index 17516e9cbf..ddeb9226e5 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -67,7 +67,7 @@ struct etm_reg_info {
 	uint8_t size;			/* low-N of 32 bits */
 	uint8_t mode;			/* RO, WO, RW */
 	uint8_t bcd_vers;		/* 1.0, 2.0, etc */
-	char *name;
+	const char *name;
 };
 
 /*
@@ -318,7 +318,7 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
 		etm_core, 1);
 
 	etm_get_reg(reg_list);
-	etm_ctx->config = buf_get_u32(&arch_info->value, 0, 32);
+	etm_ctx->config = buf_get_u32(arch_info->value, 0, 32);
 	config = etm_ctx->config;
 
 	/* figure ETM version then add base registers */
@@ -334,7 +334,7 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
 			etm_core + 1, 1);
 		etm_get_reg(reg_list + 1);
 		etm_ctx->id = buf_get_u32(
-				&arch_info[1].value, 0, 32);
+				arch_info[1].value, 0, 32);
 		LOG_DEBUG("ETM ID: %08x", (unsigned) etm_ctx->id);
 		bcd_vers = 0x10 + (((etm_ctx->id) >> 4) & 0xff);
 
@@ -1788,7 +1788,7 @@ COMMAND_HANDLER(handle_etm_load_command)
 	if (fileio_open(&file, CMD_ARGV[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 		return ERROR_FAIL;
 
-	int filesize;
+	size_t filesize;
 	int retval = fileio_size(&file, &filesize);
 	if (retval != ERROR_OK) {
 		fileio_close(&file);