Skip to content

Commit 7205ccf

Browse files
brycewilkinsbrycewilkins
committed
segger: update to SystemView v3.58
Integrate Zephyr changes with Segger SystemView target source v3.58 Signed-off-by: Bryce Wilkins <[email protected]>
1 parent f0d6dbf commit 7205ccf

16 files changed

+670
-175
lines changed

‎Config/Global.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* The Embedded Experts *
44
**********************************************************************
55
* *
6-
* (c) 1995 - 2021 SEGGER Microcontroller GmbH *
6+
* (c) 1995 - 2024 SEGGER Microcontroller GmbH *
77
* *
88
* www.segger.com Support: [email protected] *
99
* *
@@ -42,7 +42,7 @@
4242
* *
4343
**********************************************************************
4444
* *
45-
* SystemView version: 3.40 *
45+
* SystemView version: 3.58 *
4646
* *
4747
**********************************************************************
4848
----------------------------------------------------------------------

‎Config/SEGGER_RTT_Conf.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* The Embedded Experts *
44
**********************************************************************
55
* *
6-
* (c) 1995 - 2021 SEGGER Microcontroller GmbH *
6+
* (c) 1995 - 2024 SEGGER Microcontroller GmbH *
77
* *
88
* www.segger.com Support: [email protected] *
99
* *
@@ -42,7 +42,7 @@
4242
* *
4343
**********************************************************************
4444
* *
45-
* SystemView version: 3.40 *
45+
* SystemView version: 3.58 *
4646
* *
4747
**********************************************************************
4848
---------------------------END-OF-HEADER------------------------------
@@ -177,7 +177,7 @@ Revision: $Rev: 24316 $
177177
: \
178178
); \
179179
}
180-
#elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__))
180+
#elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8_1M_MAIN__))
181181
#ifndef SEGGER_RTT_MAX_INTERRUPT_PRIORITY
182182
#define SEGGER_RTT_MAX_INTERRUPT_PRIORITY (0x20)
183183
#endif

‎Config/SEGGER_SYSVIEW_Conf.h‎

Lines changed: 77 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,78 @@
1-
/*
2-
* Copyright (c) 2020 Intel Corporation
3-
*
4-
* SPDX-License-Identifier: Apache-2.0
5-
*/
1+
/*********************************************************************
2+
* SEGGER Microcontroller GmbH *
3+
* The Embedded Experts *
4+
**********************************************************************
5+
* *
6+
* (c) 1995 - 2024 SEGGER Microcontroller GmbH *
7+
* *
8+
* www.segger.com Support: [email protected] *
9+
* *
10+
**********************************************************************
11+
* *
12+
* SEGGER SystemView * Real-time application analysis *
13+
* *
14+
**********************************************************************
15+
* *
16+
* All rights reserved. *
17+
* *
18+
* SEGGER strongly recommends to not make any changes *
19+
* to or modify the source code of this software in order to stay *
20+
* compatible with the SystemView and RTT protocol, and J-Link. *
21+
* *
22+
* Redistribution and use in source and binary forms, with or *
23+
* without modification, are permitted provided that the following *
24+
* condition is met: *
25+
* *
26+
* o Redistributions of source code must retain the above copyright *
27+
* notice, this condition and the following disclaimer. *
28+
* *
29+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND *
30+
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, *
31+
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF *
32+
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE *
33+
* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
34+
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR *
35+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT *
36+
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; *
37+
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
38+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
39+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE *
40+
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH *
41+
* DAMAGE. *
42+
* *
43+
**********************************************************************
44+
* *
45+
* SystemView version: 3.58 *
46+
* *
47+
**********************************************************************
48+
-------------------------- END-OF-HEADER -----------------------------
649
7-
#ifndef SEGGER_SEGGER_SYSVIEW_CONF_H_
8-
#define SEGGER_SEGGER_SYSVIEW_CONF_H_
50+
File : SEGGER_SYSVIEW_Conf.h
51+
Purpose : SEGGER SystemView configuration file.
52+
Set defines which deviate from the defaults (see SEGGER_SYSVIEW_ConfDefaults.h) here.
53+
Revision: $Rev: 21292 $
54+
55+
Additional information:
56+
Required defines which must be set are:
57+
SEGGER_SYSVIEW_GET_TIMESTAMP
58+
SEGGER_SYSVIEW_GET_INTERRUPT_ID
59+
For known compilers and cores, these might be set to good defaults
60+
in SEGGER_SYSVIEW_ConfDefaults.h.
61+
62+
SystemView needs a (nestable) locking mechanism.
63+
If not defined, the RTT locking mechanism is used,
64+
which then needs to be properly configured.
65+
*/
66+
67+
#ifndef SEGGER_SYSVIEW_CONF_H
68+
#define SEGGER_SYSVIEW_CONF_H
69+
70+
/*********************************************************************
71+
*
72+
* Defines, configurable
73+
*
74+
**********************************************************************
75+
*/
976

1077
#include <stdint.h>
1178

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

39-
#endif /* SEGGER_SEGGER_SYSVIEW_CONF_H_ */
106+
#endif // SEGGER_SYSVIEW_CONF_H
107+
108+
/*************************** End of file ****************************/

‎SEGGER/DebugMon/JLINK_MONITOR_ISR_SES.s‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Purpose : Implementation of debug monitor for J-Link monitor mode
6262
.extern JLINK_MONITOR_OnExit
6363
.extern JLINK_MONITOR_OnPoll
6464

65-
.global z_arm_debug_monitor
65+
.global DebugMon_Handler
6666

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

169169
/*********************************************************************
170170
*
171-
* z_arm_debug_monitor()
171+
* DebugMon_Handler()
172172
*
173173
* Function description
174174
* 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
179179
*/
180180
.thumb_func
181181

182-
z_arm_debug_monitor:
182+
DebugMon_Handler:
183183
/*
184184
General procedure:
185185
DCRDR is used as communication register

‎SEGGER/SEGGER.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* The Embedded Experts *
44
**********************************************************************
55
* *
6-
* (c) 1995 - 2021 SEGGER Microcontroller GmbH *
6+
* (c) 1995 - 2024 SEGGER Microcontroller GmbH *
77
* *
88
* www.segger.com Support: [email protected] *
99
* *
@@ -42,7 +42,7 @@
4242
* *
4343
**********************************************************************
4444
* *
45-
* SystemView version: 3.40 *
45+
* SystemView version: 3.58 *
4646
* *
4747
**********************************************************************
4848
----------------------------------------------------------------------

0 commit comments

Comments
 (0)