More MinGW C99 printf compliance

[openocd.git] / src / target / arm11.h

diff --git a/src/target/arm11.h b/src/target/arm11.h
index d5071b20641717979d81e8c4cd4872a8baac3b8e..9afff23d7ce6be7a3775877cef12cf0794dee8df 100644 (file)
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -33,8 +33,9 @@
        type * variable = calloc(1, sizeof(type) * items)
 
 /* For MinGW use 'I' prefix to print size_t (instead of 'z') */
+/* Except if __USE_MINGW_ANSI_STDIO is defined with MinGW    */
 
-#ifndef __MSVCRT__
+#if (!defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO))
 #define ZU             "%zu"
 #else
 #define ZU             "%Iu"
@@ -98,10 +99,6 @@ typedef struct arm11_common_s
        uint32_t                last_dscr;              /**< Last retrieved DSCR value;
                                                             Use only for debug message generation              */
 
-       bool    trst_active;
-       bool    halt_requested;                                 /**< Keep track if arm11_halt() calls occured
-                                                                                                during reset. Otherwise do it ASAP. */
-
        bool    simulate_reset_on_next_halt;    /**< Perform cleanups of the ARM state on next halt */
 
        /** \name Shadow registers to save processor state */
@@ -247,23 +244,23 @@ void arm11_dump_reg_changes(arm11_common_t * arm11);
 
 void arm11_setup_field                 (arm11_common_t * arm11, int num_bits, void * in_data, void * out_data, scan_field_t * field);
 void arm11_add_IR                              (arm11_common_t * arm11, uint8_t instr, tap_state_t state);
-void arm11_add_debug_SCAN_N            (arm11_common_t * arm11, uint8_t chain, tap_state_t state);
+int arm11_add_debug_SCAN_N             (arm11_common_t * arm11, uint8_t chain, tap_state_t state);
 void arm11_add_debug_INST              (arm11_common_t * arm11, uint32_t inst, uint8_t * flag, tap_state_t state);
 int arm11_read_DSCR                            (arm11_common_t * arm11, uint32_t *dscr);
 int arm11_write_DSCR                   (arm11_common_t * arm11, uint32_t dscr);
 
 enum target_debug_reason arm11_get_DSCR_debug_reason(uint32_t dscr);
 
-void arm11_run_instr_data_prepare                      (arm11_common_t * arm11);
-void arm11_run_instr_data_finish                       (arm11_common_t * arm11);
+int arm11_run_instr_data_prepare                       (arm11_common_t * arm11);
+int arm11_run_instr_data_finish                                (arm11_common_t * arm11);
 int arm11_run_instr_no_data                                    (arm11_common_t * arm11, uint32_t * opcode, size_t count);
-void arm11_run_instr_no_data1                          (arm11_common_t * arm11, uint32_t opcode);
+int arm11_run_instr_no_data1                           (arm11_common_t * arm11, uint32_t opcode);
 int arm11_run_instr_data_to_core                       (arm11_common_t * arm11, uint32_t opcode, uint32_t * data, size_t count);
 int arm11_run_instr_data_to_core_noack         (arm11_common_t * arm11, uint32_t opcode, uint32_t * data, size_t count);
 int arm11_run_instr_data_to_core1                      (arm11_common_t * arm11, uint32_t opcode, uint32_t data);
 int arm11_run_instr_data_from_core                     (arm11_common_t * arm11, uint32_t opcode, uint32_t * data, size_t count);
-void arm11_run_instr_data_from_core_via_r0     (arm11_common_t * arm11, uint32_t opcode, uint32_t * data);
-void arm11_run_instr_data_to_core_via_r0       (arm11_common_t * arm11, uint32_t opcode, uint32_t data);
+int arm11_run_instr_data_from_core_via_r0      (arm11_common_t * arm11, uint32_t opcode, uint32_t * data);
+int arm11_run_instr_data_to_core_via_r0        (arm11_common_t * arm11, uint32_t opcode, uint32_t data);
 
 int arm11_add_dr_scan_vc(int num_fields, scan_field_t *fields, tap_state_t state);
 int arm11_add_ir_scan_vc(int num_fields, scan_field_t *fields, tap_state_t state);