helper/command: change prototype of command_print/command_print_sameline

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

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 88a03952d21bf3dfc60fbcd9b82c465ef7315718..2ecf218fdb76cbdc8722ad5af8511bc67759f37a 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -511,7 +511,7 @@ static int arm920t_verify_pointer(struct command_invocation *cmd,
        struct arm920t_common *arm920t)
 {
        if (arm920t->common_magic != ARM920T_COMMON_MAGIC) {
-               command_print(cmd->ctx, arm920_not);
+               command_print(cmd, arm920_not);
                return ERROR_TARGET_INVALID;
        }
 
@@ -1103,7 +1103,7 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
        /* restore CP15 MMU and Cache settings */
        arm920t_write_cp15_physical(target, CP15PHYS_CTRL, cp15_ctrl_saved);
 
-       command_print(CMD_CTX, "cache content successfully output to %s",
+       command_print(CMD, "cache content successfully output to %s",
                CMD_ARGV[0]);
 
        fclose(output);
@@ -1415,7 +1415,7 @@ COMMAND_HANDLER(arm920t_handle_read_mmu_command)
                        (i_tlb[i].cam & 0x20) ? "(valid)" : "(invalid)");
        }
 
-       command_print(CMD_CTX, "mmu content successfully output to %s",
+       command_print(CMD, "mmu content successfully output to %s",
                CMD_ARGV[0]);
 
        fclose(output);
@@ -1456,7 +1456,7 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                return retval;
 
        if (target->state != TARGET_HALTED) {
-               command_print(CMD_CTX, "target must be stopped for "
+               command_print(CMD, "target must be stopped for "
                        "\"%s\" command", CMD_NAME);
                return ERROR_OK;
        }
@@ -1472,7 +1472,7 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                        uint32_t value;
                        retval = arm920t_read_cp15_physical(target, address, &value);
                        if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
+                               command_print(CMD,
                                        "couldn't access reg %i", address);
                                return ERROR_OK;
                        }
@@ -1480,7 +1480,7 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                        if (retval != ERROR_OK)
                                return retval;
 
-                       command_print(CMD_CTX, "%i: %8.8" PRIx32,
+                       command_print(CMD, "%i: %8.8" PRIx32,
                                address, value);
                } else if (CMD_ARGC == 2)   {
                        uint32_t value;
@@ -1488,12 +1488,12 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                        retval = arm920t_write_cp15_physical(target,
                                        address, value);
                        if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
+                               command_print(CMD,
                                        "couldn't access reg %i", address);
                                /* REVISIT why lie? "return retval"? */
                                return ERROR_OK;
                        }
-                       command_print(CMD_CTX, "%i: %8.8" PRIx32,
+                       command_print(CMD, "%i: %8.8" PRIx32,
                                address, value);
                }
        }
@@ -1513,7 +1513,7 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
 
 
        if (target->state != TARGET_HALTED) {
-               command_print(CMD_CTX, "target must be stopped for "
+               command_print(CMD, "target must be stopped for "
                        "\"%s\" command", CMD_NAME);
                return ERROR_OK;
        }
@@ -1530,14 +1530,14 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
                        retval = arm920t_read_cp15_interpreted(target,
                                        opcode, 0x0, &value);
                        if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
+                               command_print(CMD,
                                        "couldn't execute %8.8" PRIx32,
                                        opcode);
                                /* REVISIT why lie? "return retval"? */
                                return ERROR_OK;
                        }
 
-                       command_print(CMD_CTX, "%8.8" PRIx32 ": %8.8" PRIx32,
+                       command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32,
                                opcode, value);
                } else if (CMD_ARGC == 2) {
                        uint32_t value;
@@ -1545,13 +1545,13 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
                        retval = arm920t_write_cp15_interpreted(target,
                                        opcode, value, 0);
                        if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
+                               command_print(CMD,
                                        "couldn't execute %8.8" PRIx32,
                                        opcode);
                                /* REVISIT why lie? "return retval"? */
                                return ERROR_OK;
                        }
-                       command_print(CMD_CTX, "%8.8" PRIx32 ": %8.8" PRIx32,
+                       command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32,
                                opcode, value);
                } else if (CMD_ARGC == 3) {
                        uint32_t value;
@@ -1561,12 +1561,12 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
                        retval = arm920t_write_cp15_interpreted(target,
                                        opcode, value, address);
                        if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
+                               command_print(CMD,
                                        "couldn't execute %8.8" PRIx32, opcode);
                                /* REVISIT why lie? "return retval"? */
                                return ERROR_OK;
                        }
-                       command_print(CMD_CTX, "%8.8" PRIx32 ": %8.8" PRIx32
+                       command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32
                                " %8.8" PRIx32, opcode, value, address);
                }
        } else