X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetm.c;h=cc1ac7a65d45b3ec16a7bdf8353ccd8cc1367006;hb=9a9cc91bcb61e340ba60b46dedb9017a58c8c91a;hp=0d20b0d5866060f37bddeef1d9c4b00277960d6d;hpb=2e01a1ad1930aabb9e3bc7a0e3eb98b2b3331b1c;p=openocd.git

diff --git a/src/target/etm.c b/src/target/etm.c
index 0d20b0d586..cc1ac7a65d 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -356,12 +356,12 @@ int etm_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
 	fields[2].in_handler = NULL;
 	fields[2].in_handler_priv = NULL;
 	
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	jtag_add_dr_scan(3, fields, -1);
 	
 	fields[0].in_value = reg->value;
 	jtag_set_check_value(fields+0, check_value, check_mask, NULL);	
 		
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	jtag_add_dr_scan(3, fields, -1);
 
 	free(fields[1].out_value);
 	free(fields[2].out_value);
@@ -446,7 +446,7 @@ int etm_write_reg(reg_t *reg, u32 value)
 	fields[2].in_handler = NULL;
 	fields[2].in_handler_priv = NULL;
 	
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	jtag_add_dr_scan(3, fields, -1);
 	
 	free(fields[0].out_value);
 	free(fields[1].out_value);
@@ -723,13 +723,18 @@ int etmv1_data(etm_context_t *ctx, int size, u32 *data)
 	}
 	
 	if (size == 8)
+	{
 		ERROR("TODO: add support for 64-bit values");
+		return -1;
+	}
 	else if (size == 4)
 		*data = target_buffer_get_u32(ctx->target, buf);
 	else if (size == 2)
 		*data = target_buffer_get_u16(ctx->target, buf);
 	else if (size == 1)
 		*data = buf[0];
+	else
+		return -1;
 		
 	return 0;
 }
@@ -1387,6 +1392,9 @@ int handle_etm_info_command(struct command_context_s *cmd_ctx, char *cmd, char *
 		case 2:
 			max_port_size = 16;
 			break;
+		default:
+			ERROR("Illegal max_port_size");
+			exit(-1);
 	}
 	command_print(cmd_ctx, "max. port size: %i", max_port_size);
 	
@@ -1505,7 +1513,6 @@ int handle_etm_image_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 	if (image_open(etm_ctx->image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "image opening error: %s", etm_ctx->image->error_str);
 		free(etm_ctx->image);
 		etm_ctx->image = NULL;
 		return ERROR_OK;
@@ -1562,7 +1569,6 @@ int handle_etm_dump_command(struct command_context_s *cmd_ctx, char *cmd, char *
 	
 	if (fileio_open(&file, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "file open error: %s", file.error_str);
 		return ERROR_OK;
 	}
 	
@@ -1620,7 +1626,6 @@ int handle_etm_load_command(struct command_context_s *cmd_ctx, char *cmd, char *
 	
 	if (fileio_open(&file, args[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "file open error: %s", file.error_str);
 		return ERROR_OK;
 	}