projects / fw / openocd / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
target_t -> struct target
[fw/openocd] / src / target / arm920t.c
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 9fe8fc4f66fb5d3e2f8685b20207e0b50fcd121b..577bf26e8ece1ec5f930a809676351e62fd8f5d9 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -51,12 +51,12 @@
 
 #define ARM920T_CP15_PHYS_ADDR(x, y, z) ((x << 5) | (y << 1) << (z))
 
-static int arm920t_read_cp15_physical(target_t *target,
+static int arm920t_read_cp15_physical(struct target *target,
                int reg_addr, uint32_t *value)
 {
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
-       arm_jtag_t *jtag_info;
-       scan_field_t fields[4];
+       struct arm920t_common *arm920t = target_to_arm920(target);
+       struct arm_jtag *jtag_info;
+       struct scan_field fields[4];
        uint8_t access_type_buf = 1;
        uint8_t reg_addr_buf = reg_addr & 0x3f;
        uint8_t nr_w_buf = 0;
@@ -103,12 +103,12 @@ static int arm920t_read_cp15_physical(target_t *target,
        return ERROR_OK;
 }
 
-static int arm920t_write_cp15_physical(target_t *target,
+static int arm920t_write_cp15_physical(struct target *target,
                int reg_addr, uint32_t value)
 {
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
-       arm_jtag_t *jtag_info;
-       scan_field_t fields[4];
+       struct arm920t_common *arm920t = target_to_arm920(target);
+       struct arm_jtag *jtag_info;
+       struct scan_field fields[4];
        uint8_t access_type_buf = 1;
        uint8_t reg_addr_buf = reg_addr & 0x3f;
        uint8_t nr_w_buf = 1;
@@ -151,13 +151,13 @@ static int arm920t_write_cp15_physical(target_t *target,
        return ERROR_OK;
 }
 
-static int arm920t_execute_cp15(target_t *target, uint32_t cp15_opcode,
+static int arm920t_execute_cp15(struct target *target, uint32_t cp15_opcode,
                uint32_t arm_opcode)
 {
        int retval;
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
-       arm_jtag_t *jtag_info;
-       scan_field_t fields[4];
+       struct arm920t_common *arm920t = target_to_arm920(target);
+       struct arm_jtag *jtag_info;
+       struct scan_field fields[4];
        uint8_t access_type_buf = 0;            /* interpreted access */
        uint8_t reg_addr_buf = 0x0;
        uint8_t nr_w_buf = 0;
@@ -208,7 +208,7 @@ static int arm920t_execute_cp15(target_t *target, uint32_t cp15_opcode,
        return ERROR_OK;
 }
 
-static int arm920t_read_cp15_interpreted(target_t *target,
+static int arm920t_read_cp15_interpreted(struct target *target,
                uint32_t cp15_opcode, uint32_t address, uint32_t *value)
 {
        struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
@@ -253,7 +253,7 @@ static int arm920t_read_cp15_interpreted(target_t *target,
 }
 
 static
-int arm920t_write_cp15_interpreted(target_t *target,
+int arm920t_write_cp15_interpreted(struct target *target,
                uint32_t cp15_opcode, uint32_t value, uint32_t address)
 {
        uint32_t cp15c15 = 0x0;
@@ -293,7 +293,7 @@ int arm920t_write_cp15_interpreted(target_t *target,
 }
 
 // EXPORTED to FA256
-uint32_t arm920t_get_ttb(target_t *target)
+uint32_t arm920t_get_ttb(struct target *target)
 {
        int retval;
        uint32_t ttb = 0x0;
@@ -305,7 +305,7 @@ uint32_t arm920t_get_ttb(target_t *target)
 }
 
 // EXPORTED to FA256
-void arm920t_disable_mmu_caches(target_t *target, int mmu, int d_u_cache, int i_cache)
+void arm920t_disable_mmu_caches(struct target *target, int mmu, int d_u_cache, int i_cache)
 {
        uint32_t cp15_control;
 
@@ -326,7 +326,7 @@ void arm920t_disable_mmu_caches(target_t *target, int mmu, int d_u_cache, int i_
 }
 
 // EXPORTED to FA256
-void arm920t_enable_mmu_caches(target_t *target, int mmu, int d_u_cache, int i_cache)
+void arm920t_enable_mmu_caches(struct target *target, int mmu, int d_u_cache, int i_cache)
 {
        uint32_t cp15_control;
 
@@ -347,10 +347,10 @@ void arm920t_enable_mmu_caches(target_t *target, int mmu, int d_u_cache, int i_c
 }
 
 // EXPORTED to FA256
-void arm920t_post_debug_entry(target_t *target)
+void arm920t_post_debug_entry(struct target *target)
 {
        uint32_t cp15c15;
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct arm920t_common *arm920t = target_to_arm920(target);
 
        /* examine cp15 control reg */
        arm920t_read_cp15_physical(target, 0x2, &arm920t->cp15_control_reg);
@@ -391,10 +391,10 @@ void arm920t_post_debug_entry(target_t *target)
 }
 
 // EXPORTED to FA256
-void arm920t_pre_restore_context(target_t *target)
+void arm920t_pre_restore_context(struct target *target)
 {
        uint32_t cp15c15;
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct arm920t_common *arm920t = target_to_arm920(target);
 
        /* restore i/d fault status and address register */
        arm920t_write_cp15_interpreted(target, 0xee050f10, arm920t->d_fsr, 0x0);
@@ -416,7 +416,7 @@ void arm920t_pre_restore_context(target_t *target)
 static const char arm920_not[] = "target is not an ARM920";
 
 static int arm920t_verify_pointer(struct command_context_s *cmd_ctx,
-               struct arm920t_common_s *arm920t)
+               struct arm920t_common *arm920t)
 {
        if (arm920t->common_magic != ARM920T_COMMON_MAGIC) {
                command_print(cmd_ctx, arm920_not);
@@ -427,14 +427,14 @@ static int arm920t_verify_pointer(struct command_context_s *cmd_ctx,
 }
 
 /** Logs summary of ARM920 state for a halted target. */
-int arm920t_arch_state(struct target_s *target)
+int arm920t_arch_state(struct target *target)
 {
        static const char *state[] =
        {
                "disabled", "enabled"
        };
 
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct arm920t_common *arm920t = target_to_arm920(target);
        struct armv4_5_common_s *armv4_5;
 
        if (arm920t->common_magic != ARM920T_COMMON_MAGIC)
@@ -460,7 +460,7 @@ int arm920t_arch_state(struct target_s *target)
        return ERROR_OK;
 }
 
-static int arm920_mmu(struct target_s *target, int *enabled)
+static int arm920_mmu(struct target *target, int *enabled)
 {
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("%s: target not halted", __func__);
@@ -471,7 +471,7 @@ static int arm920_mmu(struct target_s *target, int *enabled)
        return ERROR_OK;
 }
 
-static int arm920_virt2phys(struct target_s *target,
+static int arm920_virt2phys(struct target *target,
                uint32_t virt, uint32_t *phys)
 {
        /** @todo Implement this!  */
@@ -480,7 +480,7 @@ static int arm920_virt2phys(struct target_s *target,
 }
 
 /** Reads a buffer, in the specified word size, with current MMU settings. */
-int arm920t_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+int arm920t_read_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        int retval;
 
@@ -490,21 +490,21 @@ int arm920t_read_memory(struct target_s *target, uint32_t address, uint32_t size
 }
 
 
-static int arm920t_read_phys_memory(struct target_s *target,
+static int arm920t_read_phys_memory(struct target *target,
                uint32_t address, uint32_t size,
                uint32_t count, uint8_t *buffer)
 {
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct arm920t_common *arm920t = target_to_arm920(target);
 
        return armv4_5_mmu_read_physical(target, &arm920t->armv4_5_mmu,
                        address, size, count, buffer);
 }
 
-static int arm920t_write_phys_memory(struct target_s *target,
+static int arm920t_write_phys_memory(struct target *target,
                uint32_t address, uint32_t size,
                uint32_t count, uint8_t *buffer)
 {
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct arm920t_common *arm920t = target_to_arm920(target);
 
        return armv4_5_mmu_write_physical(target, &arm920t->armv4_5_mmu,
                        address, size, count, buffer);
@@ -512,7 +512,7 @@ static int arm920t_write_phys_memory(struct target_s *target,
 
 
 /** Writes a buffer, in the specified word size, with current MMU settings. */
-int arm920t_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+int arm920t_write_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        int retval;
 
@@ -525,7 +525,7 @@ int arm920t_write_memory(struct target_s *target, uint32_t address, uint32_t siz
         */
        if (((size == 4) || (size == 2)) && (count == 1))
        {
-               struct arm920t_common_s *arm920t = target_to_arm920(target);
+               struct arm920t_common *arm920t = target_to_arm920(target);
 
                if (arm920t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled)
                {
@@ -549,13 +549,13 @@ int arm920t_write_memory(struct target_s *target, uint32_t address, uint32_t siz
 }
 
 // EXPORTED to FA256
-int arm920t_soft_reset_halt(struct target_s *target)
+int arm920t_soft_reset_halt(struct target *target)
 {
        int retval = ERROR_OK;
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
-       struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
+       struct arm920t_common *arm920t = target_to_arm920(target);
+       struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
        struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
-       reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
+       struct reg *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
 
        if ((retval = target_halt(target)) != ERROR_OK)
        {
@@ -620,10 +620,10 @@ int arm920t_soft_reset_halt(struct target_s *target)
        return ERROR_OK;
 }
 
-int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, struct jtag_tap *tap)
+int arm920t_init_arch_info(struct target *target, struct arm920t_common *arm920t, struct jtag_tap *tap)
 {
-       arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
-       arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
+       struct arm9tdmi_common *arm9tdmi = &arm920t->arm9tdmi_common;
+       struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
 
        /* initialize arm9tdmi specific info (including arm7_9 and armv4_5)
         */
@@ -655,9 +655,9 @@ int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, struct j
        return ERROR_OK;
 }
 
-static int arm920t_target_create(struct target_s *target, Jim_Interp *interp)
+static int arm920t_target_create(struct target *target, Jim_Interp *interp)
 {
-       arm920t_common_t *arm920t = calloc(1,sizeof(arm920t_common_t));
+       struct arm920t_common *arm920t = calloc(1,sizeof(struct arm920t_common));
 
        return arm920t_init_arch_info(target, arm920t, target->tap);
 }
@@ -665,9 +665,9 @@ static int arm920t_target_create(struct target_s *target, Jim_Interp *interp)
 COMMAND_HANDLER(arm920t_handle_read_cache_command)
 {
        int retval = ERROR_OK;
-       target_t *target = get_current_target(cmd_ctx);
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
-       struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
+       struct target *target = get_current_target(cmd_ctx);
+       struct arm920t_common *arm920t = target_to_arm920(target);
+       struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
        struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
        uint32_t cp15c15;
        uint32_t cp15_ctrl, cp15_ctrl_saved;
@@ -676,7 +676,7 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
        uint32_t C15_C_D_Ind, C15_C_I_Ind;
        int i;
        FILE *output;
-       arm920t_cache_line_t d_cache[8][64], i_cache[8][64];
+       struct arm920t_cache_line d_cache[8][64], i_cache[8][64];
        int segment, index;
 
        retval = arm920t_verify_pointer(cmd_ctx, arm920t);
@@ -911,9 +911,9 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
 COMMAND_HANDLER(arm920t_handle_read_mmu_command)
 {
        int retval = ERROR_OK;
-       target_t *target = get_current_target(cmd_ctx);
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
-       struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
+       struct target *target = get_current_target(cmd_ctx);
+       struct arm920t_common *arm920t = target_to_arm920(target);
+       struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
        struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
        uint32_t cp15c15;
        uint32_t cp15_ctrl, cp15_ctrl_saved;
@@ -922,7 +922,7 @@ COMMAND_HANDLER(arm920t_handle_read_mmu_command)
        int i;
        FILE *output;
        uint32_t Dlockdown, Ilockdown;
-       arm920t_tlb_entry_t d_tlb[64], i_tlb[64];
+       struct arm920t_tlb_entry d_tlb[64], i_tlb[64];
        int victim;
 
        retval = arm920t_verify_pointer(cmd_ctx, arm920t);
@@ -1194,8 +1194,8 @@ COMMAND_HANDLER(arm920t_handle_read_mmu_command)
 COMMAND_HANDLER(arm920t_handle_cp15_command)
 {
        int retval;
-       target_t *target = get_current_target(cmd_ctx);
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct target *target = get_current_target(cmd_ctx);
+       struct arm920t_common *arm920t = target_to_arm920(target);
 
        retval = arm920t_verify_pointer(cmd_ctx, arm920t);
        if (retval != ERROR_OK)
@@ -1247,8 +1247,8 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
 COMMAND_HANDLER(arm920t_handle_cp15i_command)
 {
        int retval;
-       target_t *target = get_current_target(cmd_ctx);
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct target *target = get_current_target(cmd_ctx);
+       struct arm920t_common *arm920t = target_to_arm920(target);
 
        retval = arm920t_verify_pointer(cmd_ctx, arm920t);
        if (retval != ERROR_OK)
@@ -1314,8 +1314,8 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
 COMMAND_HANDLER(arm920t_handle_cache_info_command)
 {
        int retval;
-       target_t *target = get_current_target(cmd_ctx);
-       struct arm920t_common_s *arm920t = target_to_arm920(target);
+       struct target *target = get_current_target(cmd_ctx);
+       struct arm920t_common *arm920t = target_to_arm920(target);
 
        retval = arm920t_verify_pointer(cmd_ctx, arm920t);
        if (retval != ERROR_OK)
@@ -1325,7 +1325,7 @@ COMMAND_HANDLER(arm920t_handle_cache_info_command)
 }
 
 
-static int arm920t_mrc(target_t *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
+static int arm920t_mrc(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
 {
        if (cpnum!=15)
        {
@@ -1336,7 +1336,7 @@ static int arm920t_mrc(target_t *target, int cpnum, uint32_t op1, uint32_t op2,
        return arm920t_read_cp15_interpreted(target, mrc_opcode(cpnum, op1, op2, CRn, CRm), 0, value);
 }
 
-static int arm920t_mcr(target_t *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
+static int arm920t_mcr(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
 {
        if (cpnum!=15)
        {
@@ -1380,7 +1380,7 @@ int arm920t_register_commands(struct command_context_s *cmd_ctx)
 }
 
 /** Holds methods for ARM920 targets. */
-target_type_t arm920t_target =
+struct target_type arm920t_target =
 {
        .name = "arm920t",
 
openocd with support for Altus Metrum targets