Update LPC1830 example to use the latest trace recorder code.
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/.cproject b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/.cproject
index 8040437..8107b25 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/.cproject
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/.cproject
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="com.crt.advproject.config.exe.debug.56486929">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.exe.debug.56486929" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -87,22 +85,6 @@
</tool>
</toolChain>
</folderInfo>
- <folderInfo id="com.crt.advproject.config.exe.debug.56486929.2106668528" name="/" resourcePath="ThirdParty/USB_CDC">
- <toolChain id="com.crt.advproject.toolchain.exe.debug.1865989435" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.exe.debug" unusedChildren="">
- <targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.exe.debug" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.exe.debug"/>
- <tool id="com.crt.advproject.cpp.exe.debug.1158267972" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.exe.debug.359174792"/>
- <tool id="com.crt.advproject.gcc.exe.debug.1784372430" name="MCU C Compiler" superClass="com.crt.advproject.gcc.exe.debug.517029683">
- <option id="com.crt.advproject.gcc.exe.debug.option.optimization.level.369260631" name="Optimization Level" superClass="com.crt.advproject.gcc.exe.debug.option.optimization.level" value="gnu.c.optimization.level.size" valueType="enumerated"/>
- <inputType id="com.crt.advproject.compiler.input.466388069" superClass="com.crt.advproject.compiler.input"/>
- </tool>
- <tool id="com.crt.advproject.gas.exe.debug.401476199" name="MCU Assembler" superClass="com.crt.advproject.gas.exe.debug.281614531">
- <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1255426283" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
- <inputType id="com.crt.advproject.assembler.input.882456885" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>
- </tool>
- <tool id="com.crt.advproject.link.cpp.exe.debug.2009352548" name="MCU C++ Linker" superClass="com.crt.advproject.link.cpp.exe.debug.1490011469"/>
- <tool id="com.crt.advproject.link.exe.debug.1734116997" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug.1212311005"/>
- </toolChain>
- </folderInfo>
<folderInfo id="com.crt.advproject.config.exe.debug.56486929.1781697322" name="/" resourcePath="ThirdParty/CMSISv2p10_LPC18xx_DriverLib">
<toolChain id="com.crt.advproject.toolchain.exe.debug.222538953" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.exe.debug" unusedChildren="">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.exe.debug" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.exe.debug"/>
@@ -119,6 +101,22 @@
<tool id="com.crt.advproject.link.exe.debug.536813209" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug.1212311005"/>
</toolChain>
</folderInfo>
+ <folderInfo id="com.crt.advproject.config.exe.debug.56486929.2106668528" name="/" resourcePath="ThirdParty/USB_CDC">
+ <toolChain id="com.crt.advproject.toolchain.exe.debug.1865989435" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.exe.debug" unusedChildren="">
+ <targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.exe.debug" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.exe.debug"/>
+ <tool id="com.crt.advproject.cpp.exe.debug.1158267972" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.exe.debug.359174792"/>
+ <tool id="com.crt.advproject.gcc.exe.debug.1784372430" name="MCU C Compiler" superClass="com.crt.advproject.gcc.exe.debug.517029683">
+ <option id="com.crt.advproject.gcc.exe.debug.option.optimization.level.369260631" name="Optimization Level" superClass="com.crt.advproject.gcc.exe.debug.option.optimization.level" value="gnu.c.optimization.level.size" valueType="enumerated"/>
+ <inputType id="com.crt.advproject.compiler.input.466388069" superClass="com.crt.advproject.compiler.input"/>
+ </tool>
+ <tool id="com.crt.advproject.gas.exe.debug.401476199" name="MCU Assembler" superClass="com.crt.advproject.gas.exe.debug.281614531">
+ <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1255426283" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+ <inputType id="com.crt.advproject.assembler.input.882456885" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>
+ </tool>
+ <tool id="com.crt.advproject.link.cpp.exe.debug.2009352548" name="MCU C++ Linker" superClass="com.crt.advproject.link.cpp.exe.debug.1490011469"/>
+ <tool id="com.crt.advproject.link.exe.debug.1734116997" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug.1212311005"/>
+ </toolChain>
+ </folderInfo>
<fileInfo id="com.crt.advproject.config.exe.debug.56486929.src/cr_startup_lpc18xx.cpp" name="cr_startup_lpc18xx.cpp" rcbsApplicability="disable" resourcePath="src/cr_startup_lpc18xx.cpp" toolsToInvoke=""/>
<sourceEntries>
<entry excluding="ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_wwdt.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_utils.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_uart.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_timer.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_ssp.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_sct.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_rtc.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_rit.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_qei.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_pwr.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_nvic.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_mcpwm.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_libcfg_default.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_lcd.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_i2s.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_i2c.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_gpdma.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_evrt.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_emc.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_dac.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_can.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_atimer.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/lpc18xx_adc.c|ThirdParty/CMSISv2p10_LPC18xx_DriverLib/src/debug_frmwrk.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
@@ -135,8 +133,8 @@
<storageModule moduleId="com.crt.config">
<projectStorage><?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
-<Properties property_0="" property_2="LPC1850A_4350A_SPIFI.cfx" property_3="NXP" property_4="LPC1830" property_count="5" version="1"/>
-<infoList vendor="NXP"><info chip="LPC1830" match_id="0x0" name="LPC1830" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC1830</name>
+<Properties property_0="" property_2="LPC1850A_4350A_SPIFI.cfx" property_3="NXP" property_4="LPC1830" property_count="5" version="60000"/>
+<infoList vendor="NXP"><info chip="LPC1830" match_id="0x0" name="LPC1830" resetscript="LPC18LPC43ExternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC1830</name>
<family>LPC18xx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
@@ -200,6 +198,7 @@
<peripheralInstance derived_from="ADC0" id="ADC0" location="0x400e3000"/>
<peripheralInstance derived_from="ADC1" id="ADC1" location="0x400e4000"/>
<peripheralInstance derived_from="GPIO-PORT" id="GPIO-PORT" location="0x400f4000"/>
+<peripheralInstance derived_from="EEPROM" id="EEPROM" location="0x4000e000"/>
</chip>
<processor><name gcc_name="cortex-m3">Cortex-M3</name>
<family>Cortex-M</family>
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h
index 2fdc239..87da994 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
/*
- FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.
+ FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.
All rights reserved
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -139,7 +139,7 @@
/* This demo makes use of one or more example stats formatting functions. These
format the raw data provided by the uxTaskGetSystemState() function in to human
-readable ASCII form. See the notes in the implementation of vTaskList() within
+readable ASCII form. See the notes in the implementation of vTaskList() within
FreeRTOS/Source/tasks.c for limitations. */
#define configUSE_STATS_FORMATTING_FUNCTIONS 1
@@ -185,7 +185,7 @@
/* Set to 1 to include "trace start" and "trace stop" CLI commands. These
commands start and stop the FreeRTOS+Trace recording. */
-#define configINCLUDE_TRACE_RELATED_CLI_COMMANDS 0
+#define configINCLUDE_TRACE_RELATED_CLI_COMMANDS 1
/* Dimensions a buffer that can be used by the FreeRTOS+CLI command
interpreter. See the FreeRTOS+CLI documentation for more information:
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOS_UDP_Demo Debug.launch b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOS_UDP_Demo Debug.launch
deleted file mode 100644
index 0979476..0000000
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOS_UDP_Demo Debug.launch
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.crt.dsfdebug.crtmcu.launchType">
-<stringAttribute key=".gdbinit" value=""/>
-<stringAttribute key="LAUNCH_ID.OFSemuDetails" value="Red Probe Family"/>
-<booleanAttribute key="com.crt.ctrlcenter.crtInit" value="true"/>
-<stringAttribute key="com.crt.ctrlcenter.targetbase" value="NXP LPC18xx (SWD) (*)"/>
-<stringAttribute key="com.crt.ctrlcenter.targetconfig" value="<?xml version="1.0" encoding="UTF-8"?> <config chipvendor="NXP" genname="NXP LPC18xx (SWD)" id="config.gdb.stub"><parameters><params><param description="Enter as XTAL[,PLL]. PLL is optional. Values are in kHz" name="Crystal (XTAL) frequency and PLL value" required="false" type="nullString" value="" var="xtal.hz"/> </params> <initValue value="false" var="vector.catch"/> <params><param default="true" description="Vector catch" name="Vector catch" value="True" var="vector.catch"><enum value="True"/> <enum value="False"/> </param> </params> <params><param default="true" description="Enable Red Trace" name="Enable Red Trace " value="true" var="swv.enable"><enum value="true"/> <enum value="false"/> </param> </params> <params><param default="Auto" description="Enablement of semihosting support" name="Semihosting support" value="Auto" var="internal.semihost"><enum value="On"/> <enum value="Off"/> <enum value="Auto"/> </param> </params> <params><param default="" description="Switch debug interface between SWD and JTAG (leave blank for default [SWD])" name="Debug interface" option="" value="" var="internal.debug.interface"><enum value=""/> <enum value="JTAG"/> <enum value="SWD"/> </param> </params> <params><param default="" description="Maximum wire speed in KHz (leave blank to Auto-detect). Not all values are supported by all targets" name="Maximum wire speed" type="nullString" value="" var="emu.speed"><enum value=""/> <enum value="30000"/> <enum value="15000"/> <enum value="10000"/> <enum value="7500"/> <enum value="6000"/> <enum value="5000"/> <enum value="3750"/> <enum value="3000"/> <enum value="2500"/> <enum value="2000"/> <enum value="1500"/> <enum value="1250"/> <enum value="1200"/> <enum value="1000"/> <enum value="750"/> <enum value="600"/> <enum value="500"/> <enum value="400"/> <enum value="300"/> <enum value="250"/> <enum value="200"/> <enum value="150"/> </param> </params> <params><param content="startupScript" description="Startup script (for use with Redlink)" name="Startup script" type="nullString" value="" var="startup.script"/> <param default="" description="Additional options" name="Additional options" value="" var="misc.options"/> <param default="2" description="Set stub debug level (1-4)" name="Debug Level " value="2" var="debug.level"/> <param default="True" description="when True, executable image will be loaded into the target" name="Load image" type="boolean" value="True" var="load"><enum value="True"/> <enum value="False"/> </param> <param default="cont" description="Run, continue or (do nothing)" name="Run/Continue image" value="cont" var="run"><enum value="run"/> <enum value="cont"/> <enum value=""/> </param> <param default="off" description="If on is specified, make the debugger treat unknown memory as non-existent and refuse \naccesses to such memory. If off is specified, treat the memory as RAM" name="Memory Access Checking" value="off" var="mem.access"><enum value="on"/> <enum value="off"/> </param> <param default="cont" description="choose the disconnect behavior for the target" name="Disconnect behavior" value="cont" var="ondisconnect"><enum value="nochange"/> <enum value="stop"/> <enum value="cont"/> <enum value="run_cont"/> </param> <param default="" description="Command to run before starting the debugger" name="Pre launch command" value="" var="internal.prelaunch.command"/> </params> </parameters> <script emulators="${gdb.stub} -mi -info-emu" silent="false" swv="true" type="init">set remotetimeout 60000&#x0A;target extended-remote | ${gdb.stub} -g -mi -${debug.level:2} ${-c+speed:$null} ${-s+emu.speed:$null} ${-p+package:$null} ${-vendor=+vendor:$null} ${-flash-driver=+flash.driver:$null} ${-e+emulator:$null} ${vector.catch?-vc:} ${misc.options}&#x0A;set mem inaccessible-by-default ${mem.access}&#x0A;mon ondisconnect ${ondisconnect}&#x0A;set arm force-mode thumb&#x0A;${load}</script> <script silent="false" type="run">${run}</script> </config> "/>
-<intAttribute key="com.crt.ctrlcenter.version" value="1"/>
-<stringAttribute key="org.eclipse.cdt.debug.mi.core.DEBUG_NAME" value="arm-none-eabi-gdb"/>
-<stringAttribute key="org.eclipse.cdt.debug.mi.core.GDB_INIT" value=""/>
-<booleanAttribute key="org.eclipse.cdt.debug.mi.core.breakpointsFullPath" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="com.crt.ctrlcenter.cmdfactory"/>
-<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
-<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="true"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="0"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="com.crt.ctrlcenter.CRTEmbeddedCDebugger"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<booleanAttribute key="org.eclipse.cdt.launch.ENABLE_REGISTER_BOOKKEEPING" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.launch.ENABLE_VARIABLE_BOOKKEEPING" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\FreeRTOS_UDP_Demo.axf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="FreeRTOS_UDP_Demo"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.crt.advproject.config.exe.debug.56486929"/>
-<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/FreeRTOS_UDP_Demo"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList context="reserved-for-future-use"/> "/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-<stringAttribute key="saved_expressions<seperator>Unknown" value="RecorderData,&RecorderData,&eventBuffer,&eventData,eventData,0x100014c0,0x10001530,recorderData"/>
-</launchConfiguration>
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcConfig.h
deleted file mode 100644
index 5d581b6..0000000
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcConfig.h
+++ /dev/null
@@ -1,509 +0,0 @@
-/*******************************************************************************
- * Tracealyzer v2.4.1 Recorder Library
- * Percepio AB, www.percepio.com
- *
- * trcConfig.h
- *
- * Configuration parameters for the trace recorder library. Before using the
- * trace recorder library, please check that the default settings are
- * appropriate for your system, and if necessary adjust these. Most likely, you
- * will need to adjust the NTask, NISR, NQueue, NMutex and NSemaphore values to
- * reflect the number of such objects in your system. These may be
- * over-approximated, although larger values values implies more RAM usage.
- *
- * Terms of Use
- * This software is copyright Percepio AB. The recorder library is free for
- * use together with Percepio products. You may distribute the recorder library
- * in its original form, including modifications in trcHardwarePort.c/.h
- * given that these modification are clearly marked as your own modifications
- * and documented in the initial comment section of these source files.
- * This software is the intellectual property of Percepio AB and may not be
- * sold or in other ways commercially redistributed without explicit written
- * permission by Percepio AB.
- *
- * Disclaimer
- * The trace tool and recorder library is being delivered to you AS IS and
- * Percepio AB makes no warranty as to its use or performance. Percepio AB does
- * not and cannot warrant the performance or results you may obtain by using the
- * software or documentation. Percepio AB make no warranties, express or
- * implied, as to noninfringement of third party rights, merchantability, or
- * fitness for any particular purpose. In no event will Percepio AB, its
- * technology partners, or distributors be liable to you for any consequential,
- * incidental or special damages, including any lost profits or lost savings,
- * even if a representative of Percepio AB has been advised of the possibility
- * of such damages, or for any claim by any third party. Some jurisdictions do
- * not allow the exclusion or limitation of incidental, consequential or special
- * damages, or the exclusion of implied warranties or limitations on how long an
- * implied warranty may last, so the above limitations may not apply to you.
- *
- * Copyright Percepio AB, 2013.
- * www.percepio.com
- ******************************************************************************/
-
-#ifndef TRCCONFIG_H
-#define TRCCONFIG_H
-
-#include <stdint.h>
-
-/*******************************************************************************
- * CONFIGURATION RELATED TO CAPACITY AND ALLOCATION
- ******************************************************************************/
-
-/*******************************************************************************
- * EVENT_BUFFER_SIZE
- *
- * Macro which should be defined as an integer value.
- *
- * This defines the capacity of the event buffer, i.e., the number of records
- * it may store. Each registered event typically use one record (4 byte), but
- * vTracePrintF may use multiple records depending on the number of data args.
- ******************************************************************************/
-
-#define EVENT_BUFFER_SIZE 5000 /* Adjust wrt. to available RAM */
-
-
-/*******************************************************************************
- * USE_LINKER_PRAGMA
- *
- * Macro which should be defined as an integer value, default is 0.
- *
- * If this is 1, the header file "recorderdata_linker_pragma.h" is included just
- * before the declaration of RecorderData (in trcBase.c), i.e., the trace data
- * structure. This allows the user to specify a pragma with linker options.
- *
- * Example (for IAR Embedded Workbench and NXP LPC17xx):
- * #pragma location="AHB_RAM_MEMORY"
- *
- * This example instructs the IAR linker to place RecorderData in another RAM
- * bank, the AHB RAM. This can also be used for other compilers with a similar
- * pragmas for linker options.
- *
- * Note that this only applies if using static allocation, see below.
- ******************************************************************************/
-#define USE_LINKER_PRAGMA 0
-
-
-/*******************************************************************************
- * SYMBOL_TABLE_SIZE
- *
- * Macro which should be defined as an integer value.
- *
- * This defines the capacity of the symbol table, in bytes. This symbol table
- * stores User Events labels and names of deleted tasks, queues, or other kernel
- * objects. Note that the names of active objects not stored here but in the
- * Object Table. Thus, if you don't use User Events or delete any kernel
- * objects you set this to zero (0) to minimize RAM usage.
- ******************************************************************************/
-#define SYMBOL_TABLE_SIZE 5000
-
-/*******************************************************************************
- * USE_SEPARATE_USER_EVENT_BUFFER
- *
- * Macro which should be defined as an integer value.
- * Default is zero (0).
- *
- * This enables and disables the use of the separate user event buffer.
- *
- * Note: When using the separate user event buffer, you may get an artificial
- * task instance named "Unknown actor". This is added as a placeholder when the
- * user event history is longer than the task scheduling history.
- ******************************************************************************/
-#define USE_SEPARATE_USER_EVENT_BUFFER 0
-
-/*******************************************************************************
- * USER_EVENT_BUFFER_SIZE
- *
- * Macro which should be defined as an integer value.
- *
- * This defines the capacity of the user event buffer, in number of slots.
- * A single user event can use between 1 and X slots, depending on the data.
- *
- * Only in use if USE_SEPARATE_USER_EVENT_BUFFER is set to 1.
- ******************************************************************************/
-#define USER_EVENT_BUFFER_SIZE 500
-
-/*******************************************************************************
- * USER_EVENT_CHANNELS
- *
- * Macro which should be defined as an integer value.
- *
- * This defines the number of allowed user event channels.
- *
- * Only in use if USE_SEPARATE_USER_EVENT_BUFFER is set to 1.
- ******************************************************************************/
-#define CHANNEL_FORMAT_PAIRS 32
-
-/*******************************************************************************
- * NTask, NISR, NQueue, NSemaphore, NMutex
- *
- * A group of Macros which should be defined as an integer value of zero (0)
- * or larger.
- *
- * This defines the capacity of the Object Property Table - the maximum number
- * of objects active at any given point within each object class.
- *
- * NOTE: In case objects are deleted and created during runtime, this setting
- * does not limit the total amount of objects, only the number of concurrently
- * active objects.
- *
- * Using too small values will give an error message through the vTraceError
- * routine, which makes the error message appear when opening the trace data
- * in Tracealyzer. If you are using the recorder status monitor task,
- * any error messages are displayed in console prints, assuming that the
- * print macro has been defined properly (vConsolePrintMessage).
- *
- * It can be wise to start with very large values for these constants,
- * unless you are very confident on these numbers. Then do a recording and
- * check the actual usage in Tracealyzer. This is shown by selecting
- * View -> Trace Details -> Resource Usage -> Object Table
- *
- * NOTE 2: Remember to account for all tasks created by the kernel, such as the
- * IDLE task, timer task, and any tasks created by other 3rd party
- * software components, such as communication stacks. The recorder also has an
- * optional monitor task to account for, if this is used.
- * Moreover, one task slot is used to indicate "(startup)", i.e., a fictive
- * task that represent the time before the scheduler starts.
- * NTask should thus be at least 2-3 slots larger than your application task count.
- *
- ******************************************************************************/
-#define NTask 15
-#define NISR 10
-#define NQueue 10
-#define NSemaphore 10
-#define NMutex 10
-
-/* Maximum object name length for each class (includes zero termination) */
-#define NameLenTask 15
-#define NameLenISR 15
-#define NameLenQueue 15
-#define NameLenSemaphore 15
-#define NameLenMutex 15
-
-/******************************************************************************
- * TRACE_DESCRIPTION
- *
- * Macro which should be defined as a string.
- *
- * This string is stored in the trace and displayed in Tracealyzer. Can be
- * used to store, e.g., system version or build date. This is also used to store
- * internal error messages from the recorder, which if occurs overwrites the
- * value defined here. This may be maximum 256 chars.
- *****************************************************************************/
-#define TRACE_DESCRIPTION "Tracealyzer Recorder Test Program"
-
-/******************************************************************************
- * TRACE_DESCRIPTION_MAX_LENGTH
- *
- * The maximum length (including zero termination) for the TRACE_DESCRIPTION
- * string. Since this string also is used for internal error messages from the
- * recorder do not make it too short, as this may truncate the error messages.
- * Default is 80.
- * Maximum allowed length is 256 - the trace will fail to load if longer.
- *****************************************************************************/
-#define TRACE_DESCRIPTION_MAX_LENGTH 80
-
-
-/******************************************************************************
- * TRACE_DATA_ALLOCATION
- *
- * This defines how to allocate the recorder data structure, i.e., using a
- * static declaration or using a dynamic allocation in runtime (malloc).
- *
- * Should be one of these two options:
- * - TRACE_DATA_ALLOCATION_STATIC (default)
- * - TRACE_DATA_ALLOCATION_DYNAMIC
- *
- * Using static allocation has the benefits of compile-time errors if the buffer
- * is too large (too large constants in trcConfig.h) and no need to call the
- * initialization routine (xTraceInitTraceData).
- *
- * Using dynamic allocation may give more flexibility in some cases.
- *****************************************************************************/
-
-#define TRACE_DATA_ALLOCATION TRACE_DATA_ALLOCATION_STATIC
-
-
-/******************************************************************************
- * CONFIGURATION REGARDING WHAT CODE/FEATURES TO INCLUDE
- *****************************************************************************/
-
-/******************************************************************************
- * USE_TRACE_ASSERT
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 0.
- *
- * If this is one (1), the TRACE_ASSERT macro will verify that a condition is
- * true. If the condition is false, vTraceError() will be called.
- *****************************************************************************/
-#define USE_TRACE_ASSERT 1
-
-/******************************************************************************
- * INCLUDE_FLOAT_SUPPORT
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 1.
- *
- * If this is zero (0), all references to floating point values are removed,
- * in case floating point values are not supported by the platform used.
- * Floating point values are only used in vTracePrintF and its subroutines, to
- * store float (%f) or double (%lf) argments.
- *
- * Note: vTracePrintF can still be used with integer and string arguments in
- * either case.
- *****************************************************************************/
-#define INCLUDE_FLOAT_SUPPORT 0
-
-/******************************************************************************
- * INCLUDE_USER_EVENTS
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 1.
- *
- * If this is zero (0) the code for creating User Events is excluded to
- * reduce code size. User Events are application-generated events, like
- * "printf" but for the trace log instead of console output. User Events are
- * much faster than a printf and can therefore be used in timing critical code.
- * See vTraceUserEvent() and vTracePrintF() in trcUser.h
- *
- * Note that Tracealyzer Standard Edition or Professional Edition is required
- * for User Events, they are not displayed in Tracealyzer Free Edition.
- *****************************************************************************/
-#define INCLUDE_USER_EVENTS 1
-
-/*****************************************************************************
- * INCLUDE_READY_EVENTS
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 1.
- *
- * If this is zero (0), the code for recording Ready events is
- * excluded. Note, this will make it impossible to calculate the correct
- * response times.
- *****************************************************************************/
-#define INCLUDE_READY_EVENTS 1
-
-/*****************************************************************************
- * INCLUDE_NEW_TIME_EVENTS
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 0.
- *
- * If this is zero (1), events will be generated whenever the os clock is
- * increased.
- *****************************************************************************/
-#define INCLUDE_NEW_TIME_EVENTS 0
-
-/*****************************************************************************
- * INCLUDE_ISR_TRACING
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 1.
- *
- * If this is zero (0), the code for recording Interrupt Service Routines is
- * excluded to reduce code size.
- *
- * Note, if the kernel has no central interrupt dispatcher, recording ISRs
- * require that you insert calls to vTraceStoreISRBegin and vTraceStoreISREnd
- * in your interrupt handlers.
- *****************************************************************************/
-#define INCLUDE_ISR_TRACING 1
-
-/******************************************************************************
- * INCLUDE_OBJECT_DELETE
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 1.
- *
- * This must be enabled (1) if tasks, queues or other
- * traced kernel objects are deleted at runtime. If no deletes are made, this
- * can be set to 0 in order to exclude the delete-handling code.
- *****************************************************************************/
-#define INCLUDE_OBJECT_DELETE 0
-
-/******************************************************************************
- * CONFIGURATION RELATED TO BEHAVIOR
- *****************************************************************************/
-
-/******************************************************************************
- * TRACE_RECORDER_STORE_MODE
- *
- * Macro which should be defined as one of:
- * - TRACE_STORE_MODE_RING_BUFFER
- * - TRACE_STORE_MODE_STOP_WHEN_FULL
- * Default is TRACE_STORE_MODE_RING_BUFFER.
- *
- * With TRACE_RECORDER_STORE_MODE set to TRACE_STORE_MODE_RING_BUFFER, the events are
- * stored in a ring buffer, i.e., where the oldest events are overwritten when
- * the buffer becomes full. This allows you to get the last events leading up
- * to an interesting state, e.g., an error, without having a large trace buffer
- * for string the whole run since startup. In this mode, the recorder can run
- * "forever" as the buffer never gets full, i.e., in the sense that it always
- * has room for more events.
- *
- * To fetch the trace in mode TRACE_STORE_MODE_RING_BUFFER, you need to first halt the
- * system using your debugger and then do a RAM dump, or to explicitly stop the
- * recorder using vTraceStop() and then store/upload the trace data using a
- * task that you need to provide yourself. The trace data is found in the struct
- * RecorderData, initialized in trcBase.c.
- *
- * Note that, if you upload the trace using a RAM dump, i.e., when the system is
- * halted on a breakpoint or by a debugger command, there is no need to stop the
- * recorder first.
- *
- * When TRACE_RECORDER_STORE_MODE is TRACE_STORE_MODE_STOP_WHEN_FULL, the recording is
- * stopped when the buffer becomes full. When the recorder stops itself this way
- * vTracePortEnd() is called which allows for custom actions, such as triggering
- * a task that stores the trace buffer, i.e., in case taking a RAM dump
- * using an on-chip debugger is not possible. In the Windows port, vTracePortEnd
- * saves the trace to file directly, but this is not recommended in a real-time
- * system since the scheduler is blocked during the processing of vTracePortEnd.
- *****************************************************************************/
-
-#define TRACE_RECORDER_STORE_MODE TRACE_STORE_MODE_RING_BUFFER
-
-/******************************************************************************
- * STOP_AFTER_N_EVENTS
- *
- * Macro which should be defined as an integer value, or not defined.
- * Default is -1
- *
- * STOP_AFTER_N_EVENTS is intended for tests of the ring buffer mode (when
- * RECORDER_STORE_MODE is STORE_MODE_RING_BUFFER). It stops the recording when
- * the specified number of events has been observed. This value can be larger
- * than the buffer size, to allow for test of the "wrapping around" that occurs
- * in ring buffer mode . A negative value (or no definition of this macro)
- * disables this feature.
- *****************************************************************************/
-#define STOP_AFTER_N_EVENTS -1
-
-/******************************************************************************
- * USE_IMPLICIT_IFE_RULES
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 1.
- *
- * ### Instance Finish Events (IFE) ###
- *
- * For tasks with "infinite" main loops (non-terminating tasks), the concept
- * of a task instance has no clear definition, it is an application-specific
- * thing. Tracealyzer allows you to define Instance Finish Events (IFEs),
- * which marks the point in a cyclic task when the "task instance" ends.
- * The IFE is a blocking kernel call, typically in the main loop of a task
- * which typically reads a message queue, waits for a semaphore or performs
- * an explicit delay.
- *
- * If USE_IMPLICIT_IFE_RULES is one (1), the kernel macros (trcKernelPort.h)
- * will define what kernel calls are considered by default to be IFEs.
- *
- * However, Implicit IFEs only applies to blocking kernel calls. If a
- * service reads a message without blocking, it does not create a new
- * instance since no blocking occurred.
- *
- * Moreover, the actual IFE might sometimes be another blocking call. We
- * therefore allow for user-defined Explicit IFEs by calling
- *
- * vTraceTaskInstanceIsFinished()
- *
- * right before the kernel call considered as IFE. This does not create an
- * additional event but instead stores the service code and object handle
- * of the IFE call as properties of the task.
- *
- * If using Explicit IFEs and the task also calls an Implicit IFE, this may
- * result in additional incorrect task instances.
- * This is solved by disabling the Implicit IFEs for the task, by adding
- * a call to
- *
- * vTraceTaskSkipDefaultInstanceFinishedEvents()
- *
- * in the very beginning of that task. This allows you to combine Explicit IFEs
- * for some tasks with Implicit IFEs for the rest of the tasks, if
- * USE_IMPLICIT_IFE_RULES is 1.
- *
- * By setting USE_IMPLICIT_IFE_RULES to zero (0), the implicit IFEs are disabled
- * for all tasks. Tasks will then be considered to have a single instance only,
- * covering all execution fragments, unless you define an explicit IFE in each
- * task by calling vTraceTaskInstanceIsFinished before the blocking call.
- *****************************************************************************/
-#define USE_IMPLICIT_IFE_RULES 1
-
-/******************************************************************************
- * INCLUDE_SAVE_TO_FILE
- *
- * Macro which should be defined as either zero (0) or one (1).
- * Default is 0.
- *
- * If enabled (1), the recorder will include code for saving the trace
- * to a local file system.
- ******************************************************************************/
-#ifdef WIN32
- #define INCLUDE_SAVE_TO_FILE 1
-#else
- #define INCLUDE_SAVE_TO_FILE 0
-#endif
-
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_PRIORITY
- *
- * Macro which sets the priority of the "recorder status monitor" task.
- *
- * This task, vTraceMonitorTask in trcUser.c, periodically writes
- * the recorder status using the vTraceConsoleMessage macro, which is to
- * be mapped to your console "printf" routine. The task is named TraceMon but
- * is intentionally excluded from the demo trace.
- *
- * Default is tskIDLE_PRIORITY + 1
- * Note that if your system constantly has a high CPU load from high-priority
- * tasks, this might not be get a chance to execute.
- *
- * See vTraceMonitorTask in trcUser.c
- *****************************************************************************/
-#define TRACE_PROGRESS_MONITOR_TASK_PRIORITY (tskIDLE_PRIORITY + 1)
-
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_STACKSIZE
- *
- * Macro which sets the stack size of the "recorder status monitor" task.
- *
- * This task, vTraceMonitorTask in trcUser.c, periodically writes
- * the recorder status using the vTraceConsoleMessage macro, which is to
- * be mapped to your console "printf" routine. The task is intentionally
- * excluded from the demo trace.
- *
- * See vTraceMonitorTask in trcUser.c
- *****************************************************************************/
-#define TRACE_PROGRESS_MONITOR_TASK_STACKSIZE 500
-
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_PERIOD
- *
- * Macro which sets the period of the "recorder status monitor" task.
- *
- * This task, vTraceMonitorTask in trcUser.c, periodically writes
- * the recorder status using the vTraceConsoleMessage macro, which is to
- * be mapped to your console "printf" routine. The task is named TraceMon but
- * is intentionally excluded from the demo trace.
- *
- * Default is 1000 ticks (typically 1 second). On the Windows port, a lower
- * value is suggested since the Windows port runs very slowly, often 20-40
- * times slower than the simulated time.
- *
- * See vTraceMonitorTask in trcUser.c
- *****************************************************************************/
-#ifdef WIN32
- #define TRACE_PROGRESS_MONITOR_TASK_PERIOD 100
-#else
- #define TRACE_PROGRESS_MONITOR_TASK_PERIOD 1000
-#endif
-
-/******************************************************************************
- * TEAM_LICENSE_CODE
- *
- * Macro which defines a string - the team license code.
- * If no team license is available, this should be an empty string "".
- * This should be maximum 32 chars, including zero-termination.
- *****************************************************************************/
-#define TEAM_LICENSE_CODE ""
-
-#endif
-
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcHardwarePort.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcHardwarePort.h
deleted file mode 100644
index 08d0bd3..0000000
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcHardwarePort.h
+++ /dev/null
@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Tracealyzer v2.4.1 Recorder Library
- * Percepio AB, www.percepio.com
- *
- * trcHardwarePort.h
- *
- * Contains together with trcHardwarePort.c all hardware portability issues of
- * the trace recorder library.
- *
- * Terms of Use
- * This software is copyright Percepio AB. The recorder library is free for
- * use together with Percepio products. You may distribute the recorder library
- * in its original form, including modifications in trcPort.c and trcPort.h
- * given that these modification are clearly marked as your own modifications
- * and documented in the initial comment section of these source files.
- * This software is the intellectual property of Percepio AB and may not be
- * sold or in other ways commercially redistributed without explicit written
- * permission by Percepio AB.
- *
- * Disclaimer
- * The trace tool and recorder library is being delivered to you AS IS and
- * Percepio AB makes no warranty as to its use or performance. Percepio AB does
- * not and cannot warrant the performance or results you may obtain by using the
- * software or documentation. Percepio AB make no warranties, express or
- * implied, as to noninfringement of third party rights, merchantability, or
- * fitness for any particular purpose. In no event will Percepio AB, its
- * technology partners, or distributors be liable to you for any consequential,
- * incidental or special damages, including any lost profits or lost savings,
- * even if a representative of Percepio AB has been advised of the possibility
- * of such damages, or for any claim by any third party. Some jurisdictions do
- * not allow the exclusion or limitation of incidental, consequential or special
- * damages, or the exclusion of implied warranties or limitations on how long an
- * implied warranty may last, so the above limitations may not apply to you.
- *
- * Copyright Percepio AB, 2013.
- * www.percepio.com
- ******************************************************************************/
-
-#ifndef TRCPORT_H
-#define TRCPORT_H
-
-#include "trcKernelPort.h"
-
-/* If Win32 port */
-#ifdef WIN32
-
- #undef _WIN32_WINNT
- #define _WIN32_WINNT 0x0600
-
- /* Standard includes. */
- #include <stdio.h>
- #include <windows.h>
- #include <direct.h>
-
-/*******************************************************************************
- * The Win32 port by default saves the trace to file and then kills the
- * program when the recorder is stopped, to facilitate quick, simple tests
- * of the recorder.
- ******************************************************************************/
- #define WIN32_PORT_SAVE_WHEN_STOPPED 1
- #define WIN32_PORT_EXIT_WHEN_STOPPED 1
-
-#endif
-
-#define DIRECTION_INCREMENTING 1
-#define DIRECTION_DECREMENTING 2
-
-/******************************************************************************
- * Supported ports
- *
- * PORT_HWIndependent
- * A hardware independent fallback option for event timestamping. Provides low
- * resolution timestamps based on the OS tick.
- * This may be used on the Win32 port, but may also be used on embedded hardware
- * platforms. All time durations will be truncated to the OS tick frequency,
- * typically 1 KHz. This means that a task or ISR that executes in less than
- * 1 ms get an execution time of zero.
- *
- * PORT_Win32
- * "Accurate" timestamping based on the Windows performance counter. Note that
- * this gives the host machine time.
- *
- * Officially supported hardware timer ports:
- * - PORT_Atmel_AT91SAM7
- * - PORT_Atmel_UC3A0
- * - PORT_ARM_CortexM
- * - PORT_Renesas_RX600
- * - PORT_Microchip_dsPIC_AND_PIC24
- *
- * We also provide several "unofficial" hardware-specific ports. There have
- * been developed by external contributors, and have not yet been verified
- * by Percepio AB. Let us know if you have problems getting these to work.
- *
- * Unofficial hardware specific ports provided are:
- * - PORT_TEXAS_INSTRUMENTS_TMS570
- * - PORT_TEXAS_INSTRUMENTS_MSP430
- * - PORT_MICROCHIP_PIC32
- * - PORT_XILINX_PPC405
- * - PORT_XILINX_PPC440
- * - PORT_XILINX_MICROBLAZE
- * - PORT_NXP_LPC210X
- *
- *****************************************************************************/
-
-#define PORT_NOT_SET -1
-
-/*** Officially supported hardware timer ports *******************************/
-#define PORT_HWIndependent 0
-#define PORT_Win32 1
-#define PORT_Atmel_AT91SAM7 2
-#define PORT_Atmel_UC3A0 3
-#define PORT_ARM_CortexM 4
-#define PORT_Renesas_RX600 5
-#define PORT_Microchip_dsPIC_AND_PIC24 6
-
-/*** Unofficial ports, provided by external developers, not yet verified *****/
-#define PORT_TEXAS_INSTRUMENTS_TMS570 7
-#define PORT_TEXAS_INSTRUMENTS_MSP430 8
-#define PORT_MICROCHIP_PIC32 9
-#define PORT_XILINX_PPC405 10
-#define PORT_XILINX_PPC440 11
-#define PORT_XILINX_MICROBLAZE 12
-#define PORT_NXP_LPC210X 13
-
-/*** Select your port here! **************************************************/
-#define SELECTED_PORT PORT_ARM_CortexM
-/*****************************************************************************/
-
-#if (SELECTED_PORT == PORT_NOT_SET)
-#error "You need to define SELECTED_PORT here!"
-#endif
-
-/*******************************************************************************
- * IRQ_PRIORITY_ORDER
- *
- * Macro which should be defined as an integer of 0 or 1.
- *
- * This should be 0 if lower IRQ priority values implies higher priority
- * levels, such as on ARM Cortex M. If the opposite scheme is used, i.e.,
- * if higher IRQ priority values means higher priority, this should be 1.
- *
- * This setting is not critical. It is used only to sort and colorize the
- * interrupts in priority order, in case you record interrupts using
- * the vTraceStoreISRBegin and vTraceStoreISREnd routines.
- *
- * We provide this setting for some hardware architectures below:
- * - ARM Cortex M: 0 (lower IRQ priority values are more significant)
- * - Atmel AT91SAM7x: 1 (higher IRQ priority values are more significant)
- * - Atmel AVR32: 1 (higher IRQ priority values are more significant)
- * - Renesas RX600: 1 (higher IRQ priority values are more significant)
- * - Microchip PIC24: 0 (lower IRQ priority values are more significant)
- * - Microchip dsPIC: 0 (lower IRQ priority values are more significant)
- * - TI TMS570: 0 (lower IRQ priority values are more significant)
- * - Freescale HCS08: 0 (lower IRQ priority values are more significant)
- * - Freescale HCS12: 0 (lower IRQ priority values are more significant)
- * - PowerPC 405: 0 (lower IRQ priority values are more significant)
- * - PowerPC 440: 0 (lower IRQ priority values are more significant)
- * - Freescale ColdFire: 1 (higher IRQ priority values are more significant)
- * - NXP LPC210x: 0 (lower IRQ priority values are more significant)
- * - MicroBlaze: 0 (lower IRQ priority values are more significant)
- *
- * If your chip is not on the above list, and you perhaps know this detail by
- * heart, please inform us by e-mail to support@percepio.com.
- *
- ******************************************************************************
- *
- * HWTC Macros
- *
- * These four HWTC macros provides a hardware isolation layer representing a
- * generic hardware timer/counter used for driving the operating system tick,
- * such as the SysTick feature of ARM Cortex M3/M4, or the PIT of the Atmel
- * AT91SAM7X.
- *
- * HWTC_COUNT: The current value of the counter. This is expected to be reset
- * a each tick interrupt. Thus, when the tick handler starts, the counter has
- * already wrapped.
- *
- * HWTC_COUNT_DIRECTION: Should be one of:
- * - DIRECTION_INCREMENTING - for hardware timer/counters of incrementing type
- * such as the PIT on Atmel AT91SAM7X.
- * When the counter value reach HWTC_PERIOD, it is reset to zero and the
- * interrupt is signaled.
- * - DIRECTION_DECREMENTING - for hardware timer/counters of decrementing type
- * such as the SysTick on ARM Cortex M3/M4 chips.
- * When the counter value reach 0, it is reset to HWTC_PERIOD and the
- * interrupt is signaled.
- *
- * HWTC_PERIOD: The number of increments or decrements of HWTC_COUNT between
- * two tick interrupts. This should preferably be mapped to the reload
- * register of the hardware timer, to make it more portable between chips in the
- * same family. The macro should in most cases be (reload register + 1).
- *
- * HWTC_DIVISOR: If the timer frequency is very high, like on the Cortex M chips
- * (where the SysTick runs at the core clock frequency), the "differential
- * timestamping" used in the recorder will more frequently insert extra XTS
- * events to store the timestamps, which increases the event buffer usage.
- * In such cases, to reduce the number of XTS events and thereby get longer
- * traces, you use HWTC_DIVISOR to scale down the timestamps and frequency.
- * Assuming a OS tick rate of 1 KHz, it is suggested to keep the effective timer
- * frequency below 65 MHz to avoid an excessive amount of XTS events. Thus, a
- * Cortex M chip running at 72 MHZ should use a HWTC_DIVISOR of 2, while a
- * faster chip require a higher HWTC_DIVISOR value.
- *
- * The HWTC macros and vTracePortGetTimeStamp is the main porting issue
- * or the trace recorder library. Typically you should not need to change
- * the code of vTracePortGetTimeStamp if using the HWTC macros.
- *
- ******************************************************************************/
-
-#if (SELECTED_PORT == PORT_Win32)
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT (ulGetRunTimeCounterValue())
- #define HWTC_PERIOD 0
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 1 // Please update according to your hardware...
-
-#elif (SELECTED_PORT == PORT_HWIndependent)
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT 0
- #define HWTC_PERIOD 1
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 1 // Please update according to your hardware...
-
-#elif (SELECTED_PORT == PORT_Atmel_AT91SAM7)
-
- /* HWTC_PERIOD is hardcoded for AT91SAM7X256-EK Board (48 MHz)
- A more generic solution is to get the period from pxPIT->PITC_PIMR */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT (AT91C_BASE_PITC->PITC_PIIR & 0xFFFFF)
- #define HWTC_PERIOD 2995
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 1 // higher IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_Atmel_UC3A0)
-
- /* For Atmel AVR32 (AT32UC3A) */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT sysreg_read(AVR32_COUNT)
- #define HWTC_PERIOD ( TRACE_CPU_CLOCK_HZ / TRACE_TICK_RATE_HZ )
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 1 // higher IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_ARM_CortexM)
-
- /* For all chips using ARM Cortex M cores */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_DECREMENTING
- #define HWTC_COUNT (*((uint32_t*)0xE000E018))
- #define HWTC_PERIOD ((*(uint32_t*)0xE000E014) + 1)
- #define HWTC_DIVISOR 2
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_Renesas_RX600)
-
- #include "iodefine.h"
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT (CMT0.CMCNT)
- #define HWTC_PERIOD ((((TRACE_PERIPHERAL_CLOCK_HZ/TRACE_TICK_RATE_HZ)-1)/8))
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 1 // higher IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_Microchip_dsPIC_AND_PIC24)
-
- /* For Microchip PIC24 and dsPIC (16 bit) */
-
- /* Note: The trace library was originally designed for 32-bit MCUs, and is slower
- than intended on 16-bit MCUs. Storing an event on a PIC24 takes about 70 µs.
- In comparison, 32-bit MCUs are often 10-20 times faster. If recording overhead
- becomes a problem on PIC24, use the filters to exclude less interesting tasks
- or system calls. */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT (TMR1)
- #define HWTC_PERIOD (PR1+1)
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_NXP_LPC210X)
- /* UNOFFICIAL PORT - NOT YET VERIFIED BY PERCEPIO */
-
- /* Tested with LPC2106, but should work with most LPC21XX chips. */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT *((uint32_t *)0xE0004008 )
- #define HWTC_PERIOD ( TRACE_CPU_CLOCK_HZ / TRACE_TICK_RATE_HZ )
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_TEXAS_INSTRUMENTS_TMS570)
- /* UNOFFICIAL PORT - NOT YET VERIFIED BY PERCEPIO */
-
- #define RTIFRC0 *((uint32_t *)0xFFFFFC10)
- #define RTICOMP0 *((uint32_t *)0xFFFFFC50)
- #define RTIUDCP0 *((uint32_t *)0xFFFFFC54)
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT (RTIFRC0 - (RTICOMP0 - RTIUDCP0))
- #define HWTC_PERIOD (RTIUDCP0)
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_TEXAS_INSTRUMENTS_MSP430)
- /* UNOFFICIAL PORT - NOT YET VERIFIED BY PERCEPIO */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT (TA0R)
- #define HWTC_PERIOD TRACE_CPU_CLOCKS_PER_TICK
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 1 // higher IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_MICROCHIP_PIC32)
- /* UNOFFICIAL PORT - NOT YET VERIFIED BY PERCEPIO */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_INCREMENTING
- #define HWTC_COUNT (ReadTimer1()) /* Should be available in BSP */
- #define HWTC_PERIOD (ReadPeriod1()+1) /* Should be available in BSP */
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_XILINX_PPC405)
- /* UNOFFICIAL PORT - NOT YET VERIFIED BY PERCEPIO */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_DECREMENTING
- #define HWTC_COUNT mfspr( 0x3db)
- #define HWTC_PERIOD ( TRACE_CPU_CLOCK_HZ / TRACE_TICK_RATE_HZ )
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_XILINX_PPC440)
- /* UNOFFICIAL PORT - NOT YET VERIFIED BY PERCEPIO */
-
- /* This should work with most PowerPC chips */
-
- #define HWTC_COUNT_DIRECTION DIRECTION_DECREMENTING
- #define HWTC_COUNT mfspr( 0x016 )
- #define HWTC_PERIOD ( TRACE_CPU_CLOCK_HZ / TRACE_TICK_RATE_HZ )
- #define HWTC_DIVISOR 1
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT == PORT_XILINX_MICROBLAZE)
- /* UNOFFICIAL PORT - NOT YET VERIFIED BY PERCEPIO */
-
- /* This should work with most Microblaze configurations.
- * It uses the AXI Timer 0 - the tick interrupt source.
- * If an AXI Timer 0 peripheral is available on your hardware platform, no modifications are required.
- */
- #include "xtmrctr_l.h"
-
- #define HWTC_COUNT_DIRECTION DIRECTION_DECREMENTING
- #define HWTC_COUNT XTmrCtr_GetTimerCounterReg( XPAR_TMRCTR_0_BASEADDR, 0 )
- #define HWTC_PERIOD ( TRACE_CPU_CLOCK_HZ / TRACE_TICK_RATE_HZ )
- #define HWTC_DIVISOR 16
-
- #define IRQ_PRIORITY_ORDER 0 // lower IRQ priority values are more significant
-
-#elif (SELECTED_PORT != PORT_NOT_SET)
-
- #error "SELECTED_PORT had unsupported value!"
- #define SELECTED_PORT PORT_NOT_SET
-
-#endif
-
-#if (SELECTED_PORT != PORT_NOT_SET)
-
- #ifndef HWTC_COUNT_DIRECTION
- #error "HWTC_COUNT_DIRECTION is not set!"
- #endif
-
- #ifndef HWTC_COUNT
- #error "HWTC_COUNT is not set!"
- #endif
-
- #ifndef HWTC_PERIOD
- #error "HWTC_PERIOD is not set!"
- #endif
-
- #ifndef HWTC_DIVISOR
- #error "HWTC_DIVISOR is not set!"
- #endif
-
- #ifndef IRQ_PRIORITY_ORDER
- #error "IRQ_PRIORITY_ORDER is not set!"
- #elif (IRQ_PRIORITY_ORDER != 0) && (IRQ_PRIORITY_ORDER != 1)
- #error "IRQ_PRIORITY_ORDER has bad value!"
- #endif
-
- #if (HWTC_DIVISOR < 1)
- #error "HWTC_DIVISOR must be a non-zero positive value!"
- #endif
-
-#endif
-/*******************************************************************************
- * vTraceConsoleMessage
- *
- * A wrapper for your system-specific console "printf" console output function.
- * This needs to be correctly defined to see status reports from the trace
- * status monitor task (this is defined in trcUser.c).
- ******************************************************************************/
-#if (SELECTED_PORT == PORT_Atmel_AT91SAM7)
-/* Port specific includes */
-#include "console.h"
-#endif
-
-#define vTraceConsoleMessage(x)
-
-/*******************************************************************************
- * vTracePortGetTimeStamp
- *
- * Returns the current time based on the HWTC macros which provide a hardware
- * isolation layer towards the hardware timer/counter.
- *
- * The HWTC macros and vTracePortGetTimeStamp is the main porting issue
- * or the trace recorder library. Typically you should not need to change
- * the code of vTracePortGetTimeStamp if using the HWTC macros.
- *
- ******************************************************************************/
-void vTracePortGetTimeStamp(uint32_t *puiTimestamp);
-
-/*******************************************************************************
- * vTracePortEnd
- *
- * This function is called when the recorder is stopped due to full buffer.
- * Mainly intended to show a message in the console.
- * This is used by the Win32 port to store the trace to a file. The file path is
- * set using vTracePortSetFileName.
- ******************************************************************************/
-void vTracePortEnd(void);
-
-#if (INCLUDE_SAVE_TO_FILE == 1)
-
-/*******************************************************************************
- * vTracePortSetOutFile
- *
- * Sets the filename/path used in vTracePortSave.
- * This is set in a separate function, since the Win32 port calls vTracePortSave
- * in vTracePortEnd if WIN32_PORT_SAVE_WHEN_STOPPED is set.
- ******************************************************************************/
-void vTracePortSetOutFile(char* path);
-
-/******************************************************************************
- * vTracePortSave
- *
- * Saves the trace to a file on a target-side file system. The path is set in a
- * separate function, vTracePortSetOutFile, since the Win32 port may call
- * vTracePortSave in vTracePortEnd, if using WIN32_PORT_SAVE_WHEN_STOPPED.
- ******************************************************************************/
-void vTracePortSave(void);
-
-#else
-
-#define vTraceConsoleMessage(x)
-#define vTracePortSetOutFile(path)
-#define vTracePortSave(void)
-
-#endif
-
-#endif
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/trcConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/trcConfig.h
index d5b1f9b..8d08da0 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/trcConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/trcConfig.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * FreeRTOS+Trace v2.3.0 Recorder Library
+ * Tracealyzer v2.6.0 Recorder Library
* Percepio AB, www.percepio.com
*
* trcConfig.h
@@ -9,12 +9,12 @@
* appropriate for your system, and if necessary adjust these. Most likely, you
* will need to adjust the NTask, NISR, NQueue, NMutex and NSemaphore values to
* reflect the number of such objects in your system. These may be
- * overapproximated, although larger values values implies more RAM usage.
+ * over-approximated, although larger values values implies more RAM usage.
*
* Terms of Use
* This software is copyright Percepio AB. The recorder library is free for
* use together with Percepio products. You may distribute the recorder library
- * in its original form, including modifications in trcPort.c and trcPort.h
+ * in its original form, including modifications in trcHardwarePort.c/.h
* given that these modification are clearly marked as your own modifications
* and documented in the initial comment section of these source files.
* This software is the intellectual property of Percepio AB and may not be
@@ -36,11 +36,7 @@
* damages, or the exclusion of implied warranties or limitations on how long an
* implied warranty may last, so the above limitations may not apply to you.
*
- * FreeRTOS+Trace is available as Free Edition and in two premium editions.
- * You may use the premium features during 30 days for evaluation.
- * Download FreeRTOS+Trace at http://www.percepio.com/products/downloads/
- *
- * Copyright Percepio AB, 2012.
+ * Copyright Percepio AB, 2013.
* www.percepio.com
******************************************************************************/
@@ -61,7 +57,30 @@
* vTracePrintF may use multiple records depending on the number of data args.
******************************************************************************/
- #define EVENT_BUFFER_SIZE 10000 /* Adjust wrt. to available RAM */
+#define EVENT_BUFFER_SIZE 10000 /* Adjust wrt. to available RAM */
+
+
+/*******************************************************************************
+ * USE_LINKER_PRAGMA
+ *
+ * Macro which should be defined as an integer value, default is 0.
+ *
+ * If this is 1, the header file "recorderdata_linker_pragma.h" is included just
+ * before the declaration of RecorderData (in trcBase.c), i.e., the trace data
+ * structure. This allows the user to specify a pragma with linker options.
+ *
+ * Example (for IAR Embedded Workbench and NXP LPC17xx):
+ * #pragma location="AHB_RAM_MEMORY"
+ *
+ * This example instructs the IAR linker to place RecorderData in another RAM
+ * bank, the AHB RAM. This can also be used for other compilers with a similar
+ * pragmas for linker options.
+ *
+ * Note that this only applies if using static allocation, see below.
+ ******************************************************************************/
+
+#define USE_LINKER_PRAGMA 0
+
/*******************************************************************************
* SYMBOL_TABLE_SIZE
@@ -72,10 +91,53 @@
* stores User Events labels and names of deleted tasks, queues, or other kernel
* objects. Note that the names of active objects not stored here but in the
* Object Table. Thus, if you don't use User Events or delete any kernel
- * objects you set this to zero (0) to minimize RAM usage.
+ * objects you set this to a very low value, e.g. 4, but not zero (0) since
+ * this causes a declaration of a zero-sized array, for which the C compiler
+ * behavior is not standardized and may cause misaligned data.
******************************************************************************/
#define SYMBOL_TABLE_SIZE 1000
+#if (SYMBOL_TABLE_SIZE == 0)
+#error "SYMBOL_TABLE_SIZE may not be zero!"
+#endif
+
+/*******************************************************************************
+ * USE_SEPARATE_USER_EVENT_BUFFER
+ *
+ * Macro which should be defined as an integer value.
+ * Default is zero (0).
+ *
+ * This enables and disables the use of the separate user event buffer.
+ *
+ * Note: When using the separate user event buffer, you may get an artificial
+ * task instance named "Unknown actor". This is added as a placeholder when the
+ * user event history is longer than the task scheduling history.
+ ******************************************************************************/
+#define USE_SEPARATE_USER_EVENT_BUFFER 0
+
+/*******************************************************************************
+ * USER_EVENT_BUFFER_SIZE
+ *
+ * Macro which should be defined as an integer value.
+ *
+ * This defines the capacity of the user event buffer, in number of slots.
+ * A single user event can use between 1 and X slots, depending on the data.
+ *
+ * Only in use if USE_SEPARATE_USER_EVENT_BUFFER is set to 1.
+ ******************************************************************************/
+#define USER_EVENT_BUFFER_SIZE 500
+
+/*******************************************************************************
+ * USER_EVENT_CHANNELS
+ *
+ * Macro which should be defined as an integer value.
+ *
+ * This defines the number of allowed user event channels.
+ *
+ * Only in use if USE_SEPARATE_USER_EVENT_BUFFER is set to 1.
+ ******************************************************************************/
+#define CHANNEL_FORMAT_PAIRS 32
+
/*******************************************************************************
* NTask, NISR, NQueue, NSemaphore, NMutex
*
@@ -91,31 +153,30 @@
*
* Using too small values will give an error message through the vTraceError
* routine, which makes the error message appear when opening the trace data
- * in FreeRTOS+Trace. If you are using the recorder status monitor task,
+ * in Tracealyzer. If you are using the recorder status monitor task,
* any error messages are displayed in console prints, assuming that the
* print macro has been defined properly (vConsolePrintMessage).
*
* It can be wise to start with very large values for these constants,
* unless you are very confident on these numbers. Then do a recording and
- * check the actual usage in FreeRTOS+Trace. This is shown by selecting
+ * check the actual usage in Tracealyzer. This is shown by selecting
* View -> Trace Details -> Resource Usage -> Object Table
*
- * NOTE 2: Remember to account for all tasks created by FreeRTOS, such as the
- * IDLE task, the FreeRTOS timer task, and any tasks created by other 3rd party
- * software components, such as communication stacks. The recorder also has an
- * optional monitor task to account for, if this is used.
+ * NOTE 2: Remember to account for all tasks and other objects created by
+ * the kernel, such as the IDLE task, any timer tasks, and any tasks created
+ * by other 3rd party software components, such as communication stacks.
* Moreover, one task slot is used to indicate "(startup)", i.e., a fictive
- * task that represent the time before the FreeRTOS scheduler starts.
+ * task that represent the time before the scheduler starts.
* NTask should thus be at least 2-3 slots larger than your application task count.
*
- * NOTE 3: The FreeRTOS timer task creates a Queue, that should be accounted
- * for in NQueue.
******************************************************************************/
#define NTask 15
#define NISR 4
#define NQueue 10
#define NSemaphore 10
#define NMutex 5
+#define NTimer 10
+#define NEventGroup 1
/* Maximum object name length for each class (includes zero termination) */
#define NameLenTask configMAX_TASK_NAME_LEN
@@ -123,13 +184,15 @@
#define NameLenQueue 15
#define NameLenSemaphore 15
#define NameLenMutex 15
+#define NameLenTimer 15
+#define NameLenEventGroup 15
/******************************************************************************
* TRACE_DESCRIPTION
*
* Macro which should be defined as a string.
*
- * This string is stored in the trace and displayed in FreeRTOS+Trace. Can be
+ * This string is stored in the trace and displayed in Tracealyzer. Can be
* used to store, e.g., system version or build date. This is also used to store
* internal error messages from the recorder, which if occurs overwrites the
* value defined here. This may be maximum 256 chars.
@@ -173,6 +236,17 @@
*****************************************************************************/
/******************************************************************************
+ * USE_TRACE_ASSERT
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ * Default is 0.
+ *
+ * If this is one (1), the TRACE_ASSERT macro will verify that a condition is
+ * true. If the condition is false, vTraceError() will be called.
+ *****************************************************************************/
+#define USE_TRACE_ASSERT 1
+
+/******************************************************************************
* INCLUDE_FLOAT_SUPPORT
*
* Macro which should be defined as either zero (0) or one (1).
@@ -186,7 +260,7 @@
* Note: vTracePrintF can still be used with integer and string arguments in
* either case.
*****************************************************************************/
-#define INCLUDE_FLOAT_SUPPORT 1
+#define INCLUDE_FLOAT_SUPPORT 0
/******************************************************************************
* INCLUDE_USER_EVENTS
@@ -200,8 +274,7 @@
* much faster than a printf and can therefore be used in timing critical code.
* See vTraceUserEvent() and vTracePrintF() in trcUser.h
*
- * Note that FreeRTOS+Trace Standard Edition or Professional Edition is required
- * for User Events, they are not displayed in FreeRTOS+Trace Free Edition.
+ * Note that User Events are not displayed in FreeRTOS+Trace Free Edition.
*****************************************************************************/
#define INCLUDE_USER_EVENTS 1
@@ -218,16 +291,28 @@
#define INCLUDE_READY_EVENTS 1
/*****************************************************************************
+ * INCLUDE_NEW_TIME_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ * Default is 0.
+ *
+ * If this is zero (1), events will be generated whenever the os clock is
+ * increased.
+ *****************************************************************************/
+#define INCLUDE_NEW_TIME_EVENTS 0
+
+/*****************************************************************************
* INCLUDE_ISR_TRACING
*
* Macro which should be defined as either zero (0) or one (1).
* Default is 1.
*
* If this is zero (0), the code for recording Interrupt Service Routines is
- * excluded to reduce code size. Note, recording ISRs require that you insert
- * calls to vTraceStoreISRBegin and vTraceStoreISREnd in your interrupt handlers.
- * There is no automatic recording of ISRs like for task scheduling, since
- * FreeRTOS does not have a central interrupt dispatcher.
+ * excluded to reduce code size.
+ *
+ * Note, if the kernel has no central interrupt dispatcher, recording ISRs
+ * require that you insert calls to vTraceStoreISRBegin and vTraceStoreISREnd
+ * in your interrupt handlers.
*****************************************************************************/
#define INCLUDE_ISR_TRACING 1
@@ -238,9 +323,8 @@
* Default is 1.
*
* This must be enabled (1) if tasks, queues or other
- * traced kernel objects are deleted at runtime, e.g., using vTaskDelete or
- * vQueueDelete. If no deletes are made, this can be set to 0 in order to
- * exclude the delete-handling code.
+ * traced kernel objects are deleted at runtime. If no deletes are made, this
+ * can be set to 0 in order to exclude the delete-handling code.
*****************************************************************************/
#ifdef INCLUDE_OBJECT_DELETE
#undef INCLUDE_OBJECT_DELETE
@@ -249,36 +333,47 @@
#define INCLUDE_OBJECT_DELETE 1
/******************************************************************************
+ * INCLUDE_MEMMANG_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ * Default is 1.
+ *
+ * This controls if malloc and free calls should be traced. Set this to zero to
+ * exclude malloc/free calls from the tracing.
+ *****************************************************************************/
+#define INCLUDE_MEMMANG_EVENTS 0
+
+/******************************************************************************
* CONFIGURATION RELATED TO BEHAVIOR
*****************************************************************************/
/******************************************************************************
- * RECORDER_STORE_MODE
+ * TRACE_RECORDER_STORE_MODE
*
* Macro which should be defined as one of:
- * - STORE_MODE_RING_BUFFER
- * - STORE_MODE_STOP_WHEN_FULL
- * Default is STORE_MODE_RING_BUFFER.
+ * - TRACE_STORE_MODE_RING_BUFFER
+ * - TRACE_STORE_MODE_STOP_WHEN_FULL
+ * Default is TRACE_STORE_MODE_RING_BUFFER.
*
- * With RECORDER_STORE_MODE set to STORE_MODE_RING_BUFFER, the events are stored
- * in a ring buffer, i.e., where the oldest events are overwritten when the
- * buffer becomes full. This allows you to get the last events leading up to an
- * interesting state, e.g., an error, without having a large trace buffer for
- * string the whole run since startup. In this mode, the recorder can run
+ * With TRACE_RECORDER_STORE_MODE set to TRACE_STORE_MODE_RING_BUFFER, the events are
+ * stored in a ring buffer, i.e., where the oldest events are overwritten when
+ * the buffer becomes full. This allows you to get the last events leading up
+ * to an interesting state, e.g., an error, without having a large trace buffer
+ * for string the whole run since startup. In this mode, the recorder can run
* "forever" as the buffer never gets full, i.e., in the sense that it always
* has room for more events.
*
- * To fetch the trace in mode STORE_MODE_RING_BUFFER, you need to first halt the
+ * To fetch the trace in mode TRACE_STORE_MODE_RING_BUFFER, you need to first halt the
* system using your debugger and then do a RAM dump, or to explicitly stop the
* recorder using vTraceStop() and then store/upload the trace data using a
- * FreeRTOS task that you need to provide yourself. The trace data is found in
- * the struct RecorderData, initialized in trcBase.c.
+ * task that you need to provide yourself. The trace data is found in the struct
+ * RecorderData, initialized in trcBase.c.
*
* Note that, if you upload the trace using a RAM dump, i.e., when the system is
* halted on a breakpoint or by a debugger command, there is no need to stop the
* recorder first.
*
- * When RECORDER_STORE_MODE is STORE_MODE_STOP_WHEN_FULL, the recording is
+ * When TRACE_RECORDER_STORE_MODE is TRACE_STORE_MODE_STOP_WHEN_FULL, the recording is
* stopped when the buffer becomes full. When the recorder stops itself this way
* vTracePortEnd() is called which allows for custom actions, such as triggering
* a task that stores the trace buffer, i.e., in case taking a RAM dump
@@ -286,12 +381,8 @@
* saves the trace to file directly, but this is not recommended in a real-time
* system since the scheduler is blocked during the processing of vTracePortEnd.
*****************************************************************************/
-#ifndef WIN32
-#define RECORDER_STORE_MODE STORE_MODE_RING_BUFFER
-#else
-/* Default in the Win32 demo */
-#define RECORDER_STORE_MODE STORE_MODE_STOP_WHEN_FULL
-#endif
+
+#define TRACE_RECORDER_STORE_MODE TRACE_STORE_MODE_RING_BUFFER
/******************************************************************************
* STOP_AFTER_N_EVENTS
@@ -318,27 +409,21 @@
*
* For tasks with "infinite" main loops (non-terminating tasks), the concept
* of a task instance has no clear definition, it is an application-specific
- * thing. FreeRTOS+Trace allows you to define Instance Finish Events (IFEs),
+ * thing. Tracealyzer allows you to define Instance Finish Events (IFEs),
* which marks the point in a cyclic task when the "task instance" ends.
* The IFE is a blocking kernel call, typically in the main loop of a task
* which typically reads a message queue, waits for a semaphore or performs
* an explicit delay.
*
- * If USE_IMPLICIT_IFE_RULES is one (1), the following FreeRTOS kernel calls
- * are considered by default to be IFEs (Implicit IFEs):
- * - vTaskDelay
- * - vTaskDelayUntil
- * - vTaskSuspend
- * - xQueueReceive (blocking cases only)
- * - xSemaphoreTake (blocking cases only)
+ * If USE_IMPLICIT_IFE_RULES is one (1), the kernel macros (trcKernelPort.h)
+ * will define what kernel calls are considered by default to be IFEs.
*
- * However, Implicit IFEs only applies to blocking kernel calls. If an
- * xQueueReceive reads a message without blocking, it does not create a new
+ * However, Implicit IFEs only applies to blocking kernel calls. If a
+ * service reads a message without blocking, it does not create a new
* instance since no blocking occurred.
*
- * Moreover, the actual IFE might sometimes be another blocking call such as
- * xQueueSend or xSemaphoreGive. We therefore allow for user-defined
- * Explicit IFEs by calling
+ * Moreover, the actual IFE might sometimes be another blocking call. We
+ * therefore allow for user-defined Explicit IFEs by calling
*
* vTraceTaskInstanceIsFinished()
*
@@ -346,8 +431,8 @@
* additional event but instead stores the service code and object handle
* of the IFE call as properties of the task.
*
- * If using Explicit IFEs and the task also calls an Implicit IFE like
- * vTaskDelay, this may result in additional incorrect task instances.
+ * If using Explicit IFEs and the task also calls an Implicit IFE, this may
+ * result in additional incorrect task instances.
* This is solved by disabling the Implicit IFEs for the task, by adding
* a call to
*
@@ -364,83 +449,86 @@
*****************************************************************************/
#define USE_IMPLICIT_IFE_RULES 1
+
/******************************************************************************
- * INCLUDE_SAVE_TO_FILE
+ * USE_16BIT_OBJECT_HANDLES
*
* Macro which should be defined as either zero (0) or one (1).
* Default is 0.
*
- * If enabled (1), the recorder will include code for saving the trace
- * to a local file system.
- ******************************************************************************/
-#ifdef WIN32
- #define INCLUDE_SAVE_TO_FILE 1
-#else
- #define INCLUDE_SAVE_TO_FILE 0
-#endif
-
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_PRIORITY
+ * If set to 0 (zero), the recorder uses 8-bit handles to identify kernel
+ * objects such as tasks and queues. This limits the supported number of
+ * concurrently active objects to 255 of each type (object class).
*
- * Macro which sets the priority of the "recorder status monitor" task.
- *
- * This task, vTraceMonitorTask in trcUser.c, periodically writes
- * the recorder status using the vTraceConsoleMessage macro, which is to
- * be mapped to your console "printf" routine. The task is named TraceMon but
- * is intentionally excluded from the demo trace.
- *
- * Default is tskIDLE_PRIORITY + 1
- * Note that if your system constantly has a high CPU load from high-priority
- * tasks, this might not be get a chance to execute.
+ * If set to 1 (one), the recorder uses 16-bit handles to identify kernel
+ * objects such as tasks and queues. This limits the supported number of
+ * concurrent objects to 65535 of each type (object class). However, since the
+ * object property table is limited to 64 KB, the practical limit is about
+ * 3000 objects in total.
*
- * See vTraceMonitorTask in trcUser.c
+ * NOTE: An object with a high ID (> 255) will generate an extra event
+ * (= 4 byte) in the event buffer.
+ *
+ * NOTE: Some internal tables in the recorder gets larger when using 16-bit
+ * handles. The additional RAM usage is 5-10 byte plus 1 byte per kernel object
+ *, i.e., task, queue, semaphore, mutex, etc.
*****************************************************************************/
-#define TRACE_PROGRESS_MONITOR_TASK_PRIORITY (tskIDLE_PRIORITY + 1)
+#define USE_16BIT_OBJECT_HANDLES 0
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_STACKSIZE
- *
- * Macro which sets the stack size of the "recorder status monitor" task.
- *
- * This task, vTraceMonitorTask in trcUser.c, periodically writes
- * the recorder status using the vTraceConsoleMessage macro, which is to
- * be mapped to your console "printf" routine. The task is intentionally
- * excluded from the demo trace.
- *
- * See vTraceMonitorTask in trcUser.c
- *****************************************************************************/
-#define TRACE_PROGRESS_MONITOR_TASK_STACKSIZE 500
+/****** Port Name ******************** Code ** Official ** OS Platform ******
+* PORT_APPLICATION_DEFINED -2 - -
+* PORT_NOT_SET -1 - -
+* PORT_HWIndependent 0 Yes Any
+* PORT_Win32 1 Yes FreeRTOS Win32
+* PORT_Atmel_AT91SAM7 2 No Any
+* PORT_Atmel_UC3A0 3 No Any
+* PORT_ARM_CortexM 4 Yes Any
+* PORT_Renesas_RX600 5 Yes Any
+* PORT_Microchip_dsPIC_AND_PIC24 6 Yes Any
+* PORT_TEXAS_INSTRUMENTS_TMS570 7 No Any
+* PORT_TEXAS_INSTRUMENTS_MSP430 8 No Any
+* PORT_MICROCHIP_PIC32 9 No Any
+* PORT_XILINX_PPC405 10 No FreeRTOS
+* PORT_XILINX_PPC440 11 No FreeRTOS
+* PORT_XILINX_MICROBLAZE 12 No Any
+* PORT_NXP_LPC210X 13 No Any
+*****************************************************************************/
+#define SELECTED_PORT PORT_ARM_CortexM
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_PERIOD
- *
- * Macro which sets the period of the "recorder status monitor" task.
- *
- * This task, vTraceMonitorTask in trcUser.c, periodically writes
- * the recorder status using the vTraceConsoleMessage macro, which is to
- * be mapped to your console "printf" routine. The task is named TraceMon but
- * is intentionally excluded from the demo trace.
- *
- * Default is 1000 FreeRTOS ticks (typically 1 second). On the Windows port, a
- * lower value is suggested since the Windows port runs very slowly, often 20-40
- * times slower than the simulated FreeRTOS time.
- *
- * See vTraceMonitorTask in trcUser.c
- *****************************************************************************/
-#ifdef WIN32
- #define TRACE_PROGRESS_MONITOR_TASK_PERIOD 100
-#else
- #define TRACE_PROGRESS_MONITOR_TASK_PERIOD 1000
+#if (SELECTED_PORT == PORT_NOT_SET)
+#error "You need to define SELECTED_PORT here!"
#endif
/******************************************************************************
- * TEAM_LICENSE_CODE
+* USE_PRIMASK_CS (for Cortex M devices only)
+*
+* An integer constant that selects between two options for the critical
+* sections of the recorder library.
*
- * Macro which defines a string - the team license code.
- * If no team license is available, this should be an empty string "".
- * This should be maximum 32 chars, including zero-termination.
- *****************************************************************************/
-#define TEAM_LICENSE_CODE ""
+* 0: The default FreeRTOS critical section (BASEPRI) - default setting
+* 1: Always disable ALL interrupts (using PRIMASK)
+ *
+* Option 0 uses the standard FreeRTOS macros for critical sections.
+* However, on Cortex-M devices they only disable interrupts with priorities
+* below a certain configurable level, while higher priority ISRs remain active.
+* Such high-priority ISRs may not use the recorder functions in this mode.
+*
+* Option 1 allows you to safely call the recorder from any ISR, independent of
+* the interrupt priority. This mode may however cause higher IRQ latencies
+* (some microseconds) since ALL configurable interrupts are disabled during
+* the recorder's critical sections in this mode, using the PRIMASK register.
+ ******************************************************************************/
+#define USE_PRIMASK_CS 0
+
+/******************************************************************************
+* HEAP_SIZE_BELOW_16M
+*
+* An integer constant that can be used to reduce the buffer usage of memory
+* allocation events (malloc/free). This value should be 1 if the heap size is
+* below 16 MB (2^24 byte), and you can live with addresses truncated to the
+* lower 24 bit. Otherwise set it to 0 to get the full 32-bit addresses.
+******************************************************************************/
+#define HEAP_SIZE_BELOW_16M 0
#endif
