X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.c;h=af699cfa28bc0942a06bfa2e0fb5aa9e89ead71b;hb=e2b6de3d66bae70cb08fea17f5b66ee875dbb636;hp=53627a5f5c4733b183fb45373b723ce8f849582d;hpb=ce8768f46345e3f88ca6f8f0b88603d79e22d89a;p=openocd.git

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 53627a5f5c..af699cfa28 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -63,14 +63,15 @@ 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,
 
 	.read_memory = arm7_9_read_memory,
 	.write_memory = arm7_9_write_memory,
 	.bulk_write_memory = arm7_9_bulk_write_memory,
-
+	.checksum_memory = arm7_9_checksum_memory,
+	.blank_check_memory = arm7_9_blank_check_memory,
+	
 	.run_algorithm = armv4_5_run_algorithm,
 	
 	.add_breakpoint = arm7_9_add_breakpoint,
@@ -81,6 +82,7 @@ target_type_t arm966e_target =
 	.register_commands = arm966e_register_commands,
 	.target_command = arm966e_target_command,
 	.init_target = arm966e_init_target,
+	.examine = arm9tdmi_examine,
 	.quit = arm966e_quit,
 };
 
@@ -124,10 +126,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);
 	}
 	
@@ -136,7 +139,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);
 
@@ -224,16 +227,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;
@@ -285,10 +288,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;