X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm920t.c;h=ecc158c75b31adf6943fae9a166da681f14e1af9;hb=0c2f8b6eb8f4b379aa0c78caba73ec1ebaae8414;hp=a3a5adf1592bebfc5c226dd00694cf9371adc153;hpb=f941192723f7d71ae4a9a8f011dad5909f156da3;p=fw%2Fopenocd

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index a3a5adf15..ecc158c75 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -533,7 +533,6 @@ int arm920t_arch_state(struct target *target)
 	};
 
 	struct arm920t_common *arm920t = target_to_arm920(target);
-	struct arm *armv4_5;
 
 	if (arm920t->common_magic != ARM920T_COMMON_MAGIC)
 	{
@@ -541,8 +540,6 @@ int arm920t_arch_state(struct target *target)
 		return ERROR_TARGET_INVALID;
 	}
 
-	armv4_5 = &arm920t->arm7_9_common.armv4_5_common;
-
 	arm_arch_state(target);
 	LOG_USER("MMU: %s, D-Cache: %s, I-Cache: %s",
 		 state[arm920t->armv4_5_mmu.mmu_enabled],
@@ -602,7 +599,7 @@ static int arm920t_read_phys_memory(struct target *target,
 
 static int arm920t_write_phys_memory(struct target *target,
 		uint32_t address, uint32_t size,
-		uint32_t count, uint8_t *buffer)
+		uint32_t count, const uint8_t *buffer)
 {
 	struct arm920t_common *arm920t = target_to_arm920(target);
 
@@ -613,7 +610,7 @@ static int arm920t_write_phys_memory(struct target *target,
 
 /** Writes a buffer, in the specified word size, with current MMU settings. */
 int arm920t_write_memory(struct target *target, uint32_t address,
-		uint32_t size, uint32_t count, uint8_t *buffer)
+		uint32_t size, uint32_t count, const uint8_t *buffer)
 {
 	int retval;
 	const uint32_t cache_mask = ~0x1f; /* cache line size : 32 byte */
@@ -898,7 +895,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
 	uint32_t C15_C_D_Ind, C15_C_I_Ind;
 	int i;
 	FILE *output;
-	struct arm920t_cache_line d_cache[8][64], i_cache[8][64];
 	int segment, index_t;
 	struct reg *r;
 
@@ -908,8 +904,7 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
 
 	if (CMD_ARGC != 1)
 	{
-		command_print(CMD_CTX, "usage: arm920t read_cache <filename>");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	if ((output = fopen(CMD_ARGV[0], "w")) == NULL)
@@ -1007,8 +1002,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
 				return retval;
 			}
 
-			d_cache[segment][index_t].cam = regs[9];
-
 			/* mask LFSR[6] */
 			regs[9] &= 0xfffffffe;
 			fprintf(output, "\nsegment: %i, index: %i, CAM: 0x%8.8"
@@ -1018,7 +1011,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
 
 			for (i = 1; i < 9; i++)
 			{
-				 d_cache[segment][index_t].data[i] = regs[i];
 				 fprintf(output, "%i: 0x%8.8" PRIx32 "\n",
 						i-1, regs[i]);
 			}
@@ -1115,8 +1107,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
 				return retval;
 			}
 
-			i_cache[segment][index_t].cam = regs[9];
-
 			/* mask LFSR[6] */
 			regs[9] &= 0xfffffffe;
 			fprintf(output, "\nsegment: %i, index: %i, "
@@ -1126,7 +1116,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
 
 			for (i = 1; i < 9; i++)
 			{
-				 i_cache[segment][index_t].data[i] = regs[i];
 				 fprintf(output, "%i: 0x%8.8" PRIx32 "\n",
 						i-1, regs[i]);
 			}
@@ -1209,8 +1198,7 @@ COMMAND_HANDLER(arm920t_handle_read_mmu_command)
 
 	if (CMD_ARGC != 1)
 	{
-		command_print(CMD_CTX, "usage: arm920t read_mmu <filename>");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	if ((output = fopen(CMD_ARGV[0], "w")) == NULL)
@@ -1660,8 +1648,7 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
 	}
 	else
 	{
-		command_print(CMD_CTX,
-			"usage: arm920t cp15i <opcode> [value] [address]");
+	    return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	return ERROR_OK;
@@ -1737,6 +1724,7 @@ static const struct command_registration arm920t_exec_command_handlers[] = {
 		.name = "cache_info",
 		.handler = arm920t_handle_cache_info_command,
 		.mode = COMMAND_EXEC,
+		.usage = "",
 		.help = "display information about target caches",
 	},
 	{
@@ -1763,6 +1751,7 @@ const struct command_registration arm920t_command_handlers[] = {
 		.name = "arm920t",
 		.mode = COMMAND_ANY,
 		.help = "arm920t command group",
+		.usage = "",
 		.chain = arm920t_exec_command_handlers,
 	},
 	COMMAND_REGISTRATION_DONE