X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.c;h=9811aeda603fd3eca6e60d07ae12b8d23a4e428e;hb=d47e1b8f362379d8a2307f49e2b42115a3f40524;hp=b9b1f953f5f5016a2c5e5479ffe71b181594a876;hpb=20e4e77cdf366dedac21ff5670c54291feadfc05;p=fw%2Fopenocd

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index b9b1f953f..9811aeda6 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -73,7 +73,8 @@ target_type_t arm9tdmi_target =
 	.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,
+	
 	.run_algorithm = armv4_5_run_algorithm,
 	
 	.add_breakpoint = arm7_9_add_breakpoint,
@@ -100,15 +101,6 @@ arm9tdmi_vector_t arm9tdmi_vectors[] =
 	{0, 0},
 };
 
-int arm9tdmi_jtag_error_handler(u8 *in_value, void *priv)
-{
-	char *caller = priv;
-	
-	DEBUG("caller: %s", caller);
-	
-	return ERROR_JTAG_QUEUE_FAILED;
-}
-
 int arm9tdmi_examine_debug_reason(target_t *target)
 {
 	/* get pointers to arch-specific information */
@@ -159,7 +151,7 @@ int arm9tdmi_examine_debug_reason(target_t *target)
 		arm_jtag_scann(&arm7_9->jtag_info, 0x1);
 		arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-		jtag_add_dr_scan(3, fields, TAP_PD, NULL);
+		jtag_add_dr_scan(3, fields, TAP_PD);
 		jtag_execute_queue();
 		
 		fields[0].in_value = NULL;
@@ -169,7 +161,7 @@ int arm9tdmi_examine_debug_reason(target_t *target)
 		fields[2].in_value = NULL;
 		fields[2].out_value = instructionbus;
 		
-		jtag_add_dr_scan(3, fields, TAP_PD, NULL);
+		jtag_add_dr_scan(3, fields, TAP_PD);
 
 		if (debug_reason & 0x4)
 			if (debug_reason & 0x2)
@@ -242,7 +234,7 @@ int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int s
 	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);
 
 	jtag_add_runtest(0, -1);
 	
@@ -252,10 +244,10 @@ int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int s
 		
 		if (in)
 		{
-			DEBUG("instr: 0x%8.8x, out: 0x%8.8x, in: 0x%8.8x", instr, out, *in);
+			LOG_DEBUG("instr: 0x%8.8x, out: 0x%8.8x, in: 0x%8.8x", instr, out, *in);
 		}
 		else
-			DEBUG("instr: 0x%8.8x, out: 0x%8.8x", instr, out);
+			LOG_DEBUG("instr: 0x%8.8x, out: 0x%8.8x", instr, out);
 	}
 #endif
 
@@ -302,7 +294,7 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
 	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);
 
 	jtag_add_runtest(0, -1);
 	
@@ -312,11 +304,11 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
 			
 		if (in)
 		{
-			DEBUG("in: 0x%8.8x", *in);
+			LOG_DEBUG("in: 0x%8.8x", *in);
 		}
 		else
 		{
-			ERROR("BUG: called with in == NULL");
+			LOG_ERROR("BUG: called with in == NULL");
 		}
 	}
 #endif
@@ -378,7 +370,7 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
 	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);
 
 	jtag_add_runtest(0, -1);
 	
@@ -388,11 +380,11 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
 			
 		if (in)
 		{
-			DEBUG("in: 0x%8.8x", *in);
+			LOG_DEBUG("in: 0x%8.8x", *in);
 		}
 		else
 		{
-			ERROR("BUG: called with in == NULL");
+			LOG_ERROR("BUG: called with in == NULL");
 		}
 	}
 #endif
@@ -552,7 +544,7 @@ void arm9tdmi_write_xpsr(target_t *target, u32 xpsr, int spsr)
 	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
 	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
 		
-	DEBUG("xpsr: %8.8x, spsr: %i", xpsr, spsr);
+	LOG_DEBUG("xpsr: %8.8x, spsr: %i", xpsr, spsr);
 
 	/* MSR1 fetched */
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr & 0xff, 0, 1, spsr), 0, NULL, 0);
@@ -588,7 +580,7 @@ void arm9tdmi_write_xpsr_im8(target_t *target, u8 xpsr_im, int rot, int spsr)
 	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
 	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
 		
-	DEBUG("xpsr_im: %2.2x, rot: %i, spsr: %i", xpsr_im, rot, spsr);
+	LOG_DEBUG("xpsr_im: %2.2x, rot: %i, spsr: %i", xpsr_im, rot, spsr);
 	
 	/* MSR fetched */
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr_im, rot, 1, spsr), 0, NULL, 0);
@@ -753,7 +745,7 @@ void arm9tdmi_branch_resume(target_t *target)
 
 void arm9tdmi_branch_resume_thumb(target_t *target)
 {
-	DEBUG("-");
+	LOG_DEBUG("-");
 	
 	/* get pointers to arch-specific information */
 	armv4_5_common_t *armv4_5 = target->arch_info;
@@ -996,10 +988,11 @@ int arm9tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char *
 	int chain_pos;
 	char *variant = NULL;
 	arm9tdmi_common_t *arm9tdmi = malloc(sizeof(arm9tdmi_common_t));
+	memset(arm9tdmi, 0, sizeof(*arm9tdmi));
 
 	if (argc < 4)
 	{
-		ERROR("'target arm9tdmi' requires at least one additional argument");
+		LOG_ERROR("'target arm9tdmi' requires at least one additional argument");
 		exit(-1);
 	}