arm_adi_v5: deconflict local variables from global symbols

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

diff --git a/src/target/arm946e.c b/src/target/arm946e.c
index 5c85845d1a74cb115382bbd75514220171eeefbc..c21ff95f734815e2b44d7e9dfc8db44542d07f5c 100644 (file)
--- a/src/target/arm946e.c
+++ b/src/target/arm946e.c
@@ -139,7 +139,7 @@ static int arm946e_read_cp15(struct target *target, int reg_addr, uint32_t *valu
        retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
-       retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->intest_instr, NULL, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
 
@@ -191,7 +191,7 @@ int arm946e_write_cp15(struct target *target, int reg_addr, uint32_t value)
        retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
-       retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->intest_instr, NULL, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
 
@@ -596,7 +596,7 @@ static int jim_arm946e_cp15(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
                if (retval != ERROR_OK)
                        return JIM_ERR;
                char buf[20];
-               sprintf(buf, "0x%08x", value);
+               sprintf(buf, "0x%08" PRIx32, value);
                /* Return value in hex format */
                Jim_SetResultString(interp, buf, -1);
        } else if (argc == 3) {
@@ -643,7 +643,8 @@ COMMAND_HANDLER(arm946e_handle_idcache)
                if (csize == 0)
                        command_print(CMD_CTX, "%s-cache absent", icache ? "I" : "D");
                else
-                       command_print(CMD_CTX, "%s-cache size: %dK, %s", icache ? "I" : "D", csize, bena ? "enabled" : "disabled");
+                       command_print(CMD_CTX, "%s-cache size: %" PRIu32 "K, %s",
+                                     icache ? "I" : "D", csize, bena ? "enabled" : "disabled");
                return ERROR_OK;
        }