target: use unsigned int for timeout_ms

Change the prototype of functions:
- target_run_algorithm()
- target_wait_algorithm()
- target_wait_state()
- struct target_type::run_algorithm()
- struct target_type::wait_algorithm()
to use unsigned int for timeout_ms instead of int.
Change accordingly the variables passed as parameter.

Change-Id: I0b8d6e691bb3c749eeb2911dc5a86c38cc0cb65d
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7562
Tested-by: jenkins

diff --git a/src/flash/nor/rp2040.c b/src/flash/nor/rp2040.c
index 6c18c7b280ba168e068484b60b52fa6903fa36d1..b2ebd9c49ed5a52639a14454f2982a270f28299d 100644 (file)
--- a/src/flash/nor/rp2040.c
+++ b/src/flash/nor/rp2040.c
@@ -91,7 +91,7 @@ static uint32_t rp2040_lookup_symbol(struct target *target, uint32_t tag, uint16
 }
 
 static int rp2040_call_rom_func(struct target *target, struct rp2040_flash_bank *priv,
-               uint16_t func_offset, uint32_t argdata[], unsigned int n_args, int timeout_ms)
+               uint16_t func_offset, uint32_t argdata[], unsigned int n_args, unsigned int timeout_ms)
 {
        char *regnames[4] = { "r0", "r1", "r2", "r3" };
 
@@ -312,7 +312,7 @@ static int rp2040_flash_erase(struct flash_bank *bank, unsigned int first, unsig
        an optional larger "block" (size and command provided in args).
        */
 
-       int timeout_ms = 2000 * (last - first) + 1000;
+       unsigned int timeout_ms = 2000 * (last - first) + 1000;
        err = rp2040_call_rom_func(target, priv, priv->jump_flash_range_erase,
                                                        args, ARRAY_SIZE(args), timeout_ms);
 

diff --git a/src/target/arm.h b/src/target/arm.h
index de46ffb4b90b266fa042f26705e675450944714b..fd61d5f5146c712d186b339330c7c56b13c05fac 100644 (file)
--- a/src/target/arm.h
+++ b/src/target/arm.h
@@ -292,14 +292,14 @@ int armv4_5_run_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
                target_addr_t entry_point, target_addr_t exit_point,
-               int timeout_ms, void *arch_info);
+               unsigned int timeout_ms, void *arch_info);
 int armv4_5_run_algorithm_inner(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
                uint32_t entry_point, uint32_t exit_point,
-               int timeout_ms, void *arch_info,
+               unsigned int timeout_ms, void *arch_info,
                int (*run_it)(struct target *target, uint32_t exit_point,
-                               int timeout_ms, void *arch_info));
+                               unsigned int timeout_ms, void *arch_info));
 
 int arm_checksum_memory(struct target *target,
                target_addr_t address, uint32_t count, uint32_t *checksum);

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 0632290d9867f64669c73811f5fd7308124ca537..f60777dbebba2b43b3ced28e9a3805ff5028c872 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2518,7 +2518,7 @@ static const uint8_t *dcc_buffer;
 
 static int arm7_9_dcc_completion(struct target *target,
        uint32_t exit_point,
-       int timeout_ms,
+       unsigned int timeout_ms,
        void *arch_info)
 {
        int retval = ERROR_OK;

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 9586adc977f78b15c9c87cfc8d11cb0c70a1ac95..f35d67a57e8c00d8bfa4e3be7340a32e6f28eacb 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -1252,7 +1252,7 @@ int arm_get_gdb_reg_list(struct target *target,
 /* wait for execution to complete and check exit point */
 static int armv4_5_run_algorithm_completion(struct target *target,
        uint32_t exit_point,
-       int timeout_ms,
+       unsigned int timeout_ms,
        void *arch_info)
 {
        int retval;
@@ -1286,9 +1286,9 @@ int armv4_5_run_algorithm_inner(struct target *target,
        int num_mem_params, struct mem_param *mem_params,
        int num_reg_params, struct reg_param *reg_params,
        uint32_t entry_point, uint32_t exit_point,
-       int timeout_ms, void *arch_info,
+       unsigned int timeout_ms, void *arch_info,
        int (*run_it)(struct target *target, uint32_t exit_point,
-       int timeout_ms, void *arch_info))
+       unsigned int timeout_ms, void *arch_info))
 {
        struct arm *arm = target_to_arm(target);
        struct arm_algorithm *arm_algorithm_info = arch_info;
@@ -1474,7 +1474,7 @@ int armv4_5_run_algorithm(struct target *target,
        struct reg_param *reg_params,
        target_addr_t entry_point,
        target_addr_t exit_point,
-       int timeout_ms,
+       unsigned int timeout_ms,
        void *arch_info)
 {
        return armv4_5_run_algorithm_inner(target,
@@ -1535,7 +1535,7 @@ int arm_checksum_memory(struct target *target,
        buf_set_u32(reg_params[1].value, 0, 32, count);
 
        /* 20 second timeout/megabyte */
-       int timeout = 20000 * (1 + (count / (1024 * 1024)));
+       unsigned int timeout = 20000 * (1 + (count / (1024 * 1024)));
 
        /* armv4 must exit using a hardware breakpoint */
        if (arm->arch == ARM_ARCH_V4)

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 5745681d4db38fa07c0e37aafc861d935c698227..8c9ff902e5be8b2542518f135055794346281505 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -484,7 +484,7 @@ int armv7m_run_algorithm(struct target *target,
        int num_mem_params, struct mem_param *mem_params,
        int num_reg_params, struct reg_param *reg_params,
        target_addr_t entry_point, target_addr_t exit_point,
-       int timeout_ms, void *arch_info)
+       unsigned int timeout_ms, void *arch_info)
 {
        int retval;
 
@@ -622,7 +622,7 @@ int armv7m_start_algorithm(struct target *target,
 int armv7m_wait_algorithm(struct target *target,
        int num_mem_params, struct mem_param *mem_params,
        int num_reg_params, struct reg_param *reg_params,
-       target_addr_t exit_point, int timeout_ms,
+       target_addr_t exit_point, unsigned int timeout_ms,
        void *arch_info)
 {
        struct armv7m_common *armv7m = target_to_armv7m(target);
@@ -909,7 +909,7 @@ int armv7m_checksum_memory(struct target *target,
        buf_set_u32(reg_params[0].value, 0, 32, address);
        buf_set_u32(reg_params[1].value, 0, 32, count);
 
-       int timeout = 20000 * (1 + (count / (1024 * 1024)));
+       unsigned int timeout = 20000 * (1 + (count / (1024 * 1024)));
 
        retval = target_run_algorithm(target, 0, NULL, 2, reg_params, crc_algorithm->address,
                        crc_algorithm->address + (sizeof(cortex_m_crc_code) - 6),
@@ -1016,7 +1016,7 @@ int armv7m_blank_check_memory(struct target *target,
        buf_set_u32(reg_params[1].value, 0, 32, erased_word);
 
        /* assume CPU clk at least 1 MHz */
-       int timeout = (timed_out ? 30000 : 2000) + total_size * 3 / 1000;
+       unsigned int timeout = (timed_out ? 30000 : 2000) + total_size * 3 / 1000;
 
        retval = target_run_algorithm(target,
                                0, NULL,

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 188bd5652eb502a8828d4169ee1aac8e84089a02..8693404d2711ba6aa73489517585666d1616193d 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -314,7 +314,7 @@ int armv7m_run_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
                target_addr_t entry_point, target_addr_t exit_point,
-               int timeout_ms, void *arch_info);
+               unsigned int timeout_ms, void *arch_info);
 
 int armv7m_start_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
@@ -325,7 +325,7 @@ int armv7m_start_algorithm(struct target *target,
 int armv7m_wait_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
-               target_addr_t exit_point, int timeout_ms,
+               target_addr_t exit_point, unsigned int timeout_ms,
                void *arch_info);
 
 int armv7m_invalidate_core_regs(struct target *target);

diff --git a/src/target/dsp563xx.c b/src/target/dsp563xx.c
index 36ee8537135f5574ae6cbf0a30e3124220641794..8ea2cb61321d0986ed6d590701542b706cb4867c 100644 (file)
--- a/src/target/dsp563xx.c
+++ b/src/target/dsp563xx.c
@@ -1374,7 +1374,7 @@ static int dsp563xx_run_algorithm(struct target *target,
        int num_mem_params, struct mem_param *mem_params,
        int num_reg_params, struct reg_param *reg_params,
        target_addr_t entry_point, target_addr_t exit_point,
-       int timeout_ms, void *arch_info)
+       unsigned int timeout_ms, void *arch_info)
 {
        int i;
        int retval = ERROR_OK;

diff --git a/src/target/mips32.c b/src/target/mips32.c
index f593b5ff5194645b7ee7d6a41f8b868358b4c86d..1a34f737e4ac5e690e57bde4f9771608ba7969d9 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -384,7 +384,7 @@ int mips32_init_arch_info(struct target *target, struct mips32_common *mips32, s
 
 /* run to exit point. return error if exit point was not reached. */
 static int mips32_run_and_wait(struct target *target, target_addr_t entry_point,
-               int timeout_ms, target_addr_t exit_point, struct mips32_common *mips32)
+               unsigned int timeout_ms, target_addr_t exit_point, struct mips32_common *mips32)
 {
        uint32_t pc;
        int retval;
@@ -418,7 +418,7 @@ static int mips32_run_and_wait(struct target *target, target_addr_t entry_point,
 int mips32_run_algorithm(struct target *target, int num_mem_params,
                struct mem_param *mem_params, int num_reg_params,
                struct reg_param *reg_params, target_addr_t entry_point,
-               target_addr_t exit_point, int timeout_ms, void *arch_info)
+               target_addr_t exit_point, unsigned int timeout_ms, void *arch_info)
 {
        struct mips32_common *mips32 = target_to_mips32(target);
        struct mips32_algorithm *mips32_algorithm_info = arch_info;
@@ -803,7 +803,7 @@ int mips32_checksum_memory(struct target *target, target_addr_t address,
        init_reg_param(&reg_params[1], "r5", 32, PARAM_OUT);
        buf_set_u32(reg_params[1].value, 0, 32, count);
 
-       int timeout = 20000 * (1 + (count / (1024 * 1024)));
+       unsigned int timeout = 20000 * (1 + (count / (1024 * 1024)));
 
        retval = target_run_algorithm(target, 0, NULL, 2, reg_params, crc_algorithm->address,
                                      crc_algorithm->address + (sizeof(mips_crc_code) - 4), timeout, &mips32_info);

diff --git a/src/target/mips32.h b/src/target/mips32.h
index 8837da1d08a27b74bb7a5c787d389c5f0b782a27..81b6d649d82aa6fb4c789c6512d813ee679dbb70 100644 (file)
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -400,7 +400,7 @@ int mips32_run_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
                target_addr_t entry_point, target_addr_t exit_point,
-               int timeout_ms, void *arch_info);
+               unsigned int timeout_ms, void *arch_info);
 
 int mips32_configure_break_unit(struct target *target);
 

diff --git a/src/target/mips64.c b/src/target/mips64.c
index 773b92d7335db9159efd69c06b1f6717bdcac39a..37f36855cb6416d2992423f95c9ebb2313be7c24 100644 (file)
--- a/src/target/mips64.c
+++ b/src/target/mips64.c
@@ -459,7 +459,7 @@ int mips64_init_arch_info(struct target *target, struct mips64_common *mips64,
 int mips64_run_algorithm(struct target *target, int num_mem_params,
                         struct mem_param *mem_params, int num_reg_params,
                         struct reg_param *reg_params, target_addr_t entry_point,
-                        target_addr_t exit_point, int timeout_ms, void *arch_info)
+                        target_addr_t exit_point, unsigned int timeout_ms, void *arch_info)
 {
        /* TODO */
        return ERROR_OK;

diff --git a/src/target/mips64.h b/src/target/mips64.h
index 9079c8013de21c1177a0c7ccb50fba978fffc07e..ae0811c54718e3038480cc9e0ef331a16d1652c6 100644 (file)
--- a/src/target/mips64.h
+++ b/src/target/mips64.h
@@ -213,7 +213,7 @@ int mips64_build_reg_cache(struct target *target);
 int mips64_run_algorithm(struct target *target, int num_mem_params, struct mem_param *mem_params,
        int num_reg_params, struct reg_param *reg_params,
        target_addr_t entry_point, target_addr_t exit_point,
-       int timeout_ms, void *arch_info);
+       unsigned int timeout_ms, void *arch_info);
 int mips64_configure_break_unit(struct target *target);
 int mips64_enable_interrupts(struct target *target, bool enable);
 int mips64_examine(struct target *target);

diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 865abd08021aa8e9295eace4954db9faed1ecb41..48391786dcbd907322e4e3dadea210afb1422781 100644 (file)
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -1830,7 +1830,7 @@ static int riscv_arch_state(struct target *target)
 static int riscv_run_algorithm(struct target *target, int num_mem_params,
                struct mem_param *mem_params, int num_reg_params,
                struct reg_param *reg_params, target_addr_t entry_point,
-               target_addr_t exit_point, int timeout_ms, void *arch_info)
+               target_addr_t exit_point, unsigned int timeout_ms, void *arch_info)
 {
        RISCV_INFO(info);
 
@@ -2052,7 +2052,7 @@ static int riscv_checksum_memory(struct target *target,
        buf_set_u64(reg_params[1].value, 0, xlen, count);
 
        /* 20 second timeout/megabyte */
-       int timeout = 20000 * (1 + (count / (1024 * 1024)));
+       unsigned int timeout = 20000 * (1 + (count / (1024 * 1024)));
 
        retval = target_run_algorithm(target, 0, NULL, 2, reg_params,
                        crc_algorithm->address,

diff --git a/src/target/stm8.c b/src/target/stm8.c
index 9fd65091cefba697bd8512f061c79eaaed9d9d85..91a59d79cfcbd0a6b57e15ed984471813a807444 100644 (file)
--- a/src/target/stm8.c
+++ b/src/target/stm8.c
@@ -1784,7 +1784,7 @@ static int stm8_checksum_memory(struct target *target, target_addr_t address,
 
 /* run to exit point. return error if exit point was not reached. */
 static int stm8_run_and_wait(struct target *target, uint32_t entry_point,
-               int timeout_ms, uint32_t exit_point, struct stm8_common *stm8)
+               unsigned int timeout_ms, uint32_t exit_point, struct stm8_common *stm8)
 {
        uint32_t pc;
        int retval;
@@ -1819,7 +1819,7 @@ static int stm8_run_and_wait(struct target *target, uint32_t entry_point,
 static int stm8_run_algorithm(struct target *target, int num_mem_params,
                struct mem_param *mem_params, int num_reg_params,
                struct reg_param *reg_params, target_addr_t entry_point,
-               target_addr_t exit_point, int timeout_ms, void *arch_info)
+               target_addr_t exit_point, unsigned int timeout_ms, void *arch_info)
 {
        struct stm8_common *stm8 = target_to_stm8(target);
 

diff --git a/src/target/target.c b/src/target/target.c
index 12cfeb5284bcdac8c3239d16c77e0abb8527235b..0099292119f8041f6f8e938806ac2cefd0bb2cf4 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -809,7 +809,7 @@ int target_run_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_param,
                target_addr_t entry_point, target_addr_t exit_point,
-               int timeout_ms, void *arch_info)
+               unsigned int timeout_ms, void *arch_info)
 {
        int retval = ERROR_FAIL;
 
@@ -893,7 +893,7 @@ done:
 int target_wait_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
-               target_addr_t exit_point, int timeout_ms,
+               target_addr_t exit_point, unsigned int timeout_ms,
                void *arch_info)
 {
        int retval = ERROR_FAIL;
@@ -3229,7 +3229,7 @@ COMMAND_HANDLER(handle_wait_halt_command)
  *
  * After 500ms, keep_alive() is invoked
  */
-int target_wait_state(struct target *target, enum target_state state, int ms)
+int target_wait_state(struct target *target, enum target_state state, unsigned int ms)
 {
        int retval;
        int64_t then = 0, cur;
@@ -5785,8 +5785,8 @@ COMMAND_HANDLER(handle_target_wait_state)
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
-       int a;
-       COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], a);
+       unsigned int a;
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], a);
 
        struct target *target = get_current_target(CMD_CTX);
        if (!target->tap->enabled) {

diff --git a/src/target/target.h b/src/target/target.h
index 00bf43c58bdbe19338f5f7a0e3f12ed2ba2f95d3..2a2f5315ff7e8d806fc22eec17297ef109ec01f6 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -547,7 +547,7 @@ int target_run_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_param,
                target_addr_t entry_point, target_addr_t exit_point,
-               int timeout_ms, void *arch_info);
+               unsigned int timeout_ms, void *arch_info);
 
 /**
  * Starts an algorithm in the background on the @a target given.
@@ -568,7 +568,7 @@ int target_start_algorithm(struct target *target,
 int target_wait_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
-               target_addr_t exit_point, int timeout_ms,
+               target_addr_t exit_point, unsigned int timeout_ms,
                void *arch_info);
 
 /**
@@ -660,7 +660,7 @@ int target_checksum_memory(struct target *target,
 int target_blank_check_memory(struct target *target,
                struct target_memory_check_block *blocks, int num_blocks,
                uint8_t erased_value);
-int target_wait_state(struct target *target, enum target_state state, int ms);
+int target_wait_state(struct target *target, enum target_state state, unsigned int ms);
 
 /**
  * Obtain file-I/O information from target for GDB to do syscall.

diff --git a/src/target/target_type.h b/src/target/target_type.h
index 5186e9c19bc7d4e8907af17de291ebc3b67d7009..678ce0f466ec0e30f4d257292430d714dddc842a 100644 (file)
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -181,7 +181,7 @@ struct target_type {
        int (*run_algorithm)(struct target *target, int num_mem_params,
                        struct mem_param *mem_params, int num_reg_params,
                        struct reg_param *reg_param, target_addr_t entry_point,
-                       target_addr_t exit_point, int timeout_ms, void *arch_info);
+                       target_addr_t exit_point, unsigned int timeout_ms, void *arch_info);
        int (*start_algorithm)(struct target *target, int num_mem_params,
                        struct mem_param *mem_params, int num_reg_params,
                        struct reg_param *reg_param, target_addr_t entry_point,
@@ -189,7 +189,7 @@ struct target_type {
        int (*wait_algorithm)(struct target *target, int num_mem_params,
                        struct mem_param *mem_params, int num_reg_params,
                        struct reg_param *reg_param, target_addr_t exit_point,
-                       int timeout_ms, void *arch_info);
+                       unsigned int timeout_ms, void *arch_info);
 
        const struct command_registration *commands;