openocd: remove CamelCase symbols *xPSR*

[fw/openocd] / src / rtos / zephyr.c

diff --git a/src/rtos/zephyr.c b/src/rtos/zephyr.c
index a5967355706e90764ab68ca02129cf2486749d55..5f7795337191f982eba51abb16f691946c24c501 100644 (file)
--- a/src/rtos/zephyr.c
+++ b/src/rtos/zephyr.c
@@ -1,11 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2017 by Intel Corporation
  *   Leandro Pereira <leandro.pereira@intel.com>
  *   Daniel Glöckner <dg@emlix.com>*
  *   Copyright (C) 2021 by Synopsys, Inc.
  *   Evgeniy Didin <didin@synopsys.com>
- *                                                                         *
- *   SPDX-License-Identifier: GPL-2.0-or-later                             *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -136,7 +136,7 @@ static const struct stack_register_offset arm_cpu_saved[] = {
        { ARMV7M_R13,  -2, 32 },
        { ARMV7M_R14,  20, 32 },
        { ARMV7M_PC,   24, 32 },
-       { ARMV7M_xPSR, 28, 32 },
+       { ARMV7M_XPSR, 28, 32 },
 };
 
 static struct stack_register_offset arc_cpu_saved[] = {
@@ -189,9 +189,9 @@ enum zephyr_symbol_values {
        ZEPHYR_VAL_COUNT
 };
 
-static int64_t zephyr_cortex_m_stack_align(struct target *target,
+static target_addr_t zephyr_cortex_m_stack_align(struct target *target,
                const uint8_t *stack_data,
-               const struct rtos_register_stacking *stacking, int64_t stack_ptr)
+               const struct rtos_register_stacking *stacking, target_addr_t stack_ptr)
 {
        return rtos_cortex_m_stack_align(target, stack_data, stacking,
                        stack_ptr, ARM_XPSR_OFFSET);
@@ -375,15 +375,15 @@ static const struct symbol_table_elem zephyr_symbol_list[] = {
                .optional = false
        },
        {
-               .symbol_name = "_kernel_openocd_offsets",
+               .symbol_name = "_kernel_thread_info_offsets",
                .optional = false
        },
        {
-               .symbol_name = "_kernel_openocd_size_t_size",
+               .symbol_name = "_kernel_thread_info_size_t_size",
                .optional = false
        },
        {
-               .symbol_name = "_kernel_openocd_num_offsets",
+               .symbol_name = "_kernel_thread_info_num_offsets",
                .optional = true
        },
        {