X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm11.c;h=65e078099e0c531f9f243d6619991e76c33a2640;hp=31135e4a752192ccd4a3a42f3ace47eb625863c5;hb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;hpb=a2df544fd9cb758163b049f389c5cc07e97e029f

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 31135e4a75..65e078099e 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -58,8 +58,6 @@ static uint32_t arm11_vcr = 0;
 static bool arm11_config_step_irq_enable = false;
 static bool arm11_config_hardware_step = false;
 
-static int arm11_regs_arch_type = -1;
-
 enum arm11_regtype
 {
 	ARM11_REGISTER_CORE,
@@ -263,7 +261,6 @@ static struct reg arm11_gdb_dummy_fp_reg =
 	.valid = 1,
 	.size = 96,
 	.arch_info = NULL,
-	.arch_type = 0,
 };
 
 static uint8_t arm11_gdb_dummy_fps_value[4];
@@ -276,7 +273,6 @@ static struct reg arm11_gdb_dummy_fps_reg =
 	.valid = 1,
 	.size = 32,
 	.arch_info = NULL,
-	.arch_type = 0,
 };
 
 
@@ -1945,6 +1941,11 @@ static int arm11_set_reg(struct reg *reg, uint8_t *buf)
 	return ERROR_OK;
 }
 
+static const struct reg_arch_type arm11_reg_type = {
+	.get = arm11_get_reg,
+	.set = arm11_set_reg,
+};
+
 static int arm11_build_reg_cache(struct target *target)
 {
 	struct arm11_common *arm11 = target_to_arm11(target);
@@ -1953,9 +1954,6 @@ static int arm11_build_reg_cache(struct target *target)
 	NEW(struct reg,				reg_list,			ARM11_REGCACHE_COUNT);
 	NEW(struct arm11_reg_state,	arm11_reg_states,	ARM11_REGCACHE_COUNT);
 
-	if (arm11_regs_arch_type == -1)
-		arm11_regs_arch_type = register_reg_arch_type(arm11_get_reg, arm11_set_reg);
-
 	register_init_dummy(&arm11_gdb_dummy_fp_reg);
 	register_init_dummy(&arm11_gdb_dummy_fps_reg);
 
@@ -1995,7 +1993,7 @@ static int arm11_build_reg_cache(struct target *target)
 		r->value			= (uint8_t *)(arm11->reg_values + i);
 		r->dirty			= 0;
 		r->valid			= 0;
-		r->arch_type		= arm11_regs_arch_type;
+		r->type = &arm11_reg_type;
 		r->arch_info		= rs;
 
 		rs->def_index		= i;
@@ -2007,16 +2005,16 @@ static int arm11_build_reg_cache(struct target *target)
 
 static COMMAND_HELPER(arm11_handle_bool, bool *var, char *name)
 {
-	if (argc == 0)
+	if (CMD_ARGC == 0)
 	{
 		LOG_INFO("%s is %s.", name, *var ? "enabled" : "disabled");
 		return ERROR_OK;
 	}
 
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	switch (args[0][0])
+	switch (CMD_ARGV[0][0])
 	{
 	case '0':	/* 0 */
 	case 'f':	/* false */
@@ -2054,11 +2052,11 @@ BOOL_WRAPPER(hardware_step,			"hardware single step")
 
 COMMAND_HANDLER(arm11_handle_vcr)
 {
-	switch (argc) {
+	switch (CMD_ARGC) {
 	case 0:
 		break;
 	case 1:
-		COMMAND_PARSE_NUMBER(u32, args[0], arm11_vcr);
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], arm11_vcr);
 		break;
 	default:
 		return ERROR_COMMAND_SYNTAX_ERROR;