segger: update to 3.30 (b60d6e14) · Commits · Wenxi XU / Segger

CMakeLists.txt

deleted100644 → 0

+0 −8

Original line number	Diff line number	Diff line

		zephyr_include_directories_ifdef(CONFIG_USE_SEGGER_RTT rtt)
		zephyr_sources_ifdef(CONFIG_USE_SEGGER_RTT
		rtt/SEGGER_RTT.c
		rtt/SEGGER_RTT_zephyr.c
		)
		zephyr_include_directories_ifdef(CONFIG_SEGGER_SYSTEMVIEW systemview)
		zephyr_sources_ifdef(CONFIG_SEGGER_SYSTEMVIEW systemview/SEGGER_SYSVIEW.c)

Config/Global.h

0 → 100644

+113 −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.30 *
		* *
		**********************************************************************
		----------------------------------------------------------------------
		File : Global.h
		Purpose : Global types
		In case your application already has a Global.h, you should
		merge the files. In order to use Segger code, the types
		U8, U16, U32, I8, I16, I32 need to be defined in Global.h;
		additional definitions do not hurt.
		Revision: $Rev: 12501 $
		---------------------------END-OF-HEADER------------------------------
		*/

		#ifndef GLOBAL_H // Guard against multiple inclusion
		#define GLOBAL_H

		#define U8 unsigned char
		#define I8 signed char
		#define U16 unsigned short
		#define I16 signed short
		#ifdef __x86_64__
		#define U32 unsigned
		#define I32 int
		#else
		#define U32 unsigned long
		#define I32 signed long
		#endif

		//
		// CC_NO_LONG_SUPPORT can be defined to compile test
		// without long support for compilers that do not
		// support C99 and its long type.
		//
		#ifdef CC_NO_LONG_SUPPORT
		#define PTR_ADDR U32
		#else // Supports long type.
		#if defined(_WIN32) && !defined(__clang__) && !defined(__MINGW32__)
		//
		// Microsoft VC6 compiler related
		//
		#define U64 unsigned __int64
		#define U128 unsigned __int128
		#define I64 __int64
		#define I128 __int128
		#if _MSC_VER <= 1200
		#define U64_C(x) x##UI64
		#else
		#define U64_C(x) x##ULL
		#endif
		#else
		//
		// C99 compliant compiler
		//
		#define U64 unsigned long long
		#define I64 signed long long
		#define U64_C(x) x##ULL
		#endif

		#if (defined(_WIN64) \|\| defined(__LP64__)) // 64-bit symbols used by Visual Studio and GCC, maybe others as well.
		#define PTR_ADDR U64
		#else
		#define PTR_ADDR U32
		#endif
		#endif // Supports long type.

		#endif // Avoid multiple inclusion

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

rtt/SEGGER_RTT_Conf.h→Config/SEGGER_RTT_Conf.h

100755 → 100644

+432 −359

File changed and moved.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

systemview/SEGGER.h→SEGGER/SEGGER.h

