mips_ejtag_t -> struct mips_ejtag

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

diff --git a/src/target/mips32.c b/src/target/mips32.c
index f0ec6e4b467edb2387359fa93b781a2844a8d83d..48fb7a3877104dc1d331ad51d9b1d19753475bcc 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -4,7 +4,7 @@
  *                                                                         *
  *   Copyright (C) 2008 by David T.L. Wong                                 *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -38,7 +38,7 @@ char* mips32_core_reg_list[] =
        "status", "lo", "hi", "badvaddr", "cause", "pc"
 };
 
-mips32_core_reg_t mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] =
+struct mips32_core_reg mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] =
 {
        {0, NULL, NULL},
        {1, NULL, NULL},
@@ -98,9 +98,9 @@ int mips32_core_reg_arch_type = -1;
 int mips32_get_core_reg(reg_t *reg)
 {
        int retval;
-       mips32_core_reg_t *mips32_reg = reg->arch_info;
+       struct mips32_core_reg *mips32_reg = reg->arch_info;
        target_t *target = mips32_reg->target;
-       mips32_common_t *mips32_target = target->arch_info;
+       struct mips32_common *mips32_target = target->arch_info;
 
        if (target->state != TARGET_HALTED)
        {
@@ -114,7 +114,7 @@ int mips32_get_core_reg(reg_t *reg)
 
 int mips32_set_core_reg(reg_t *reg, uint8_t *buf)
 {
-       mips32_core_reg_t *mips32_reg = reg->arch_info;
+       struct mips32_core_reg *mips32_reg = reg->arch_info;
        target_t *target = mips32_reg->target;
        uint32_t value = buf_get_u32(buf, 0, 32);
 
@@ -133,10 +133,10 @@ int mips32_set_core_reg(reg_t *reg, uint8_t *buf)
 int mips32_read_core_reg(struct target_s *target, int num)
 {
        uint32_t reg_value;
-       mips32_core_reg_t *mips_core_reg;
+       struct mips32_core_reg *mips_core_reg;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if ((num < 0) || (num >= MIPS32NUMCOREREGS))
                return ERROR_INVALID_ARGUMENTS;
@@ -153,10 +153,10 @@ int mips32_read_core_reg(struct target_s *target, int num)
 int mips32_write_core_reg(struct target_s *target, int num)
 {
        uint32_t reg_value;
-       mips32_core_reg_t *mips_core_reg;
+       struct mips32_core_reg *mips_core_reg;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if ((num < 0) || (num >= MIPS32NUMCOREREGS))
                return ERROR_INVALID_ARGUMENTS;
@@ -174,7 +174,7 @@ int mips32_write_core_reg(struct target_s *target, int num)
 int mips32_invalidate_core_regs(target_t *target)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
        int i;
 
        for (i = 0; i < mips32->core_cache->num_regs; i++)
@@ -189,7 +189,7 @@ int mips32_invalidate_core_regs(target_t *target)
 int mips32_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
        int i;
 
        /* include floating point registers */
@@ -215,8 +215,8 @@ int mips32_save_context(target_t *target)
        int i;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
-       mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       struct mips32_common *mips32 = target->arch_info;
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 
        /* read core registers */
        mips32_pracc_read_regs(ejtag_info, mips32->core_regs);
@@ -237,8 +237,8 @@ int mips32_restore_context(target_t *target)
        int i;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
-       mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       struct mips32_common *mips32 = target->arch_info;
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 
        for (i = 0; i < MIPS32NUMCOREREGS; i++)
        {
@@ -256,7 +256,7 @@ int mips32_restore_context(target_t *target)
 
 int mips32_arch_state(struct target_s *target)
 {
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if (mips32->common_magic != MIPS32_COMMON_MAGIC)
        {
@@ -274,13 +274,13 @@ int mips32_arch_state(struct target_s *target)
 reg_cache_t *mips32_build_reg_cache(target_t *target)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        int num_regs = MIPS32NUMCOREREGS;
        reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
        reg_cache_t *cache = malloc(sizeof(reg_cache_t));
        reg_t *reg_list = malloc(sizeof(reg_t) * num_regs);
-       mips32_core_reg_t *arch_info = malloc(sizeof(mips32_core_reg_t) * num_regs);
+       struct mips32_core_reg *arch_info = malloc(sizeof(struct mips32_core_reg) * num_regs);
        int i;
 
        if (mips32_core_reg_arch_type == -1)
@@ -315,7 +315,7 @@ reg_cache_t *mips32_build_reg_cache(target_t *target)
        return cache;
 }
 
-int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, jtag_tap_t *tap)
+int mips32_init_arch_info(target_t *target, struct mips32_common *mips32, struct jtag_tap *tap)
 {
        target->arch_info = mips32;
        mips32->common_magic = MIPS32_COMMON_MAGIC;
@@ -336,7 +336,7 @@ int mips32_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int mips32_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_params, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info)
+int mips32_run_algorithm(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)
 {
        /*TODO*/
        return ERROR_OK;
@@ -344,7 +344,7 @@ int mips32_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
 
 int mips32_examine(struct target_s *target)
 {
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if (!target_was_examined(target))
        {
@@ -364,7 +364,7 @@ int mips32_examine(struct target_s *target)
 int mips32_configure_break_unit(struct target_s *target)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
        int retval;
        uint32_t dcr, bpinfo;
        int i;
@@ -384,7 +384,7 @@ int mips32_configure_break_unit(struct target_s *target)
 
                mips32->num_inst_bpoints = (bpinfo >> 24) & 0x0F;
                mips32->num_inst_bpoints_avail = mips32->num_inst_bpoints;
-               mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(mips32_comparator_t));
+               mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(struct mips32_comparator));
                for (i = 0; i < mips32->num_inst_bpoints; i++)
                {
                        mips32->inst_break_list[i].reg_address = EJTAG_IBA1 + (0x100 * i);
@@ -403,7 +403,7 @@ int mips32_configure_break_unit(struct target_s *target)
 
                mips32->num_data_bpoints = (bpinfo >> 24) & 0x0F;
                mips32->num_data_bpoints_avail = mips32->num_data_bpoints;
-               mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(mips32_comparator_t));
+               mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(struct mips32_comparator));
                for (i = 0; i < mips32->num_data_bpoints; i++)
                {
                        mips32->data_break_list[i].reg_address = EJTAG_DBA1 + (0x100 * i);