X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.c;h=84c55cf4849ef473b9a6c8d7089fdd899a414079;hb=7805be1b3a8f65aff9a861fd8ca62518143f1524;hp=2885e3dfb5d549b9b3303f3ffa2936dd3ba093fc;hpb=e27696f6b04459e935a0a5f65f7f668cb02970dd;p=openocd

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 2885e3df..84c55cf4 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -63,7 +63,6 @@ target_type_t arm966e_target =
 	.assert_reset = arm7_9_assert_reset,
 	.deassert_reset = arm7_9_deassert_reset,
 	.soft_reset_halt = arm7_9_soft_reset_halt,
-	.prepare_reset_halt = arm7_9_prepare_reset_halt,
 
 	.get_gdb_reg_list = armv4_5_get_gdb_reg_list,
 
@@ -125,10 +124,11 @@ int arm966e_target_command(struct command_context_s *cmd_ctx, char *cmd, char **
 	int chain_pos;
 	char *variant = NULL;
 	arm966e_common_t *arm966e = malloc(sizeof(arm966e_common_t));
+	memset(arm966e, 0, sizeof(*arm966e));
 	
 	if (argc < 4)
 	{
-		ERROR("'target arm966e' requires at least one additional argument");
+		LOG_ERROR("'target arm966e' requires at least one additional argument");
 		exit(-1);
 	}
 	
@@ -137,7 +137,7 @@ int arm966e_target_command(struct command_context_s *cmd_ctx, char *cmd, char **
 	if (argc >= 5)
 		variant = args[4];
 	
-	DEBUG("chain_pos: %i, variant: %s", chain_pos, variant);
+	LOG_DEBUG("chain_pos: %i, variant: %s", chain_pos, variant);
 	
 	arm966e_init_arch_info(target, arm966e, chain_pos, variant);
 
@@ -225,16 +225,16 @@ int arm966e_read_cp15(target_t *target, int reg_addr, 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);
 
 	fields[0].in_handler_priv = value;
 	fields[0].in_handler = arm_jtag_buf_to_u32;
 
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	jtag_add_dr_scan(3, fields, -1);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 	jtag_execute_queue();
-	DEBUG("addr: 0x%x value: %8.8x", reg_addr, *value);
+	LOG_DEBUG("addr: 0x%x value: %8.8x", reg_addr, *value);
 #endif
 
 	return ERROR_OK;
@@ -286,10 +286,10 @@ int arm966e_write_cp15(target_t *target, int reg_addr, 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);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
-	DEBUG("addr: 0x%x value: %8.8x", reg_addr, value);
+	LOG_DEBUG("addr: 0x%x value: %8.8x", reg_addr, value);
 #endif
 
 	return ERROR_OK;