+248 −228

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		* The Embedded Experts *
		**********************************************************************
		* *
		* (c) 1995 - 2019 SEGGER Microcontroller GmbH *
		* (c) 1995 - 2021 SEGGER Microcontroller GmbH *
		* *
		* www.segger.com Support: support@segger.com *
		* *
		@@ -17,24 +17,14 @@
		* *
		* SEGGER strongly recommends to not make any changes *
		* to or modify the source code of this software in order to stay *
		* compatible with the RTT protocol and J-Link. *
		* 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 *
		* conditions are met: *
		* condition is met: *
		* *
		* o Redistributions of source code must retain the above copyright *
		* notice, this list of conditions and the following disclaimer. *
		* *
		* o Redistributions in binary form must reproduce the above *
		* copyright notice, this list of conditions and the following *
		* disclaimer in the documentation and/or other materials provided *
		* with the distribution. *
		* *
		* o Neither the name of SEGGER Microcontroller GmbH *
		* nor the names of its contributors may be used to endorse or *
		* promote products derived from this software without specific *
		* prior written permission. *
		* 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, *
		@@ -52,16 +42,20 @@
		* *
		**********************************************************************
		* *
		* SystemView version: V2.52h *
		* SystemView version: 3.30 *
		* *
		**********************************************************************
		-------------------------- END-OF-HEADER -----------------------------
		----------------------------------------------------------------------
		File : SEGGER.h
		Purpose : Global types etc & general purpose utility functions
		Revision: $Rev: 18102 $
		---------------------------END-OF-HEADER------------------------------
		*/

		#ifndef SEGGER_H // Guard against multiple inclusion
		#define SEGGER_H

		#include <stdarg.h>
		#include <stdarg.h> // For va_list.
		#include "Global.h" // Type definitions: U8, U16, U32, I8, I16, I32

		#if defined(__cplusplus)
		@@ -76,18 +70,21 @@ extern "C" { /* Make sure we have C-declarations in C++ programs */
		*/

		#ifndef INLINE
		#ifdef _WIN32
		#if (defined(__ICCARM__) \|\| defined(__RX) \|\| defined(__ICCRX__))
		//
		// Other known compilers.
		//
		#define INLINE inline
		#else
		#if (defined(_WIN32) && !defined(__clang__))
		//
		// Microsoft VC6 and newer.
		// Force inlining without cost checking.
		//
		#define INLINE __forceinline
		#elif (defined(__ZEPHYR__))
		#include <toolchain.h>
		#else
		#if (defined(__GNUC__))
		#elif defined(__GNUC__) \|\| defined(__clang__)
		//
		// Force inlining with GCC
		// Force inlining with GCC + clang
		//
		#define INLINE inline __attribute__((always_inline))
		#elif (defined(__CC_ARM))
		@@ -95,11 +92,6 @@ extern "C" { /* Make sure we have C-declarations in C++ programs */
		// Force inlining with ARMCC (Keil)
		//
		#define INLINE __inline
		#elif (defined(__ICCARM__) \|\| defined(__RX) \|\| defined(__ICCRX__))
		//
		// Other known compilers.
		//
		#define INLINE inline
		#else
		//
		// Unknown compilers.
		@@ -124,6 +116,11 @@ extern "C" { /* Make sure we have C-declarations in C++ programs */
		#define SEGGER_USE_PARA(Para) (void)Para // This works for most compilers.
		#endif

		#define SEGGER_ADDR2PTR(Type, Addr) (/lint -e(923) -e(9078)/((Type*)((PTR_ADDR)(Addr)))) // Allow cast from address to pointer.
		#define SEGGER_PTR2ADDR(p) (/lint -e(923) -e(9078)/((PTR_ADDR)(p))) // Allow cast from pointer to address.
		#define SEGGER_PTR2PTR(Type, p) (/lint -e(740) -e(826) -e(9079) -e(9087)/((Type*)(p))) // Allow cast from one pointer type to another (ignore different size).
		#define SEGGER_PTR_DISTANCE(p0, p1) (SEGGER_PTR2ADDR(p0) - SEGGER_PTR2ADDR(p1))

		/*********************************************************************
		*
		* Defines
		@@ -154,8 +151,8 @@ typedef struct {
		typedef struct {
		unsigned int CacheLineSize; // 0: No Cache. Most Systems such as ARM9 use a 32 bytes cache line size.
		void (*pfDMB) (void); // Optional DMB function for Data Memory Barrier to make sure all memory operations are completed.
		void (pfClean) (void p, unsigned NumBytes); // Optional clean function for cached memory.
		void (pfInvalidate)(void p, unsigned NumBytes); // Optional invalidate function for cached memory.
		void (pfClean) (void p, unsigned long NumBytes); // Optional clean function for cached memory.
		void (pfInvalidate)(void p, unsigned long NumBytes); // Optional invalidate function for cached memory.
		} SEGGER_CACHE_CONFIG;

		typedef struct SEGGER_SNPRINTF_CONTEXT_struct SEGGER_SNPRINTF_CONTEXT;
		@@ -180,6 +177,11 @@ typedef struct SEGGER_PRINTF_FORMATTER {
		char Specifier; // Format specifier.
		} SEGGER_PRINTF_FORMATTER;

		typedef struct {
		U32 (*pfGetHPTimestamp)(void); // Mandatory, pfGetHPTimestamp
		int (*pfGetUID) (U8 abUID[16]); // Optional, pfGetUID
		} SEGGER_BSP_API;

		/*********************************************************************
		*
		* Utility functions
		@@ -203,6 +205,7 @@ int SEGGER_isalpha (int c);
		unsigned SEGGER_strlen (const char* s);
		int SEGGER_tolower (int c);
		int SEGGER_strcasecmp (const char* sText1, const char* sText2);
		int SEGGER_strncasecmp(const char sText1, const char sText2, unsigned Count);

		//
		// Buffer/printf related.
		@@ -217,8 +220,25 @@ int SEGGER_vsnprintfEx (SEGGER_SNPRINTF_CONTEXT* pContext, const char* sFormat
		int SEGGER_PRINTF_AddFormatter (SEGGER_PRINTF_FORMATTER* pFormatter, SEGGER_pFormatter pfFormatter, char c);
		void SEGGER_PRINTF_AddDoubleFormatter (void);
		void SEGGER_PRINTF_AddIPFormatter (void);
		void SEGGER_PRINTF_AddBLUEFormatter (void);
		void SEGGER_PRINTF_AddCONNECTFormatter(void);
		void SEGGER_PRINTF_AddSSLFormatter (void);
		void SEGGER_PRINTF_AddSSHFormatter (void);
		void SEGGER_PRINTF_AddHTMLFormatter (void);

		//
		// BSP abstraction API.
		//
		int SEGGER_BSP_GetUID (U8 abUID[16]);
		int SEGGER_BSP_GetUID32(U32* pUID);
		void SEGGER_BSP_SetAPI (const SEGGER_BSP_API* pAPI);
		void SEGGER_BSP_SeedUID (void);

		//
		// Other API.
		//
		void SEGGER_VERSION_GetString(char acText[8], unsigned Version);

		#if defined(__cplusplus)
		} /* Make sure we have C-declarations in C++ programs */
		#endif

rtt/SEGGER_RTT.c→SEGGER/SEGGER_RTT.c

100755 → 100644

+2077 −1704

File changed and moved.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

Admin message