gdb_connection_t -> struct gdb_connection

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

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 5576f60f092c0ad8053349c308837fffe698143b..ca7728b01781ed8aa00c8bc7abe19fb723a99862 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -56,7 +56,7 @@ static int arm920t_read_cp15_physical(target_t *target,
 {
        struct arm920t_common_s *arm920t = target_to_arm920(target);
        arm_jtag_t *jtag_info;
-       scan_field_t fields[4];
+       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;
@@ -108,7 +108,7 @@ static int arm920t_write_cp15_physical(target_t *target,
 {
        struct arm920t_common_s *arm920t = target_to_arm920(target);
        arm_jtag_t *jtag_info;
-       scan_field_t fields[4];
+       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;
@@ -157,7 +157,7 @@ static int arm920t_execute_cp15(target_t *target, uint32_t cp15_opcode,
        int retval;
        struct arm920t_common_s *arm920t = target_to_arm920(target);
        arm_jtag_t *jtag_info;
-       scan_field_t fields[4];
+       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;
@@ -620,7 +620,7 @@ int arm920t_soft_reset_halt(struct target_s *target)
        return ERROR_OK;
 }
 
-int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, jtag_tap_t *tap)
+int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, struct jtag_tap *tap)
 {
        arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
        arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
@@ -1203,7 +1203,7 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
 
        if (target->state != TARGET_HALTED)
        {
-               command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+               command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
                return ERROR_OK;
        }
 
@@ -1257,7 +1257,7 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
 
        if (target->state != TARGET_HALTED)
        {
-               command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+               command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
                return ERROR_OK;
        }