X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetm.c;h=119c0df5d8c6c7777fbcbe96545837cc82e5f4e6;hb=d74f11dcd43914702ea7b011c4bbb7da8d4a2f5c;hp=93dbd29488fb5b38169ba35a5e26dd1f128723b0;hpb=73746d78b7bd582bab26cebdcf78299b8da99a62;p=openocd.git

diff --git a/src/target/etm.c b/src/target/etm.c
index 93dbd29488..119c0df5d8 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -27,11 +27,6 @@
 #include "register.h"
 #include "etm_dummy.h"
 
-#if BUILD_OOCD_TRACE == 1
-#include "oocd_trace.h"
-#endif
-
-
 /*
  * ARM "Embedded Trace Macrocell" (ETM) support -- direct JTAG access.
  *
@@ -279,7 +274,7 @@ static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
 
 		reg->name = r->name;
 		reg->size = r->size;
-		reg->value = &ereg->value;
+		reg->value = ereg->value;
 		reg->arch_info = ereg;
 		reg->type = &etm_scan6_type;
 		reg++;
@@ -303,7 +298,7 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
 	reg_list = calloc(128, sizeof(struct reg));
 	arch_info = calloc(128, sizeof(struct etm_reg));
 
-	if (reg_cache == NULL || reg_list == NULL || arch_info == NULL) {
+	if (!reg_cache || !reg_list || !arch_info) {
 		LOG_ERROR("No memory");
 		goto fail;
 	}
@@ -642,9 +637,6 @@ static int etm_write_reg(struct reg *reg, uint32_t value)
 static struct etm_capture_driver *etm_capture_drivers[] = {
 	&etb_capture_driver,
 	&etm_dummy_capture_driver,
-#if BUILD_OOCD_TRACE == 1
-	&oocd_trace_capture_driver,
-#endif
 	NULL
 };
 
@@ -1424,9 +1416,8 @@ COMMAND_HANDLER(handle_etm_config_command)
 
 	for (i = 0; etm_capture_drivers[i]; i++) {
 		if (strcmp(CMD_ARGV[4], etm_capture_drivers[i]->name) == 0) {
-			int retval = register_commands(CMD_CTX, NULL,
-					etm_capture_drivers[i]->commands);
-			if (ERROR_OK != retval) {
+			int retval = register_commands(CMD_CTX, NULL, etm_capture_drivers[i]->commands);
+			if (retval != ERROR_OK) {
 				free(etm_ctx);
 				return retval;
 			}
@@ -1816,7 +1807,7 @@ COMMAND_HANDLER(handle_etm_load_command)
 		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) {
+	if (!etm_ctx->trace_data) {
 		command_print(CMD, "not enough memory to perform operation");
 		fileio_close(file);
 		return ERROR_FAIL;
@@ -2115,6 +2106,5 @@ static const struct command_registration etm_exec_command_handlers[] = {
 
 static int etm_register_user_commands(struct command_context *cmd_ctx)
 {
-	struct command *etm_cmd = command_find_in_context(cmd_ctx, "etm");
-	return register_commands(cmd_ctx, etm_cmd, etm_exec_command_handlers);
+	return register_commands(cmd_ctx, "etm", etm_exec_command_handlers);
 }