target: use unsigned int for timeout_ms

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

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 9ac121ac316be0a058132b6252bb658c91c4281d..8693404d2711ba6aa73489517585666d1616193d 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -7,19 +9,6 @@
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifndef OPENOCD_TARGET_ARMV7M_H
@@ -57,7 +46,7 @@ enum {
        ARMV7M_REGSEL_R14,
        ARMV7M_REGSEL_PC = 15,
 
-       ARMV7M_REGSEL_xPSR = 16,
+       ARMV7M_REGSEL_XPSR = 16,
        ARMV7M_REGSEL_MSP,
        ARMV7M_REGSEL_PSP,
 
@@ -135,7 +124,7 @@ enum {
        ARMV7M_R14 = ARMV7M_REGSEL_R14,
        ARMV7M_PC = ARMV7M_REGSEL_PC,
 
-       ARMV7M_xPSR = ARMV7M_REGSEL_xPSR,
+       ARMV7M_XPSR = ARMV7M_REGSEL_XPSR,
        ARMV7M_MSP = ARMV7M_REGSEL_MSP,
        ARMV7M_PSP = ARMV7M_REGSEL_PSP,
 
@@ -210,7 +199,7 @@ enum {
        /* for convenience add registers' block delimiters */
        ARMV7M_LAST_REG,
        ARMV7M_CORE_FIRST_REG = ARMV7M_R0,
-       ARMV7M_CORE_LAST_REG = ARMV7M_xPSR,
+       ARMV7M_CORE_LAST_REG = ARMV7M_XPSR,
        ARMV7M_FPU_FIRST_REG = ARMV7M_D0,
        ARMV7M_FPU_LAST_REG = ARMV7M_FPSCR,
        ARMV8M_FIRST_REG = ARMV8M_MSP_NS,
@@ -226,12 +215,13 @@ enum {
 
 #define ARMV7M_NUM_CORE_REGS (ARMV7M_CORE_LAST_REG - ARMV7M_CORE_FIRST_REG + 1)
 
-#define ARMV7M_COMMON_MAGIC 0x2A452A45
+#define ARMV7M_COMMON_MAGIC 0x2A452A45U
 
 struct armv7m_common {
+       unsigned int common_magic;
+
        struct arm arm;
 
-       int common_magic;
        int exception_number;
 
        /* AP this processor is connected to in the DAP */
@@ -300,7 +290,7 @@ target_to_armv7m_safe(struct target *target)
 }
 
 struct armv7m_algorithm {
-       int common_magic;
+       unsigned int common_magic;
 
        enum arm_mode core_mode;
 
@@ -324,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,
@@ -335,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);