X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5.c;h=e7c405c9a2aa3fcb74e39863391c277830b6c33f;hp=0dd047dd1168f0c8dfe69fb42e6b9e191d8dd17f;hb=93459582fd340e4f63efed0fab9abd49a2cb6373;hpb=b1de5eb9a074b362e953e857c42cac9a9b18b2a3 diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index 0dd047dd11..e7c405c9a2 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -32,7 +32,7 @@ #include "binarybuffer.h" -bitfield_desc_t armv4_5_psr_bitfield_desc[] = +struct bitfield_desc armv4_5_psr_bitfield_desc[] = { {"M[4:0]", 5}, {"T", 1}, @@ -80,7 +80,7 @@ char* armv4_5_state_strings[] = int armv4_5_core_reg_arch_type = -1; -armv4_5_core_reg_t armv4_5_core_reg_list_arch_info[] = +struct armv4_5_core_reg armv4_5_core_reg_list_arch_info[] = { {0, ARMV4_5_MODE_ANY, NULL, NULL}, {1, ARMV4_5_MODE_ANY, NULL, NULL}, @@ -170,7 +170,7 @@ reg_t armv4_5_gdb_dummy_fps_reg = int armv4_5_get_core_reg(reg_t *reg) { int retval; - armv4_5_core_reg_t *armv4_5 = reg->arch_info; + struct armv4_5_core_reg *armv4_5 = reg->arch_info; target_t *target = armv4_5->target; if (target->state != TARGET_HALTED) @@ -187,7 +187,7 @@ int armv4_5_get_core_reg(reg_t *reg) int armv4_5_set_core_reg(reg_t *reg, uint8_t *buf) { - armv4_5_core_reg_t *armv4_5 = reg->arch_info; + struct armv4_5_core_reg *armv4_5 = reg->arch_info; target_t *target = armv4_5->target; struct armv4_5_common_s *armv4_5_target = target_to_armv4_5(target); uint32_t value = buf_get_u32(buf, 0, 32); @@ -249,12 +249,12 @@ int armv4_5_invalidate_core_regs(target_t *target) return ERROR_OK; } -reg_cache_t* armv4_5_build_reg_cache(target_t *target, armv4_5_common_t *armv4_5_common) +struct reg_cache* armv4_5_build_reg_cache(target_t *target, armv4_5_common_t *armv4_5_common) { int num_regs = 37; - reg_cache_t *cache = malloc(sizeof(reg_cache_t)); + struct reg_cache *cache = malloc(sizeof(struct reg_cache)); reg_t *reg_list = malloc(sizeof(reg_t) * num_regs); - armv4_5_core_reg_t *arch_info = malloc(sizeof(armv4_5_core_reg_t) * num_regs); + struct armv4_5_core_reg *arch_info = malloc(sizeof(struct armv4_5_core_reg) * num_regs); int i; cache->name = "arm v4/5 registers"; @@ -546,7 +546,7 @@ static int armv4_5_run_algorithm_completion(struct target_s *target, uint32_t ex int armv4_5_run_algorithm_inner(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info, int (*run_it)(struct target_s *target, uint32_t exit_point, int timeout_ms, void *arch_info)) { struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target); - armv4_5_algorithm_t *armv4_5_algorithm_info = arch_info; + struct armv4_5_algorithm *armv4_5_algorithm_info = arch_info; enum armv4_5_state core_state = armv4_5->core_state; enum armv4_5_mode core_mode = armv4_5->core_mode; uint32_t context[17];