Clean up many C99 integer types format specifiers

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

diff --git a/src/target/mips32.c b/src/target/mips32.c
index 16988b5a212d6b61399338bcc3b261c0e052bb1f..188e88bfc22471b4dd8d0cd43a578327b237fd2d 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -173,7 +173,8 @@ static int mips32_write_core_reg(struct target *target, int num)
        return ERROR_OK;
 }
 
-int mips32_get_gdb_reg_list(struct target *target, struct reg **reg_list[], int *reg_list_size)
+int mips32_get_gdb_reg_list(struct target *target, struct reg **reg_list[],
+               int *reg_list_size, enum target_register_class reg_class)
 {
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
@@ -472,11 +473,12 @@ int mips32_examine(struct target *target)
 static int mips32_configure_ibs(struct target *target)
 {
        struct mips32_common *mips32 = target_to_mips32(target);
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
        int retval, i;
        uint32_t bpinfo;
 
        /* get number of inst breakpoints */
-       retval = target_read_u32(target, EJTAG_IBS, &bpinfo);
+       retval = target_read_u32(target, ejtag_info->ejtag_ibs_addr, &bpinfo);
        if (retval != ERROR_OK)
                return retval;
 
@@ -487,21 +489,23 @@ static int mips32_configure_ibs(struct target *target)
 
        for (i = 0; i < mips32->num_inst_bpoints; i++)
                mips32->inst_break_list[i].reg_address =
-                       EJTAG_IBA1 + (0x100 * i);
+                       ejtag_info->ejtag_iba0_addr +
+                       (ejtag_info->ejtag_iba_step_size * i);
 
        /* clear IBIS reg */
-       retval = target_write_u32(target, EJTAG_IBS, 0);
+       retval = target_write_u32(target, ejtag_info->ejtag_ibs_addr, 0);
        return retval;
 }
 
 static int mips32_configure_dbs(struct target *target)
 {
        struct mips32_common *mips32 = target_to_mips32(target);
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
        int retval, i;
        uint32_t bpinfo;
 
        /* get number of data breakpoints */
-       retval = target_read_u32(target, EJTAG_DBS, &bpinfo);
+       retval = target_read_u32(target, ejtag_info->ejtag_dbs_addr, &bpinfo);
        if (retval != ERROR_OK)
                return retval;
 
@@ -512,10 +516,11 @@ static int mips32_configure_dbs(struct target *target)
 
        for (i = 0; i < mips32->num_data_bpoints; i++)
                mips32->data_break_list[i].reg_address =
-                       EJTAG_DBA1 + (0x100 * i);
+                       ejtag_info->ejtag_dba0_addr +
+                       (ejtag_info->ejtag_dba_step_size * i);
 
        /* clear DBIS reg */
-       retval = target_write_u32(target, EJTAG_DBS, 0);
+       retval = target_write_u32(target, ejtag_info->ejtag_dbs_addr, 0);
        return retval;
 }
 
@@ -523,6 +528,7 @@ int mips32_configure_break_unit(struct target *target)
 {
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
        int retval;
        uint32_t dcr;
 
@@ -534,6 +540,11 @@ int mips32_configure_break_unit(struct target *target)
        if (retval != ERROR_OK)
                return retval;
 
+       /* EJTAG 2.0 does not specify EJTAG_DCR_IB and EJTAG_DCR_DB bits,
+        * assume IB and DB registers are always present. */
+       if (ejtag_info->ejtag_version == EJTAG_VERSION_20)
+               dcr |= EJTAG_DCR_IB | EJTAG_DCR_DB;
+
        if (dcr & EJTAG_DCR_IB) {
                retval = mips32_configure_ibs(target);
                if (retval != ERROR_OK)
@@ -814,7 +825,7 @@ COMMAND_HANDLER(mips32_handle_scan_delay_command)
        struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 
        if (CMD_ARGC == 1)
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], ejtag_info->scan_delay);
+               COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], ejtag_info->scan_delay);
        else if (CMD_ARGC > 1)
                        return ERROR_COMMAND_SYNTAX_ERROR;