segger: update to 3.40 (5792675a) · Commits · Wenxi XU / Segger

Config/Global.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		* *
		**********************************************************************
		* *
		* SystemView version: 3.30 *
		* SystemView version: 3.40 *
		* *
		**********************************************************************
		----------------------------------------------------------------------

Config/SEGGER_RTT_Conf.h

+23 −19

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		* *
		**********************************************************************
		* *
		* SystemView version: 3.30 *
		* SystemView version: 3.40 *
		* *
		**********************************************************************
		---------------------------END-OF-HEADER------------------------------
		@@ -50,7 +50,7 @@ File : SEGGER_RTT_Conf.h
		Purpose : Implementation of SEGGER real-time transfer (RTT) which
		allows real-time communication on targets which support
		debugger memory accesses while the CPU is running.
		Revision: $Rev: 21386 $
		Revision: $Rev: 24316 $

		*/

		@@ -96,6 +96,8 @@ Revision: $Rev: 21386 $

		#if defined(CONFIG_SEGGER_RTT_SECTION_DTCM)
		#define SEGGER_RTT_SECTION ".dtcm_data"
		#elif defined(CONFIG_SEGGER_RTT_SECTION_CUSTOM)
		#define SEGGER_RTT_SECTION CONFIG_SEGGER_RTT_SECTION_CUSTOM_NAME
		#endif

		/*********************************************************************
		@@ -113,8 +115,10 @@ Revision: $Rev: 21386 $
		#if defined(CONFIG_SEGGER_RTT_MEMCPY_USE_BYTELOOP)
		#define SEGGER_RTT_MEMCPY_USE_BYTELOOP 1 // 1: Use a simple byte-loop
		#else
		#ifndef SEGGER_RTT_MEMCPY_USE_BYTELOOP
		#define SEGGER_RTT_MEMCPY_USE_BYTELOOP 0 // 0: Use memcpy/SEGGER_RTT_MEMCPY
		#endif
		#endif
		//
		// Example definition of SEGGER_RTT_MEMCPY to external memcpy with GCC toolchains and Cortex-A targets
		//
		@@ -199,7 +203,7 @@ Revision: $Rev: 21386 $
		); \
		}

		#elif defined(__ARM_ARCH_7A__)
		#elif (defined(__ARM_ARCH_7A__) \|\| defined(__ARM_ARCH_7R__))
		#define SEGGER_RTT_LOCK() { \
		unsigned int _SEGGER_RTT__LockState; \
		__asm volatile ("mrs r1, CPSR \n\t" \

Config/SEGGER_SYSVIEW_Conf.h

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		/*********************************************************************
		* SEGGER Microcontroller GmbH *
		* The Embedded Experts *
		**********************************************************************
		* *
		* (c) 1995 - 2021 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.40 *
		* *
		**********************************************************************
		-------------------------- 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_SYSVIEW_CONF_H
		#define SEGGER_SYSVIEW_CONF_H

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

		/*********************************************************************
		* TODO: Add your defines here. *
		**********************************************************************
		*/


		#endif // SEGGER_SYSVIEW_CONF_H

		/************************* End of file **************************/

SEGGER/DebugMon/JLINK_MONITOR.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ Purpose : Implementation of debug monitor for J-Link monitor mode debug on Corte
		**********************************************************************
		*/


		/*********************************************************************
		*
		* JLINK_MONITOR_OnExit()
		@@ -127,8 +126,8 @@ void JLINK_MONITOR_OnExit(void) {
		* Notes
		* (1) Must not keep the CPU busy for more than 100 ms
		*/

		void JLINK_MONITOR_OnEnter(void) {
		//
		// Add custom code here
		//
		// BSP_SetLED(0);
		@@ -145,8 +144,12 @@ void JLINK_MONITOR_OnEnter(void) {
		* Notes
		* (1) Must not keep the CPU busy for more than 100 ms
		*/

		void JLINK_MONITOR_OnPoll(void) {
		//
		// Add custom code here
		//
		// BSP_ToggleLED(0);
		// _Delay(500000);
		}

		/**** End Of File ***********************************************/

SEGGER/SEGGER.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		* *
		**********************************************************************
		* *
		* SystemView version: 3.30 *
		* SystemView version: 3.40 *
		* *
		**********************************************************************
		----------------------------------------------------------------------

Admin message