Commit f2013029 authored by Bryce Wilkins's avatar Bryce Wilkins Committed by Benjamin Cabé
Browse files

segger: update to SystemView v3.58



Integrate Zephyr changes with Segger SystemView target source v3.58

Signed-off-by: default avatarBryce Wilkins <bryce.wilkins@gmail.com>
parent 29394d37
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
*                        The Embedded Experts                        *
**********************************************************************
*                                                                    *
*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
*                                                                    *
*       www.segger.com     Support: support@segger.com               *
*                                                                    *
@@ -42,7 +42,7 @@
*                                                                    *
**********************************************************************
*                                                                    *
*       SystemView version: 3.40                                    *
*       SystemView version: 3.58                                    *
*                                                                    *
**********************************************************************
----------------------------------------------------------------------
+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
*                        The Embedded Experts                        *
**********************************************************************
*                                                                    *
*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
*                                                                    *
*       www.segger.com     Support: support@segger.com               *
*                                                                    *
@@ -42,7 +42,7 @@
*                                                                    *
**********************************************************************
*                                                                    *
*       SystemView version: 3.40                                    *
*       SystemView version: 3.58                                    *
*                                                                    *
**********************************************************************
---------------------------END-OF-HEADER------------------------------
@@ -177,7 +177,7 @@ Revision: $Rev: 24316 $
                                                  :                                                 \
                                                  );                                                \
                                }
  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__))
  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8_1M_MAIN__))
    #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
      #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
    #endif
+77 −8
Original line number Diff line number Diff line
/*
 * Copyright (c) 2020 Intel Corporation
 *
 * SPDX-License-Identifier: Apache-2.0
/*********************************************************************
*                    SEGGER Microcontroller GmbH                     *
*                        The Embedded Experts                        *
**********************************************************************
*                                                                    *
*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
*                                                                    *
*       www.segger.com     Support: support@segger.com               *
*                                                                    *
**********************************************************************
*                                                                    *
*       SEGGER SystemView * Real-time application analysis           *
*                                                                    *
**********************************************************************
*                                                                    *
* All rights reserved.                                               *
*                                                                    *
* SEGGER strongly recommends to not make any changes                 *
* to or modify the source code of this software in order to stay     *
* compatible with the SystemView and RTT protocol, and J-Link.       *
*                                                                    *
* Redistribution and use in source and binary forms, with or         *
* without modification, are permitted provided that the following    *
* condition is met:                                                  *
*                                                                    *
* o Redistributions of source code must retain the above copyright   *
*   notice, this condition and the following disclaimer.             *
*                                                                    *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF           *
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE           *
* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF      *
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT          *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE  *
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH   *
* DAMAGE.                                                            *
*                                                                    *
**********************************************************************
*                                                                    *
*       SystemView version: 3.58                                    *
*                                                                    *
**********************************************************************
-------------------------- END-OF-HEADER -----------------------------

File    : SEGGER_SYSVIEW_Conf.h
Purpose : SEGGER SystemView configuration file.
          Set defines which deviate from the defaults (see SEGGER_SYSVIEW_ConfDefaults.h) here.
Revision: $Rev: 21292 $

Additional information:
  Required defines which must be set are:
    SEGGER_SYSVIEW_GET_TIMESTAMP
    SEGGER_SYSVIEW_GET_INTERRUPT_ID
  For known compilers and cores, these might be set to good defaults
  in SEGGER_SYSVIEW_ConfDefaults.h.

  SystemView needs a (nestable) locking mechanism.
  If not defined, the RTT locking mechanism is used,
  which then needs to be properly configured.
*/

#ifndef SEGGER_SEGGER_SYSVIEW_CONF_H_
#define SEGGER_SEGGER_SYSVIEW_CONF_H_
#ifndef SEGGER_SYSVIEW_CONF_H
#define SEGGER_SYSVIEW_CONF_H

/*********************************************************************
*
*       Defines, configurable
*
**********************************************************************
*/

#include <stdint.h>

@@ -36,4 +103,6 @@ extern void zephyr_rtt_irq_unlock(unsigned int key);
		zephyr_rtt_irq_unlock(__sysview_irq_key);                                          \
	}

#endif /* SEGGER_SEGGER_SYSVIEW_CONF_H_ */
#endif  // SEGGER_SYSVIEW_CONF_H

/*************************** End of file ****************************/
+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Purpose : Implementation of debug monitor for J-Link monitor mode
        .extern JLINK_MONITOR_OnExit
        .extern JLINK_MONITOR_OnPoll

        .global z_arm_debug_monitor
        .global DebugMon_Handler

/*********************************************************************
*
@@ -168,7 +168,7 @@ Purpose : Implementation of debug monitor for J-Link monitor mode

/*********************************************************************
*
*       z_arm_debug_monitor()
*       DebugMon_Handler()
*
*  Function description
*    Debug monitor handler. CPU enters this handler in case a "halt" request is made from the debugger.
@@ -179,7 +179,7 @@ Purpose : Implementation of debug monitor for J-Link monitor mode
*/
        .thumb_func

z_arm_debug_monitor:
DebugMon_Handler:
        /*
        General procedure:
        DCRDR is used as communication register
+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
*                        The Embedded Experts                        *
**********************************************************************
*                                                                    *
*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
*                                                                    *
*       www.segger.com     Support: support@segger.com               *
*                                                                    *
@@ -42,7 +42,7 @@
*                                                                    *
**********************************************************************
*                                                                    *
*       SystemView version: 3.40                                    *
*       SystemView version: 3.58                                    *
*                                                                    *
**********************************************************************
----------------------------------------------------------------------
Loading