reg_arch_type_t -> struct reg_arch_type

[fw/openocd] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 6346ae03dae35da25b399b134f28c7abf7116569..8932266abb486df3cfb08a700588a37f0cd47c4e 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -559,7 +559,7 @@ static int target_soft_reset_halt_imp(struct target_s *target)
        return target->type->soft_reset_halt_imp(target);
 }
 
-static int target_run_algorithm_imp(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info)
+static int target_run_algorithm_imp(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info)
 {
        if (!target_was_examined(target))
        {
@@ -611,12 +611,12 @@ int target_remove_breakpoint(struct target_s *target,
 }
 
 int target_add_watchpoint(struct target_s *target,
-               struct watchpoint_s *watchpoint)
+               struct watchpoint *watchpoint)
 {
        return target->type->add_watchpoint(target, watchpoint);
 }
 int target_remove_watchpoint(struct target_s *target,
-               struct watchpoint_s *watchpoint)
+               struct watchpoint *watchpoint)
 {
        return target->type->remove_watchpoint(target, watchpoint);
 }
@@ -634,8 +634,8 @@ int target_step(struct target_s *target,
 
 
 int target_run_algorithm(struct target_s *target,
-               int num_mem_params, mem_param_t *mem_params,
-               int num_reg_params, reg_param_t *reg_param,
+               int num_mem_params, struct mem_param *mem_params,
+               int num_reg_params, struct reg_param *reg_param,
                uint32_t entry_point, uint32_t exit_point,
                int timeout_ms, void *arch_info)
 {
@@ -1876,7 +1876,7 @@ COMMAND_HANDLER(handle_reg_command)
        /* list all available registers for the current target */
        if (argc == 0)
        {
-               reg_cache_t *cache = target->reg_cache;
+               struct reg_cache *cache = target->reg_cache;
 
                count = 0;
                while (cache)
@@ -1919,7 +1919,7 @@ COMMAND_HANDLER(handle_reg_command)
                unsigned num;
                COMMAND_PARSE_NUMBER(uint, args[0], num);
 
-               reg_cache_t *cache = target->reg_cache;
+               struct reg_cache *cache = target->reg_cache;
                count = 0;
                while (cache)
                {
@@ -1961,7 +1961,7 @@ COMMAND_HANDLER(handle_reg_command)
 
                if (reg->valid == 0)
                {
-                       reg_arch_type_t *arch_type = register_get_arch_type(reg->arch_type);
+                       struct reg_arch_type *arch_type = register_get_arch_type(reg->arch_type);
                        arch_type->get(reg);
                }
                value = buf_to_str(reg->value, reg->size, 16);
@@ -1976,7 +1976,7 @@ COMMAND_HANDLER(handle_reg_command)
                uint8_t *buf = malloc(CEIL(reg->size, 8));
                str_to_buf(args[1], strlen(args[1]), buf, reg->size, 0);
 
-               reg_arch_type_t *arch_type = register_get_arch_type(reg->arch_type);
+               struct reg_arch_type *arch_type = register_get_arch_type(reg->arch_type);
                arch_type->set(reg, buf);
 
                value = buf_to_str(reg->value, reg->size, 16);
@@ -2797,7 +2797,7 @@ COMMAND_HANDLER(handle_wp_command)
 
        if (argc == 0)
        {
-               watchpoint_t *watchpoint = target->watchpoints;
+               struct watchpoint *watchpoint = target->watchpoints;
 
                while (watchpoint)
                {
@@ -3785,7 +3785,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
                case TCFG_CHAIN_POSITION:
                        if (goi->isconfigure) {
                                Jim_Obj *o;
-                               jtag_tap_t *tap;
+                               struct jtag_tap *tap;
                                target_free_all_working_areas(target);
                                e = Jim_GetOpt_Obj(goi, &o);
                                if (e != JIM_OK) {