compile with cygwin (32-bit)

Changed some printf format strings..

[dbrownell@users.sourceforge.net: shrink lines, fix indents]

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 7d7a53837901bd88c030e3252b72a97841c21449..cee55e0cf933053c05623b3d4bb8bbcc39b58af2 100644 (file)
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -1713,13 +1713,13 @@ static int ft2232_execute_sleep(struct jtag_command *cmd)
        int retval;
        retval = ERROR_OK;
 
        int retval;
        retval = ERROR_OK;
 

-       DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
+       DEBUG_JTAG_IO("sleep %" PRIi32, cmd->cmd.sleep->us);

 
        if (ft2232_send_and_recv(first_unsent, cmd) != ERROR_OK)
                                retval = ERROR_JTAG_QUEUE_FAILED;
        first_unsent = cmd->next;
        jtag_sleep(cmd->cmd.sleep->us);
 
        if (ft2232_send_and_recv(first_unsent, cmd) != ERROR_OK)
                                retval = ERROR_JTAG_QUEUE_FAILED;
        first_unsent = cmd->next;
        jtag_sleep(cmd->cmd.sleep->us);

-       DEBUG_JTAG_IO("sleep %i usec while in %s",
+       DEBUG_JTAG_IO("sleep %" PRIi32 " usec while in %s",

                        cmd->cmd.sleep->us,
                        tap_state_name(tap_get_state()));
        return retval;
                        cmd->cmd.sleep->us,
                        tap_state_name(tap_get_state()));
        return retval;

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 931db7487c310e330c5ae8d43dca81ab701b4595..b3d8e158553a1c5b3d69e369798adc05c20dd33c 100644 (file)
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -189,7 +189,9 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
                        uint32_t value;
                        if ((retval = arm966e_read_cp15(target, address, &value)) != ERROR_OK)
                        {
                        uint32_t value;
                        if ((retval = arm966e_read_cp15(target, address, &value)) != ERROR_OK)
                        {

-                               command_print(cmd_ctx, "couldn't access reg %i", address);
+                               command_print(cmd_ctx,
+                                               "couldn't access reg %" PRIi32,
+                                               address);

                                return ERROR_OK;
                        }
                        if ((retval = jtag_execute_queue()) != ERROR_OK)
                                return ERROR_OK;
                        }
                        if ((retval = jtag_execute_queue()) != ERROR_OK)


@@ -197,7 +199,8 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
                                return retval;
                        }
 
                                return retval;
                        }
 

-                       command_print(cmd_ctx, "%i: %8.8" PRIx32 "", address, value);
+                       command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+                                       address, value);

                }
                else if (argc == 2)
                {
                }
                else if (argc == 2)
                {


@@ -205,10 +208,13 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
                        COMMAND_PARSE_NUMBER(u32, args[1], value);
                        if ((retval = arm966e_write_cp15(target, address, value)) != ERROR_OK)
                        {
                        COMMAND_PARSE_NUMBER(u32, args[1], value);
                        if ((retval = arm966e_write_cp15(target, address, value)) != ERROR_OK)
                        {

-                               command_print(cmd_ctx, "couldn't access reg %i", address);
+                               command_print(cmd_ctx,
+                                               "couldn't access reg %" PRIi32,
+                                               address);

                                return ERROR_OK;
                        }
                                return ERROR_OK;
                        }

-                       command_print(cmd_ctx, "%i: %8.8" PRIx32 "", address, value);
+                       command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+                                       address, value);

                }
        }
 
                }
        }
 

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index f2b6ff780e7683c6bb041b64b56f26a54aa66594..f657ddce546c2a106aceef3cb8e46c041a7c73c0 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -235,11 +235,12 @@ bye:
                return retval;
        }
 
                return retval;
        }
 

-       LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32 " of length 0x%8.8x (WPID: %d)",
-                         watchpoint_rw_strings[(*watchpoint_p)->rw],
-                         (*watchpoint_p)->address,
-                         (*watchpoint_p)->length,
-                         (*watchpoint_p)->unique_id );
+       LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32
+                       " of length 0x%8.8" PRIx32 " (WPID: %d)",
+                       watchpoint_rw_strings[(*watchpoint_p)->rw],
+                       (*watchpoint_p)->address,
+                       (*watchpoint_p)->length,
+                       (*watchpoint_p)->unique_id );

 
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }

diff --git a/src/target/target.c b/src/target/target.c
index 85c228a0c97308b97c35d8df5081f11814515f8d..cc8d500f0ccbc1c889da65c1079072f7c03f56df 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2801,13 +2801,15 @@ COMMAND_HANDLER(handle_wp_command)
 
                while (watchpoint)
                {
 
                while (watchpoint)
                {

-                       command_print(cmd_ctx,
-                                                 "address: 0x%8.8" PRIx32 ", len: 0x%8.8x, r/w/a: %i, value: 0x%8.8" PRIx32 ", mask: 0x%8.8" PRIx32 "",
-                                                 watchpoint->address,
-                                                 watchpoint->length,
-                                                 (int)(watchpoint->rw),
-                                                 watchpoint->value,
-                                                 watchpoint->mask);
+                       command_print(cmd_ctx, "address: 0x%8.8" PRIx32
+                                       ", len: 0x%8.8" PRIx32
+                                       ", r/w/a: %i, value: 0x%8.8" PRIx32
+                                       ", mask: 0x%8.8" PRIx32,
+                                       watchpoint->address,
+                                       watchpoint->length,
+                                       (int)watchpoint->rw,
+                                       watchpoint->value,
+                                       watchpoint->mask);

                        watchpoint = watchpoint->next;
                }
                return ERROR_OK;
                        watchpoint = watchpoint->next;
                }
                return ERROR_OK;