- Remove the standard demo files that used the [long since deprecated] alternative API.
- Add standard demo task that tests the new xTaskAbortDelay() function.
- Update the Win32 Visual Studio project to use Visual Studio 2015 Community Edition.
- Rename the xGenericListItem TCB member to xStateListItem as it better describes the member's purpose.

FreeRTOS-Plus/Demo/Also_See_FreeRTOS+TCP_and_FreeRTOS_FAT_in_the_lab.url

@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+URL=http://www.freertos.org/labs
+IDList=

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/File-Related-CLI-commands.c

@@ -0,0 +1,572 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* FreeRTOS+CLI includes. */
+#include "FreeRTOS_CLI.h"
+
+/* File system includes. */
+#include "fat_sl.h"
+#include "api_mdriver_ram.h"
+
+#ifdef _WINDOWS_
+	#define snprintf _snprintf
+#endif
+
+#define cliNEW_LINE		"\r\n"
+
+/*******************************************************************************
+ * See the URL in the comments within main.c for the location of the online
+ * documentation.
+ ******************************************************************************/
+
+/*
+ * Print out information on a single file.
+ */
+static void prvCreateFileInfoString( char *pcBuffer, F_FIND *pxFindStruct );
+
+/*
+ * Copies an existing file into a newly created file.
+ */
+static BaseType_t prvPerformCopy( const char *pcSourceFile,
+									int32_t lSourceFileLength,
+									const char *pcDestinationFile,
+									char *pxWriteBuffer,
+									size_t xWriteBufferLen );
+
+/*
+ * Implements the DIR command.
+ */
+static BaseType_t prvDIRCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the CD command.
+ */
+static BaseType_t prvCDCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the DEL command.
+ */
+static BaseType_t prvDELCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the TYPE command.
+ */
+static BaseType_t prvTYPECommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the COPY command.
+ */
+static BaseType_t prvCOPYCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/* Structure that defines the DIR command line command, which lists all the
+files in the current directory. */
+static const CLI_Command_Definition_t xDIR =
+{
+	"dir", /* The command string to type. */
+	"\r\ndir:\r\n Lists the files in the current directory\r\n",
+	prvDIRCommand, /* The function to run. */
+	0 /* No parameters are expected. */
+};
+
+/* Structure that defines the CD command line command, which changes the
+working directory. */
+static const CLI_Command_Definition_t xCD =
+{
+	"cd", /* The command string to type. */
+	"\r\ncd <dir name>:\r\n Changes the working directory\r\n",
+	prvCDCommand, /* The function to run. */
+	1 /* One parameter is expected. */
+};
+
+/* Structure that defines the TYPE command line command, which prints the
+contents of a file to the console. */
+static const CLI_Command_Definition_t xTYPE =
+{
+	"type", /* The command string to type. */
+	"\r\ntype <filename>:\r\n Prints file contents to the terminal\r\n",
+	prvTYPECommand, /* The function to run. */
+	1 /* One parameter is expected. */
+};
+
+/* Structure that defines the DEL command line command, which deletes a file. */
+static const CLI_Command_Definition_t xDEL =
+{
+	"del", /* The command string to type. */
+	"\r\ndel <filename>:\r\n deletes a file or directory\r\n",
+	prvDELCommand, /* The function to run. */
+	1 /* One parameter is expected. */
+};
+
+/* Structure that defines the COPY command line command, which deletes a file. */
+static const CLI_Command_Definition_t xCOPY =
+{
+	"copy", /* The command string to type. */
+	"\r\ncopy <source file> <dest file>:\r\n Copies <source file> to <dest file>\r\n",
+	prvCOPYCommand, /* The function to run. */
+	2 /* Two parameters are expected. */
+};
+
+
+/*-----------------------------------------------------------*/
+
+void vRegisterFileSystemCLICommands( void )
+{
+	/* Register all the command line commands defined immediately above. */
+	FreeRTOS_CLIRegisterCommand( &xDIR );
+	FreeRTOS_CLIRegisterCommand( &xCD );
+	FreeRTOS_CLIRegisterCommand( &xTYPE );
+	FreeRTOS_CLIRegisterCommand( &xDEL );
+	FreeRTOS_CLIRegisterCommand( &xCOPY );
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvTYPECommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn = pdTRUE;
+static F_FILE *pxFile = NULL;
+int iChar;
+size_t xByte;
+size_t xColumns = 50U;
+
+	/* Ensure there is always a null terminator after each character written. */
+	memset( pcWriteBuffer, 0x00, xWriteBufferLen );
+
+	/* Ensure the buffer leaves space for the \r\n. */
+	configASSERT( xWriteBufferLen > ( strlen( cliNEW_LINE ) * 2 ) );
+	xWriteBufferLen -= strlen( cliNEW_LINE );
+
+	if( xWriteBufferLen < xColumns )
+	{
+		/* Ensure the loop that uses xColumns as an end condition does not
+		write off the end of the buffer. */
+		xColumns = xWriteBufferLen;
+	}
+
+	if( pxFile == NULL )
+	{
+		/* The file has not been opened yet.  Find the file name. */
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							1,						/* Return the first parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
+
+		/* Sanity check something was returned. */
+		configASSERT( pcParameter );
+
+		/* Attempt to open the requested file. */
+		pxFile = f_open( pcParameter, "r" );
+	}
+
+	if( pxFile != NULL )
+	{
+		/* Read the next chunk of data from the file. */
+		for( xByte = 0; xByte < xColumns; xByte++ )
+		{
+			iChar = f_getc( pxFile );
+
+			if( iChar == -1 )
+			{
+				/* No more characters to return. */
+				f_close( pxFile );
+				pxFile = NULL;
+				break;
+			}
+			else
+			{
+				pcWriteBuffer[ xByte ] = ( char ) iChar;
+			}
+		}
+	}
+
+	if( pxFile == NULL )
+	{
+		/* Either the file was not opened, or all the data from the file has
+		been returned and the file is now closed. */
+		xReturn = pdFALSE;
+	}
+
+	strcat( pcWriteBuffer, cliNEW_LINE );
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvCDCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *pcParameter;
+BaseType_t xParameterStringLength;
+unsigned char ucReturned;
+size_t xStringLength;
+
+	/* Obtain the parameter string. */
+	pcParameter = FreeRTOS_CLIGetParameter
+					(
+						pcCommandString,		/* The command string itself. */
+						1,						/* Return the first parameter. */
+						&xParameterStringLength	/* Store the parameter string length. */
+					);
+
+	/* Sanity check something was returned. */
+	configASSERT( pcParameter );
+
+	/* Attempt to move to the requested directory. */
+	ucReturned = f_chdir( pcParameter );
+
+	if( ucReturned == F_NO_ERROR )
+	{
+		sprintf( pcWriteBuffer, "In: " );
+		xStringLength = strlen( pcWriteBuffer );
+		f_getcwd( &( pcWriteBuffer[ xStringLength ] ), ( unsigned char ) ( xWriteBufferLen - xStringLength ) );
+	}
+	else
+	{
+		sprintf( pcWriteBuffer, "Error" );
+	}
+
+	strcat( pcWriteBuffer, cliNEW_LINE );
+
+	return pdFALSE;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvDIRCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+static F_FIND *pxFindStruct = NULL;
+unsigned char ucReturned;
+BaseType_t xReturn = pdFALSE;
+
+	/* This assumes pcWriteBuffer is long enough. */
+	( void ) pcCommandString;
+
+	/* Ensure the buffer leaves space for the \r\n. */
+	configASSERT( xWriteBufferLen > ( strlen( cliNEW_LINE ) * 2 ) );
+	xWriteBufferLen -= strlen( cliNEW_LINE );
+
+	if( pxFindStruct == NULL )
+	{
+		/* This is the first time this function has been executed since the Dir
+		command was run.  Create the find structure. */
+		pxFindStruct = ( F_FIND * ) pvPortMalloc( sizeof( F_FIND ) );
+
+		if( pxFindStruct != NULL )
+		{
+			ucReturned = f_findfirst( "*.*", pxFindStruct );
+
+			if( ucReturned == F_NO_ERROR )
+			{
+				prvCreateFileInfoString( pcWriteBuffer, pxFindStruct );
+				xReturn = pdPASS;
+			}
+			else
+			{
+				snprintf( pcWriteBuffer, xWriteBufferLen, "Error: f_findfirst() failed." );
+			}
+		}
+		else
+		{
+			snprintf( pcWriteBuffer, xWriteBufferLen, "Failed to allocate RAM (using heap_4.c will prevent fragmentation)." );
+		}
+	}
+	else
+	{
+		/* The find struct has already been created.  Find the next file in
+		the directory. */
+		ucReturned = f_findnext( pxFindStruct );
+
+		if( ucReturned == F_NO_ERROR )
+		{
+			prvCreateFileInfoString( pcWriteBuffer, pxFindStruct );
+			xReturn = pdPASS;
+		}
+		else
+		{
+			/* There are no more files.  Free the find structure. */
+			vPortFree( pxFindStruct );
+			pxFindStruct = NULL;
+
+			/* No string to return. */
+			pcWriteBuffer[ 0 ] = 0x00;
+		}
+	}
+
+	strcat( pcWriteBuffer, cliNEW_LINE );
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvDELCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *pcParameter;
+BaseType_t xParameterStringLength;
+unsigned char ucReturned;
+
+	/* This function assumes xWriteBufferLen is large enough! */
+	( void ) xWriteBufferLen;
+
+	/* Obtain the parameter string. */
+	pcParameter = FreeRTOS_CLIGetParameter
+					(
+						pcCommandString,		/* The command string itself. */
+						1,						/* Return the first parameter. */
+						&xParameterStringLength	/* Store the parameter string length. */
+					);
+
+	/* Sanity check something was returned. */
+	configASSERT( pcParameter );
+
+	/* Attempt to delete the file. */
+	ucReturned = f_delete( pcParameter );
+
+	if( ucReturned == F_NO_ERROR )
+	{
+		sprintf( pcWriteBuffer, "%s was deleted", pcParameter );
+	}
+	else
+	{
+		sprintf( pcWriteBuffer, "Error" );
+	}
+
+	strcat( pcWriteBuffer, cliNEW_LINE );
+
+	return pdFALSE;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvCOPYCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+char *pcSourceFile, *pcDestinationFile;
+BaseType_t xParameterStringLength;
+long lSourceLength, lDestinationLength = 0;
+
+	/* Obtain the name of the destination file. */
+	pcDestinationFile = ( char * ) FreeRTOS_CLIGetParameter
+									(
+										pcCommandString,		/* The command string itself. */
+										2,						/* Return the second parameter. */
+										&xParameterStringLength	/* Store the parameter string length. */
+									);
+
+	/* Sanity check something was returned. */
+	configASSERT( pcDestinationFile );
+
+	/* Obtain the name of the source file. */
+	pcSourceFile = ( char * ) FreeRTOS_CLIGetParameter
+								(
+									pcCommandString,		/* The command string itself. */
+									1,						/* Return the first parameter. */
+									&xParameterStringLength	/* Store the parameter string length. */
+								);
+
+	/* Sanity check something was returned. */
+	configASSERT( pcSourceFile );
+
+	/* Terminate the string. */
+	pcSourceFile[ xParameterStringLength ] = 0x00;
+
+	/* See if the source file exists, obtain its length if it does. */
+	lSourceLength = f_filelength( pcSourceFile );
+
+	if( lSourceLength == 0 )
+	{
+		sprintf( pcWriteBuffer, "Source file does not exist" );
+	}
+	else
+	{
+		/* See if the destination file exists. */
+		lDestinationLength = f_filelength( pcDestinationFile );
+
+		if( lDestinationLength != 0 )
+		{
+			sprintf( pcWriteBuffer, "Error: Destination file already exists" );
+		}
+	}
+
+	/* Continue only if the source file exists and the destination file does
+	not exist. */
+	if( ( lSourceLength != 0 ) && ( lDestinationLength == 0 ) )
+	{
+		if( prvPerformCopy( pcSourceFile, lSourceLength, pcDestinationFile, pcWriteBuffer, xWriteBufferLen ) == pdPASS )
+		{
+			sprintf( pcWriteBuffer, "Copy made" );
+		}
+		else
+		{
+			sprintf( pcWriteBuffer, "Error during copy" );
+		}
+	}
+
+	strcat( pcWriteBuffer, cliNEW_LINE );
+
+	return pdFALSE;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvPerformCopy( const char *pcSourceFile,
+									int32_t lSourceFileLength,
+									const char *pcDestinationFile,
+									char *pxWriteBuffer,
+									size_t xWriteBufferLen )
+{
+int32_t lBytesRead = 0, lBytesToRead, lBytesRemaining;
+F_FILE *pxFile;
+BaseType_t xReturn = pdPASS;
+
+	/* NOTE:  Error handling has been omitted for clarity. */
+
+	while( lBytesRead < lSourceFileLength )
+	{
+		/* How many bytes are left? */
+		lBytesRemaining = lSourceFileLength - lBytesRead;
+
+		/* How many bytes should be read this time around the loop.  Can't
+		read more bytes than will fit into the buffer. */
+		if( lBytesRemaining > ( long ) xWriteBufferLen )
+		{
+			lBytesToRead = ( long ) xWriteBufferLen;
+		}
+		else
+		{
+			lBytesToRead = lBytesRemaining;
+		}
+
+		/* Open the source file, seek past the data that has already been
+		read from the file, read the next block of data, then close the
+		file again so the destination file can be opened. */
+		pxFile = f_open( pcSourceFile, "r" );
+		if( pxFile != NULL )
+		{
+			f_seek( pxFile, lBytesRead, F_SEEK_SET );
+			f_read( pxWriteBuffer, lBytesToRead, 1, pxFile );
+			f_close( pxFile );
+		}
+		else
+		{
+			xReturn = pdFAIL;
+			break;
+		}
+
+		/* Open the destination file and write the block of data to the end of
+		the file. */
+		pxFile = f_open( pcDestinationFile, "a" );
+		if( pxFile != NULL )
+		{
+			f_write( pxWriteBuffer, lBytesToRead, 1, pxFile );
+			f_close( pxFile );
+		}
+		else
+		{
+			xReturn = pdFAIL;
+			break;
+		}
+
+		lBytesRead += lBytesToRead;
+	}
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+static void prvCreateFileInfoString( char *pcBuffer, F_FIND *pxFindStruct )
+{
+const char *pcWritableFile = "writable file", *pcReadOnlyFile = "read only file", *pcDirectory = "directory";
+const char * pcAttrib;
+
+	/* Point pcAttrib to a string that describes the file. */
+	if( ( pxFindStruct->attr & F_ATTR_DIR ) != 0 )
+	{
+		pcAttrib = pcDirectory;
+	}
+	else if( pxFindStruct->attr & F_ATTR_READONLY )
+	{
+		pcAttrib = pcReadOnlyFile;
+	}
+	else
+	{
+		pcAttrib = pcWritableFile;
+	}
+
+	/* Create a string that includes the file name, the file size and the
+	attributes string. */
+	sprintf( pcBuffer, "%s [%s] [size=%d]", pxFindStruct->filename, pcAttrib, ( int ) pxFindStruct->filesize );
+}

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/Sample-CLI-commands.c

@@ -0,0 +1,522 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+
+ /******************************************************************************
+ *
+ * http://www.FreeRTOS.org/cli
+ *
+ ******************************************************************************/
+
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* FreeRTOS+CLI includes. */
+#include "FreeRTOS_CLI.h"
+
+#ifndef  configINCLUDE_TRACE_RELATED_CLI_COMMANDS
+	#define configINCLUDE_TRACE_RELATED_CLI_COMMANDS 0
+#endif
+
+#ifndef configINCLUDE_QUERY_HEAP_COMMAND
+	#define configINCLUDE_QUERY_HEAP_COMMAND 0
+#endif
+
+/*
+ * The function that registers the commands that are defined within this file.
+ */
+void vRegisterSampleCLICommands( void );
+
+/*
+ * Implements the task-stats command.
+ */
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the run-time-stats command.
+ */
+#if( configGENERATE_RUN_TIME_STATS == 1 )
+	static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+#endif /* configGENERATE_RUN_TIME_STATS */
+
+/*
+ * Implements the echo-three-parameters command.
+ */
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the echo-parameters command.
+ */
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the "query heap" command.
+ */
+#if( configINCLUDE_QUERY_HEAP_COMMAND == 1 )
+	static BaseType_t prvQueryHeapCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+#endif
+
+/*
+ * Implements the "trace start" and "trace stop" commands;
+ */
+#if( configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1 )
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+#endif
+
+/* Structure that defines the "task-stats" command line command.  This generates
+a table that gives information on each task in the system. */
+static const CLI_Command_Definition_t xTaskStats =
+{
+	"task-stats", /* The command string to type. */
+	"\r\ntask-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n",
+	prvTaskStatsCommand, /* The function to run. */
+	0 /* No parameters are expected. */
+};
+
+/* Structure that defines the "echo_3_parameters" command line command.  This
+takes exactly three parameters that the command simply echos back one at a
+time. */
+static const CLI_Command_Definition_t xThreeParameterEcho =
+{
+	"echo-3-parameters",
+	"\r\necho-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n",
+	prvThreeParameterEchoCommand, /* The function to run. */
+	3 /* Three parameters are expected, which can take any value. */
+};
+
+/* Structure that defines the "echo_parameters" command line command.  This
+takes a variable number of parameters that the command simply echos back one at
+a time. */
+static const CLI_Command_Definition_t xParameterEcho =
+{
+	"echo-parameters",
+	"\r\necho-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n",
+	prvParameterEchoCommand, /* The function to run. */
+	-1 /* The user can enter any number of commands. */
+};
+
+#if( configGENERATE_RUN_TIME_STATS == 1 )
+	/* Structure that defines the "run-time-stats" command line command.   This
+	generates a table that shows how much run time each task has */
+	static const CLI_Command_Definition_t xRunTimeStats =
+	{
+		"run-time-stats", /* The command string to type. */
+		"\r\nrun-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n",
+		prvRunTimeStatsCommand, /* The function to run. */
+		0 /* No parameters are expected. */
+	};
+#endif /* configGENERATE_RUN_TIME_STATS */
+
+#if( configINCLUDE_QUERY_HEAP_COMMAND == 1 )
+	/* Structure that defines the "query_heap" command line command. */
+	static const CLI_Command_Definition_t xQueryHeap =
+	{
+		"query-heap",
+		"\r\nquery-heap:\r\n Displays the free heap space, and minimum ever free heap space.\r\n",
+		prvQueryHeapCommand, /* The function to run. */
+		0 /* The user can enter any number of commands. */
+	};
+#endif /* configQUERY_HEAP_COMMAND */
+
+#if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
+	/* Structure that defines the "trace" command line command.  This takes a single
+	parameter, which can be either "start" or "stop". */
+	static const CLI_Command_Definition_t xStartStopTrace =
+	{
+		"trace",
+		"\r\ntrace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n",
+		prvStartStopTraceCommand, /* The function to run. */
+		1 /* One parameter is expected.  Valid values are "start" and "stop". */
+	};
+#endif /* configINCLUDE_TRACE_RELATED_CLI_COMMANDS */
+
+/*-----------------------------------------------------------*/
+
+void vRegisterSampleCLICommands( void )
+{
+	/* Register all the command line commands defined immediately above. */
+	FreeRTOS_CLIRegisterCommand( &xTaskStats );	
+	FreeRTOS_CLIRegisterCommand( &xThreeParameterEcho );
+	FreeRTOS_CLIRegisterCommand( &xParameterEcho );
+
+	#if( configGENERATE_RUN_TIME_STATS == 1 )
+	{
+		FreeRTOS_CLIRegisterCommand( &xRunTimeStats );
+	}
+	#endif
+	
+	#if( configINCLUDE_QUERY_HEAP_COMMAND == 1 )
+	{
+		FreeRTOS_CLIRegisterCommand( &xQueryHeap );
+	}
+	#endif
+
+	#if( configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1 )
+	{
+		FreeRTOS_CLIRegisterCommand( &xStartStopTrace );
+	}
+	#endif
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *const pcHeader = "     State   Priority  Stack    #\r\n************************************************\r\n";
+BaseType_t xSpacePadding;
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	/* Generate a table of task stats. */
+	strcpy( pcWriteBuffer, "Task" );
+	pcWriteBuffer += strlen( pcWriteBuffer );
+
+	/* Minus three for the null terminator and half the number of characters in
+	"Task" so the column lines up with the centre of the heading. */
+	configASSERT( configMAX_TASK_NAME_LEN > 3 );
+	for( xSpacePadding = strlen( "Task" ); xSpacePadding < ( configMAX_TASK_NAME_LEN - 3 ); xSpacePadding++ )
+	{
+		/* Add a space to align columns after the task's name. */
+		*pcWriteBuffer = ' ';
+		pcWriteBuffer++;
+
+		/* Ensure always terminated. */
+		*pcWriteBuffer = 0x00;
+	}
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskList( pcWriteBuffer + strlen( pcHeader ) );
+
+	/* There is no more data to return after this single string, so return
+	pdFALSE. */
+	return pdFALSE;
+}
+/*-----------------------------------------------------------*/
+
+#if( configINCLUDE_QUERY_HEAP_COMMAND == 1 )
+
+	static BaseType_t prvQueryHeapCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+	{
+		/* Remove compile time warnings about unused parameters, and check the
+		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+		write buffer length is adequate, so does not check for buffer overflows. */
+		( void ) pcCommandString;
+		( void ) xWriteBufferLen;
+		configASSERT( pcWriteBuffer );
+
+		sprintf( pcWriteBuffer, "Current free heap %d bytes, minimum ever free heap %d bytes\r\n", ( int ) xPortGetFreeHeapSize(), ( int ) xPortGetMinimumEverFreeHeapSize() );
+
+		/* There is no more data to return after this single string, so return
+		pdFALSE. */
+		return pdFALSE;
+	}
+
+#endif /* configINCLUDE_QUERY_HEAP */
+/*-----------------------------------------------------------*/
+
+#if( configGENERATE_RUN_TIME_STATS == 1 )
+	
+	static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+	{
+	const char * const pcHeader = "  Abs Time      % Time\r\n****************************************\r\n";
+	BaseType_t xSpacePadding;
+
+		/* Remove compile time warnings about unused parameters, and check the
+		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+		write buffer length is adequate, so does not check for buffer overflows. */
+		( void ) pcCommandString;
+		( void ) xWriteBufferLen;
+		configASSERT( pcWriteBuffer );
+
+		/* Generate a table of task stats. */
+		strcpy( pcWriteBuffer, "Task" );
+		pcWriteBuffer += strlen( pcWriteBuffer );
+
+		/* Pad the string "task" with however many bytes necessary to make it the
+		length of a task name.  Minus three for the null terminator and half the
+		number of characters in	"Task" so the column lines up with the centre of
+		the heading. */
+		for( xSpacePadding = strlen( "Task" ); xSpacePadding < ( configMAX_TASK_NAME_LEN - 3 ); xSpacePadding++ )
+		{
+			/* Add a space to align columns after the task's name. */
+			*pcWriteBuffer = ' ';
+			pcWriteBuffer++;
+
+			/* Ensure always terminated. */
+			*pcWriteBuffer = 0x00;
+		}
+
+		strcpy( pcWriteBuffer, pcHeader );
+		vTaskGetRunTimeStats( pcWriteBuffer + strlen( pcHeader ) );
+
+		/* There is no more data to return after this single string, so return
+		pdFALSE. */
+		return pdFALSE;
+	}
+	
+#endif /* configGENERATE_RUN_TIME_STATS */
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static UBaseType_t uxParameterNumber = 0;
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	if( uxParameterNumber == 0 )
+	{
+		/* The first time the function is called after the command has been
+		entered just a header string is returned. */
+		sprintf( pcWriteBuffer, "The three parameters were:\r\n" );
+
+		/* Next time the function is called the first parameter will be echoed
+		back. */
+		uxParameterNumber = 1U;
+
+		/* There is more data to be returned as no parameters have been echoed
+		back yet. */
+		xReturn = pdPASS;
+	}
+	else
+	{
+		/* Obtain the parameter string. */
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							uxParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
+
+		/* Sanity check something was returned. */
+		configASSERT( pcParameter );
+
+		/* Return the parameter string. */
+		memset( pcWriteBuffer, 0x00, xWriteBufferLen );
+		sprintf( pcWriteBuffer, "%d: ", ( int ) uxParameterNumber );
+		strncat( pcWriteBuffer, pcParameter, ( size_t ) xParameterStringLength );
+		strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+
+		/* If this is the last of the three parameters then there are no more
+		strings to return after this one. */
+		if( uxParameterNumber == 3U )
+		{
+			/* If this is the last of the three parameters then there are no more
+			strings to return after this one. */
+			xReturn = pdFALSE;
+			uxParameterNumber = 0;
+		}
+		else
+		{
+			/* There are more parameters to return after this one. */
+			xReturn = pdTRUE;
+			uxParameterNumber++;
+		}
+	}
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static UBaseType_t uxParameterNumber = 0;
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	if( uxParameterNumber == 0 )
+	{
+		/* The first time the function is called after the command has been
+		entered just a header string is returned. */
+		sprintf( pcWriteBuffer, "The parameters were:\r\n" );
+
+		/* Next time the function is called the first parameter will be echoed
+		back. */
+		uxParameterNumber = 1U;
+
+		/* There is more data to be returned as no parameters have been echoed
+		back yet. */
+		xReturn = pdPASS;
+	}
+	else
+	{
+		/* Obtain the parameter string. */
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							uxParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
+
+		if( pcParameter != NULL )
+		{
+			/* Return the parameter string. */
+			memset( pcWriteBuffer, 0x00, xWriteBufferLen );
+			sprintf( pcWriteBuffer, "%d: ", ( int ) uxParameterNumber );
+			strncat( pcWriteBuffer, ( char * ) pcParameter, ( size_t ) xParameterStringLength );
+			strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+
+			/* There might be more parameters to return after this one. */
+			xReturn = pdTRUE;
+			uxParameterNumber++;
+		}
+		else
+		{
+			/* No more parameters were found.  Make sure the write buffer does
+			not contain a valid string. */
+			pcWriteBuffer[ 0 ] = 0x00;
+
+			/* No more data to return. */
+			xReturn = pdFALSE;
+
+			/* Start over the next time this command is executed. */
+			uxParameterNumber = 0;
+		}
+	}
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+#if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
+
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+	{
+	const char *pcParameter;
+	BaseType_t lParameterStringLength;
+
+		/* Remove compile time warnings about unused parameters, and check the
+		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+		write buffer length is adequate, so does not check for buffer overflows. */
+		( void ) pcCommandString;
+		( void ) xWriteBufferLen;
+		configASSERT( pcWriteBuffer );
+
+		/* Obtain the parameter string. */
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							1,						/* Return the first parameter. */
+							&lParameterStringLength	/* Store the parameter string length. */
+						);
+
+		/* Sanity check something was returned. */
+		configASSERT( pcParameter );
+
+		/* There are only two valid parameter values. */
+		if( strncmp( pcParameter, "start", strlen( "start" ) ) == 0 )
+		{
+			/* Start or restart the trace. */
+			vTraceStop();
+			vTraceClear();
+			vTraceStart();
+
+			sprintf( pcWriteBuffer, "Trace recording (re)started.\r\n" );
+		}
+		else if( strncmp( pcParameter, "stop", strlen( "stop" ) ) == 0 )
+		{
+			/* End the trace, if one is running. */
+			vTraceStop();
+			sprintf( pcWriteBuffer, "Stopping trace recording.\r\n" );
+		}
+		else
+		{
+			sprintf( pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
+		}
+
+		/* There is no more data to return after this single string, so return
+		pdFALSE. */
+		return pdFALSE;
+	}
+
+#endif /* configINCLUDE_TRACE_RELATED_CLI_COMMANDS */

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/UARTCommandConsole.c

@@ -0,0 +1,268 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/*
+ * NOTE:  This file uses a third party USB CDC driver.
+ */
+
+/* Standard includes. */
+#include "string.h"
+#include "stdio.h"
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+#include "semphr.h"
+
+/* Example includes. */
+#include "FreeRTOS_CLI.h"
+
+/* Demo application includes. */
+#include "serial.h"
+
+/* Dimensions the buffer into which input characters are placed. */
+#define cmdMAX_INPUT_SIZE		50
+
+/* Dimentions a buffer to be used by the UART driver, if the UART driver uses a
+buffer at all. */
+#define cmdQUEUE_LENGTH			25
+
+/* DEL acts as a backspace. */
+#define cmdASCII_DEL		( 0x7F )
+
+/* The maximum time to wait for the mutex that guards the UART to become
+available. */
+#define cmdMAX_MUTEX_WAIT		pdMS_TO_TICKS( 300 )
+
+#ifndef configCLI_BAUD_RATE
+	#define configCLI_BAUD_RATE	115200
+#endif
+
+/*-----------------------------------------------------------*/
+
+/*
+ * The task that implements the command console processing.
+ */
+static void prvUARTCommandConsoleTask( void *pvParameters );
+void vUARTCommandConsoleStart( uint16_t usStackSize, UBaseType_t uxPriority );
+
+/*-----------------------------------------------------------*/
+
+/* Const messages output by the command console. */
+static const char * const pcWelcomeMessage = "FreeRTOS command server.\r\nType Help to view a list of registered commands.\r\n\r\n>";
+static const char * const pcEndOfOutputMessage = "\r\n[Press ENTER to execute the previous command again]\r\n>";
+static const char * const pcNewLine = "\r\n";
+
+/* Used to guard access to the UART in case messages are sent to the UART from
+more than one task. */
+static SemaphoreHandle_t xTxMutex = NULL;
+
+/* The handle to the UART port, which is not used by all ports. */
+static xComPortHandle xPort = 0;
+
+/*-----------------------------------------------------------*/
+
+void vUARTCommandConsoleStart( uint16_t usStackSize, UBaseType_t uxPriority )
+{
+	/* Create the semaphore used to access the UART Tx. */
+	xTxMutex = xSemaphoreCreateMutex();
+	configASSERT( xTxMutex );
+
+	/* Create that task that handles the console itself. */
+	xTaskCreate( 	prvUARTCommandConsoleTask,	/* The task that implements the command console. */
+					"CLI",						/* Text name assigned to the task.  This is just to assist debugging.  The kernel does not use this name itself. */
+					usStackSize,				/* The size of the stack allocated to the task. */
+					NULL,						/* The parameter is not used, so NULL is passed. */
+					uxPriority,					/* The priority allocated to the task. */
+					NULL );						/* A handle is not required, so just pass NULL. */
+}
+/*-----------------------------------------------------------*/
+
+static void prvUARTCommandConsoleTask( void *pvParameters )
+{
+signed char cRxedChar;
+uint8_t ucInputIndex = 0;
+char *pcOutputString;
+static char cInputString[ cmdMAX_INPUT_SIZE ], cLastInputString[ cmdMAX_INPUT_SIZE ];
+BaseType_t xReturned;
+xComPortHandle xPort;
+
+	( void ) pvParameters;
+
+	/* Obtain the address of the output buffer.  Note there is no mutual
+	exclusion on this buffer as it is assumed only one command console interface
+	will be used at any one time. */
+	pcOutputString = FreeRTOS_CLIGetOutputBuffer();
+
+	/* Initialise the UART. */
+	xPort = xSerialPortInitMinimal( configCLI_BAUD_RATE, cmdQUEUE_LENGTH );
+
+	/* Send the welcome message. */
+	vSerialPutString( xPort, ( signed char * ) pcWelcomeMessage, ( unsigned short ) strlen( pcWelcomeMessage ) );
+
+	for( ;; )
+	{
+		/* Wait for the next character.  The while loop is used in case
+		INCLUDE_vTaskSuspend is not set to 1 - in which case portMAX_DELAY will
+		be a genuine block time rather than an infinite block time. */
+		while( xSerialGetChar( xPort, &cRxedChar, portMAX_DELAY ) != pdPASS );
+
+		/* Ensure exclusive access to the UART Tx. */
+		if( xSemaphoreTake( xTxMutex, cmdMAX_MUTEX_WAIT ) == pdPASS )
+		{
+			/* Echo the character back. */
+			xSerialPutChar( xPort, cRxedChar, portMAX_DELAY );
+
+			/* Was it the end of the line? */
+			if( cRxedChar == '\n' || cRxedChar == '\r' )
+			{
+				/* Just to space the output from the input. */
+				vSerialPutString( xPort, ( signed char * ) pcNewLine, ( unsigned short ) strlen( pcNewLine ) );
+
+				/* See if the command is empty, indicating that the last command
+				is to be executed again. */
+				if( ucInputIndex == 0 )
+				{
+					/* Copy the last command back into the input string. */
+					strcpy( cInputString, cLastInputString );
+				}
+
+				/* Pass the received command to the command interpreter.  The
+				command interpreter is called repeatedly until it returns
+				pdFALSE	(indicating there is no more output) as it might
+				generate more than one string. */
+				do
+				{
+					/* Get the next output string from the command interpreter. */
+					xReturned = FreeRTOS_CLIProcessCommand( cInputString, pcOutputString, configCOMMAND_INT_MAX_OUTPUT_SIZE );
+
+					/* Write the generated string to the UART. */
+					vSerialPutString( xPort, ( signed char * ) pcOutputString, ( unsigned short ) strlen( pcOutputString ) );
+
+				} while( xReturned != pdFALSE );
+
+				/* All the strings generated by the input command have been
+				sent.  Clear the input string ready to receive the next command.
+				Remember the command that was just processed first in case it is
+				to be processed again. */
+				strcpy( cLastInputString, cInputString );
+				ucInputIndex = 0;
+				memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );
+
+				vSerialPutString( xPort, ( signed char * ) pcEndOfOutputMessage, ( unsigned short ) strlen( pcEndOfOutputMessage ) );
+			}
+			else
+			{
+				if( cRxedChar == '\r' )
+				{
+					/* Ignore the character. */
+				}
+				else if( ( cRxedChar == '\b' ) || ( cRxedChar == cmdASCII_DEL ) )
+				{
+					/* Backspace was pressed.  Erase the last character in the
+					string - if any. */
+					if( ucInputIndex > 0 )
+					{
+						ucInputIndex--;
+						cInputString[ ucInputIndex ] = '\0';
+					}
+				}
+				else
+				{
+					/* A character was entered.  Add it to the string entered so
+					far.  When a \n is entered the complete	string will be
+					passed to the command interpreter. */
+					if( ( cRxedChar >= ' ' ) && ( cRxedChar <= '~' ) )
+					{
+						if( ucInputIndex < cmdMAX_INPUT_SIZE )
+						{
+							cInputString[ ucInputIndex ] = cRxedChar;
+							ucInputIndex++;
+						}
+					}
+				}
+			}
+
+			/* Must ensure to give the mutex back. */
+			xSemaphoreGive( xTxMutex );
+		}
+	}
+}
+/*-----------------------------------------------------------*/
+
+void vOutputString( const char * const pcMessage )
+{
+	if( xSemaphoreTake( xTxMutex, cmdMAX_MUTEX_WAIT ) == pdPASS )
+	{
+		vSerialPutString( xPort, ( signed char * ) pcMessage, ( unsigned short ) strlen( pcMessage ) );
+		xSemaphoreGive( xTxMutex );
+	}
+}
+/*-----------------------------------------------------------*/
+

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/UDP-Related-CLI-commands.c

@@ -0,0 +1,355 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+ /******************************************************************************
+ *
+ * See the following URL for information on the commands defined in this file:
+ * http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/Ethernet_Related_CLI_Commands.shtml
+ *
+ ******************************************************************************/
+
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+/* FreeRTOS+CLI includes. */
+#include "FreeRTOS_CLI.h"
+
+/* FreeRTOS+UDP includes, just to make the stats available to the CLI
+commands. */
+#include "FreeRTOS_UDP_IP.h"
+#include "FreeRTOS_Sockets.h"
+
+/*
+ * Defines a command that prints out IP address information.
+ */
+static BaseType_t prvDisplayIPConfig( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Defines a command that prints out the gathered demo debug stats.
+ */
+static BaseType_t prvDisplayIPDebugStats( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Defines a command that sends an ICMP ping request to an IP address.
+ */
+static BaseType_t prvPingCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/* Structure that defines the "ip-config" command line command. */
+static const CLI_Command_Definition_t xIPConfig =
+{
+	"ip-config",
+	"ip-config:\r\n Displays IP address configuration\r\n\r\n",
+	prvDisplayIPConfig,
+	0
+};
+
+#if configINCLUDE_DEMO_DEBUG_STATS != 0
+	/* Structure that defines the "ip-debug-stats" command line command. */
+	static const CLI_Command_Definition_t xIPDebugStats =
+	{
+		"ip-debug-stats", /* The command string to type. */
+		"ip-debug-stats:\r\n Shows some IP stack stats useful for debug - an example only.\r\n\r\n",
+		prvDisplayIPDebugStats, /* The function to run. */
+		0 /* No parameters are expected. */
+	};
+#endif /* configINCLUDE_DEMO_DEBUG_STATS */
+
+#if ipconfigSUPPORT_OUTGOING_PINGS == 1
+
+	/* Structure that defines the "ping" command line command.  This takes an IP
+	address or host name and (optionally) the number of bytes to ping as
+	parameters. */
+	static const CLI_Command_Definition_t xPing =
+	{
+		"ping",
+		"ping <ipaddress> <optional:bytes to send>:\r\n for example, ping 192.168.0.3 8, or ping www.example.com\r\n\r\n",
+		prvPingCommand, /* The function to run. */
+		-1 /* Ping can take either one or two parameter, so the number of parameters has to be determined by the ping command implementation. */
+	};
+
+#endif /* ipconfigSUPPORT_OUTGOING_PINGS */
+
+
+/*-----------------------------------------------------------*/
+
+void vRegisterUDPCLICommands( void )
+{
+	/* Register all the command line commands defined immediately above. */
+	FreeRTOS_CLIRegisterCommand( &xIPConfig );
+
+	#if configINCLUDE_DEMO_DEBUG_STATS == 1
+	{
+		FreeRTOS_CLIRegisterCommand( &xIPDebugStats );
+	}
+	#endif /* configINCLUDE_DEMO_DEBUG_STATS */
+
+	#if ipconfigSUPPORT_OUTGOING_PINGS == 1
+	{
+		FreeRTOS_CLIRegisterCommand( &xPing );
+	}
+	#endif /* ipconfigSUPPORT_OUTGOING_PINGS */
+}
+/*-----------------------------------------------------------*/
+
+#if ipconfigSUPPORT_OUTGOING_PINGS == 1
+
+	static BaseType_t prvPingCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+	{
+	char * pcParameter;
+	BaseType_t lParameterStringLength, xReturn;
+	uint32_t ulIPAddress, ulBytesToPing;
+	const uint32_t ulDefaultBytesToPing = 8UL;
+	char cBuffer[ 16 ];
+
+		/* Remove compile time warnings about unused parameters, and check the
+		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+		write buffer length is adequate, so does not check for buffer overflows. */
+		( void ) pcCommandString;
+		( void ) xWriteBufferLen;
+		configASSERT( pcWriteBuffer );
+
+		/* Start with an empty string. */
+		pcWriteBuffer[ 0 ] = 0x00;
+
+		/* Obtain the number of bytes to ping. */
+		pcParameter = ( char * ) FreeRTOS_CLIGetParameter
+								(
+									pcCommandString,		/* The command string itself. */
+									2,						/* Return the second parameter. */
+									&lParameterStringLength	/* Store the parameter string length. */
+								);
+
+		if( pcParameter == NULL )
+		{
+			/* The number of bytes was not specified, so default it. */
+			ulBytesToPing = ulDefaultBytesToPing;
+		}
+		else
+		{
+			ulBytesToPing = atol( pcParameter );
+		}
+
+		/* Obtain the IP address string. */
+		pcParameter = ( char * ) FreeRTOS_CLIGetParameter
+								(
+									pcCommandString,		/* The command string itself. */
+									1,						/* Return the first parameter. */
+									&lParameterStringLength	/* Store the parameter string length. */
+								);
+
+		/* Sanity check something was returned. */
+		configASSERT( pcParameter );
+
+		/* Attempt to obtain the IP address.   If the first character is not a
+		digit, assume the host name has been passed in. */
+		if( ( *pcParameter >= '0' ) && ( *pcParameter <= '9' ) )
+		{
+			ulIPAddress = FreeRTOS_inet_addr( pcParameter );
+		}
+		else
+		{
+			/* Terminate the host name. */
+			pcParameter[ lParameterStringLength ] = 0x00;
+
+			/* Attempt to resolve host. */
+			ulIPAddress = FreeRTOS_gethostbyname( pcParameter );
+		}
+
+		/* Convert IP address, which may have come from a DNS lookup, to string. */
+		FreeRTOS_inet_ntoa( ulIPAddress, cBuffer );
+
+		if( ulIPAddress != 0 )
+		{
+			xReturn = FreeRTOS_SendPingRequest( ulIPAddress, ( uint16_t ) ulBytesToPing, portMAX_DELAY );
+		}
+		else
+		{
+			xReturn = pdFALSE;
+		}
+
+		if( xReturn == pdFALSE )
+		{
+			sprintf( pcWriteBuffer, "%s", "Could not send ping request\r\n" );
+		}
+		else
+		{
+			sprintf( pcWriteBuffer, "Ping sent to %s with identifier %d\r\n", cBuffer, ( int ) xReturn );
+		}
+
+		return pdFALSE;
+	}
+	/*-----------------------------------------------------------*/
+
+#endif /* ipconfigSUPPORT_OUTGOING_PINGS */
+
+#if configINCLUDE_DEMO_DEBUG_STATS != 0
+
+	static BaseType_t prvDisplayIPDebugStats( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+	{
+	static BaseType_t xIndex = -1;
+	extern xExampleDebugStatEntry_t xIPTraceValues[];
+	BaseType_t xReturn;
+
+		/* Remove compile time warnings about unused parameters, and check the
+		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+		write buffer length is adequate, so does not check for buffer overflows. */
+		( void ) pcCommandString;
+		( void ) xWriteBufferLen;
+		configASSERT( pcWriteBuffer );
+
+		xIndex++;
+
+		if( xIndex < xExampleDebugStatEntries() )
+		{
+			sprintf( pcWriteBuffer, "%s %d\r\n", ( char * ) xIPTraceValues[ xIndex ].pucDescription, ( int ) xIPTraceValues[ xIndex ].ulData );
+			xReturn = pdPASS;
+		}
+		else
+		{
+			/* Reset the index for the next time it is called. */
+			xIndex = -1;
+
+			/* Ensure nothing remains in the write buffer. */
+			pcWriteBuffer[ 0 ] = 0x00;
+			xReturn = pdFALSE;
+		}
+
+		return xReturn;
+	}
+	/*-----------------------------------------------------------*/
+
+#endif /* configINCLUDE_DEMO_DEBUG_STATS */
+
+static BaseType_t prvDisplayIPConfig( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+static BaseType_t xIndex = 0;
+BaseType_t xReturn;
+uint32_t ulAddress;
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	switch( xIndex )
+	{
+		case 0 :
+			FreeRTOS_GetAddressConfiguration( &ulAddress, NULL, NULL, NULL );
+			sprintf( pcWriteBuffer, "\r\nIP address " );
+			xReturn = pdTRUE;
+			xIndex++;
+			break;
+
+		case 1 :
+			FreeRTOS_GetAddressConfiguration( NULL, &ulAddress, NULL, NULL );
+			sprintf( pcWriteBuffer, "\r\nNet mask " );
+			xReturn = pdTRUE;
+			xIndex++;
+			break;
+
+		case 2 :
+			FreeRTOS_GetAddressConfiguration( NULL, NULL, &ulAddress, NULL );
+			sprintf( pcWriteBuffer, "\r\nGateway address " );
+			xReturn = pdTRUE;
+			xIndex++;
+			break;
+
+		case 3 :
+			FreeRTOS_GetAddressConfiguration( NULL, NULL, NULL, &ulAddress );
+			sprintf( pcWriteBuffer, "\r\nDNS server address " );
+			xReturn = pdTRUE;
+			xIndex++;
+			break;
+
+		default :
+			ulAddress = 0;
+			sprintf( pcWriteBuffer, "\r\n\r\n" );
+			xReturn = pdFALSE;
+			xIndex = 0;
+			break;
+	}
+
+	if( ulAddress != 0 )
+	{
+		FreeRTOS_inet_ntoa( ulAddress, ( &( pcWriteBuffer[ strlen( pcWriteBuffer ) ] ) ) );
+	}
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_FAT_SL_Demos/CreateExampleFiles/File-system-demo.c

@@ -0,0 +1,363 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/*******************************************************************************
+ * See the URL in the comments within main.c for the location of the online
+ * documentation.
+ ******************************************************************************/
+
+/* Standard includes. */
+#include <stdio.h>
+#include <string.h>
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+
+/* File system includes. */
+#include "fat_sl.h"
+#include "api_mdriver_ram.h"
+
+/* 8.3 format, plus null terminator. */
+#define fsMAX_FILE_NAME_LEN				13
+
+/* The number of bytes read/written to the example files at a time. */
+#define fsRAM_BUFFER_SIZE 				200
+
+/* The number of bytes written to the file that uses f_putc() and f_getc(). */
+#define fsPUTC_FILE_SIZE				100
+
+/*-----------------------------------------------------------*/
+
+/*
+ * Creates and verifies different files on the volume, demonstrating the use of
+ * various different API functions.
+ */
+void vCreateAndVerifySampleFiles( void );
+
+/*
+ * Create a set of example files in the root directory of the volume using
+ * f_write().
+ */
+static void prvCreateDemoFilesUsing_f_write( void );
+
+/*
+ * Use f_read() to read back and verify the files that were created by
+ * prvCreateDemoFilesUsing_f_write().
+ */
+static void prvVerifyDemoFileUsing_f_read( void );
+
+/*
+ * Create an example file in a sub-directory using f_putc().
+ */
+static void prvCreateDemoFileUsing_f_putc( void );
+
+/*
+ * Use f_getc() to read back and verify the file that was created by
+ * prvCreateDemoFileUsing_f_putc().
+ */
+static void prvVerifyDemoFileUsing_f_getc( void );
+
+/*-----------------------------------------------------------*/
+
+/* A buffer used to both create content to write to disk, and read content back
+from a disk.  Note there is no mutual exclusion on this buffer. */
+static char cRAMBuffer[ fsRAM_BUFFER_SIZE ];
+
+/* Names of directories that are created. */
+static const char *pcRoot = "/", *pcDirectory1 = "SUB1", *pcDirectory2 = "SUB2", *pcFullPath = "/SUB1/SUB2";
+
+/*-----------------------------------------------------------*/
+
+void vCreateAndVerifySampleFiles( void )
+{
+unsigned char ucStatus;
+
+	/* First create the volume. */
+	ucStatus = f_initvolume( ram_initfunc );
+
+	/* It is expected that the volume is not formatted. */
+	if( ucStatus == F_ERR_NOTFORMATTED )
+	{
+		/* Format the created volume. */
+		ucStatus = f_format( F_FAT12_MEDIA );
+	}
+
+	if( ucStatus == F_NO_ERROR )
+	{
+		/* Create a set of files using f_write(). */
+		prvCreateDemoFilesUsing_f_write();
+
+		/* Read back and verify the files that were created using f_write(). */
+		prvVerifyDemoFileUsing_f_read();
+
+		/* Create sub directories two deep then create a file using putc. */
+		prvCreateDemoFileUsing_f_putc();
+
+		/* Read back and verify the file created by
+		prvCreateDemoFileUsing_f_putc(). */
+		prvVerifyDemoFileUsing_f_getc();
+	}
+}
+/*-----------------------------------------------------------*/
+
+static void prvCreateDemoFilesUsing_f_write( void )
+{
+BaseType_t xFileNumber, xWriteNumber;
+char cFileName[ fsMAX_FILE_NAME_LEN ];
+const BaseType_t xMaxFiles = 5;
+long lItemsWritten;
+F_FILE *pxFile;
+
+	/* Create xMaxFiles files.  Each created file will be
+	( xFileNumber * fsRAM_BUFFER_SIZE ) bytes in length, and filled
+	with a different repeating character. */
+	for( xFileNumber = 1; xFileNumber <= xMaxFiles; xFileNumber++ )
+	{
+		/* Generate a file name. */
+		sprintf( cFileName, "root%03d.txt", ( int ) xFileNumber );
+
+		/* Obtain the current working directory and print out the file name and
+		the	directory into which the file is being written. */
+		f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+
+		/* Open the file, creating the file if it does not already exist. */
+		pxFile = f_open( cFileName, "w" );
+		configASSERT( pxFile );
+
+		/* Fill the RAM buffer with data that will be written to the file.  This
+		is just a repeating ascii character that indicates the file number. */
+		memset( cRAMBuffer, ( int ) ( '0' + xFileNumber ), fsRAM_BUFFER_SIZE );
+
+		/* Write the RAM buffer to the opened file a number of times.  The
+		number of times the RAM buffer is written to the file depends on the
+		file number, so the length of each created file will be different. */
+		for( xWriteNumber = 0; xWriteNumber < xFileNumber; xWriteNumber++ )
+		{
+			lItemsWritten = f_write( cRAMBuffer, fsRAM_BUFFER_SIZE, 1, pxFile );
+			configASSERT( lItemsWritten == 1 );
+		}
+
+		/* Close the file so another file can be created. */
+		f_close( pxFile );
+	}
+}
+/*-----------------------------------------------------------*/
+
+static void prvVerifyDemoFileUsing_f_read( void )
+{
+BaseType_t xFileNumber, xReadNumber;
+char cFileName[ fsMAX_FILE_NAME_LEN ];
+const BaseType_t xMaxFiles = 5;
+long lItemsRead, lChar;
+F_FILE *pxFile;
+
+	/* Read back the files that were created by
+	prvCreateDemoFilesUsing_f_write(). */
+	for( xFileNumber = 1; xFileNumber <= xMaxFiles; xFileNumber++ )
+	{
+		/* Generate the file name. */
+		sprintf( cFileName, "root%03d.txt", ( int ) xFileNumber );
+
+		/* Obtain the current working directory and print out the file name and
+		the	directory from which the file is being read. */
+		f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+
+		/* Open the file for reading. */
+		pxFile = f_open( cFileName, "r" );
+		configASSERT( pxFile );
+
+		/* Read the file into the RAM buffer, checking the file contents are as
+		expected.  The size of the file depends on the file number. */
+		for( xReadNumber = 0; xReadNumber < xFileNumber; xReadNumber++ )
+		{
+			/* Start with the RAM buffer clear. */
+			memset( cRAMBuffer, 0x00, fsRAM_BUFFER_SIZE );
+
+			lItemsRead = f_read( cRAMBuffer, fsRAM_BUFFER_SIZE, 1, pxFile );
+			configASSERT( lItemsRead == 1 );
+
+			/* Check the RAM buffer is filled with the expected data.  Each
+			file contains a different repeating ascii character that indicates
+			the number of the file. */
+			for( lChar = 0; lChar < fsRAM_BUFFER_SIZE; lChar++ )
+			{
+				configASSERT( cRAMBuffer[ lChar ] == ( '0' + ( char ) xFileNumber ) );
+			}
+		}
+
+		/* Close the file. */
+		f_close( pxFile );
+	}
+}
+/*-----------------------------------------------------------*/
+
+static void prvCreateDemoFileUsing_f_putc( void )
+{
+unsigned char ucReturn;
+int iByte, iReturned;
+F_FILE *pxFile;
+char cFileName[ fsMAX_FILE_NAME_LEN ];
+
+	/* Obtain and print out the working directory. */
+	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+
+	/* Create a sub directory. */
+	ucReturn = f_mkdir( pcDirectory1 );
+	configASSERT( ucReturn == F_NO_ERROR );
+
+	/* Move into the created sub-directory. */
+	ucReturn = f_chdir( pcDirectory1 );
+	configASSERT( ucReturn == F_NO_ERROR );
+
+	/* Obtain and print out the working directory. */
+	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+
+	/* Create a subdirectory in the new directory. */
+	ucReturn = f_mkdir( pcDirectory2 );
+	configASSERT( ucReturn == F_NO_ERROR );
+
+	/* Move into the directory just created - now two directories down from
+	the root. */
+	ucReturn = f_chdir( pcDirectory2 );
+	configASSERT( ucReturn == F_NO_ERROR );
+
+	/* Obtain and print out the working directory. */
+	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+	configASSERT( strcmp( cRAMBuffer, pcFullPath ) == 0 );
+
+	/* Generate the file name. */
+	sprintf( cFileName, "%s.txt", pcDirectory2 );
+
+	/* Print out the file name and the directory into which the file is being
+	written. */
+	pxFile = f_open( cFileName, "w" );
+
+	/* Create a file 1 byte at a time.  The file is filled with incrementing
+	ascii characters starting from '0'. */
+	for( iByte = 0; iByte < fsPUTC_FILE_SIZE; iByte++ )
+	{
+		iReturned = f_putc( ( ( int ) '0' + iByte ), pxFile );
+		configASSERT( iReturned ==  ( ( int ) '0' + iByte ) );
+	}
+
+	/* Finished so close the file. */
+	f_close( pxFile );
+
+	/* Move back to the root directory. */
+	ucReturn = f_chdir( "../.." );
+	configASSERT( ucReturn == F_NO_ERROR );
+
+	/* Obtain and print out the working directory. */
+	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+	configASSERT( strcmp( cRAMBuffer, pcRoot ) == 0 );
+}
+/*-----------------------------------------------------------*/
+
+static void prvVerifyDemoFileUsing_f_getc( void )
+{
+unsigned char ucReturn;
+int iByte, iReturned;
+F_FILE *pxFile;
+char cFileName[ fsMAX_FILE_NAME_LEN ];
+
+	/* Move into the directory in which the file was created. */
+	ucReturn = f_chdir( pcFullPath );
+	configASSERT( ucReturn == F_NO_ERROR );
+
+	/* Obtain and print out the working directory. */
+	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+	configASSERT( strcmp( cRAMBuffer, pcFullPath ) == 0 );
+
+	/* Generate the file name. */
+	sprintf( cFileName, "%s.txt", pcDirectory2 );
+
+	/* This time the file is opened for reading. */
+	pxFile = f_open( cFileName, "r" );
+
+	/* Read the file 1 byte at a time. */
+	for( iByte = 0; iByte < fsPUTC_FILE_SIZE; iByte++ )
+	{
+		iReturned = f_getc( pxFile );
+		configASSERT( iReturned ==  ( ( int ) '0' + iByte ) );
+	}
+
+	/* Finished so close the file. */
+	f_close( pxFile );
+
+	/* Move back to the root directory. */
+	ucReturn = f_chdir( "../.." );
+	configASSERT( ucReturn == F_NO_ERROR );
+
+	/* Obtain and print out the working directory. */
+	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
+}
+
+
+
+

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/CLI-commands.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -95,50 +100,50 @@ commands. */
 /*
  * Implements the run-time-stats command.
  */
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the task-stats command.
  */
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the echo-three-parameters command.
  */
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the echo-parameters command.
  */
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that prints out IP address information.
  */
-static portBASE_TYPE prvDisplayIPConfig( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvDisplayIPConfig( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that prints out the gathered demo debug stats.
  */
-static portBASE_TYPE prvDisplayIPDebugStats( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvDisplayIPDebugStats( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that sends an ICMP ping request to an IP address.
  */
-static portBASE_TYPE prvPingCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvPingCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the "trace start" and "trace stop" commands;
  */
 #if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
-	static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 #endif
 
 /* Structure that defines the "ip-config" command line command. */
 static const CLI_Command_Definition_t xIPConfig =
 {
-	( const int8_t * const ) "ip-config",
-	( const int8_t * const ) "ip-config:\r\n Displays IP address configuration\r\n\r\n",
+	"ip-config",
+	"ip-config:\r\n Displays IP address configuration\r\n\r\n",
 	prvDisplayIPConfig,
 	0
 };
@@ -147,8 +152,8 @@ static const CLI_Command_Definition_t xIPConfig =
 	/* Structure that defines the "ip-debug-stats" command line command. */
 	static const CLI_Command_Definition_t xIPDebugStats =
 	{
-		( const int8_t * const ) "ip-debug-stats", /* The command string to type. */
-		( const int8_t * const ) "ip-debug-stats:\r\n Shows some IP stack stats useful for debug - an example only.\r\n\r\n",
+		"ip-debug-stats", /* The command string to type. */
+		"ip-debug-stats:\r\n Shows some IP stack stats useful for debug - an example only.\r\n\r\n",
 		prvDisplayIPDebugStats, /* The function to run. */
 		0 /* No parameters are expected. */
 	};
@@ -158,8 +163,8 @@ static const CLI_Command_Definition_t xIPConfig =
 generates a table that shows how much run time each task has */
 static const CLI_Command_Definition_t xRunTimeStats =
 {
-	( const int8_t * const ) "run-time-stats", /* The command string to type. */
-	( const int8_t * const ) "run-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n\r\n",
+	"run-time-stats", /* The command string to type. */
+	"run-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n\r\n",
 	prvRunTimeStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -168,8 +173,8 @@ static const CLI_Command_Definition_t xRunTimeStats =
 a table that gives information on each task in the system. */
 static const CLI_Command_Definition_t xTaskStats =
 {
-	( const int8_t * const ) "task-stats", /* The command string to type. */
-	( const int8_t * const ) "task-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n\r\n",
+	"task-stats", /* The command string to type. */
+	"task-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n\r\n",
 	prvTaskStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -179,8 +184,8 @@ takes exactly three parameters that the command simply echos back one at a
 time. */
 static const CLI_Command_Definition_t xThreeParameterEcho =
 {
-	( const int8_t * const ) "echo-3-parameters",
-	( const int8_t * const ) "echo-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n\r\n",
+	"echo-3-parameters",
+	"echo-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n\r\n",
 	prvThreeParameterEchoCommand, /* The function to run. */
 	3 /* Three parameters are expected, which can take any value. */
 };
@@ -190,8 +195,8 @@ takes a variable number of parameters that the command simply echos back one at
 a time. */
 static const CLI_Command_Definition_t xParameterEcho =
 {
-	( const int8_t * const ) "echo-parameters",
-	( const int8_t * const ) "echo-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n\r\n",
+	"echo-parameters",
+	"echo-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n\r\n",
 	prvParameterEchoCommand, /* The function to run. */
 	-1 /* The user can enter any number of commands. */
 };
@@ -203,8 +208,8 @@ static const CLI_Command_Definition_t xParameterEcho =
 	parameters. */
 	static const CLI_Command_Definition_t xPing =
 	{
-		( const int8_t * const ) "ping",
-		( const int8_t * const ) "ping <ipaddress> <optional:bytes to send>:\r\n for example, ping 192.168.0.3 8, or ping www.example.com\r\n\r\n",
+		"ping",
+		"ping <ipaddress> <optional:bytes to send>:\r\n for example, ping 192.168.0.3 8, or ping www.example.com\r\n\r\n",
 		prvPingCommand, /* The function to run. */
 		-1 /* Ping can take either one or two parameter, so the number of parameters has to be determined by the ping command implementation. */
 	};
@@ -216,8 +221,8 @@ static const CLI_Command_Definition_t xParameterEcho =
 	parameter, which can be either "start" or "stop". */
 	static const CLI_Command_Definition_t xStartStopTrace =
 	{
-		( const int8_t * const ) "trace",
-		( const int8_t * const ) "trace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n\r\n",
+		"trace",
+		"trace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n\r\n",
 		prvStartStopTraceCommand, /* The function to run. */
 		1 /* One parameter is expected.  Valid values are "start" and "stop". */
 	};
@@ -247,9 +252,10 @@ void vRegisterCLICommands( void )
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stack	#\r\n************************************************\r\n";
+const char *const pcHeader = "  State\tPriority\tStack\t#\r\n************************************************\r\n";
+BaseType_t xSpacePadding;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -259,8 +265,24 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, "Task" );
+	pcWriteBuffer += strlen( pcWriteBuffer );
+
+	/* Pad the string "task" with however many bytes necessary to make it the
+	length of a task name.  Minus three for the null terminator and half the 
+	number of characters in	"Task" so the column lines up with the centre of 
+	the heading. */
+	for( xSpacePadding = strlen( "Task" ); xSpacePadding < ( configMAX_TASK_NAME_LEN - 3 ); xSpacePadding++ )
+	{
+		/* Add a space to align columns after the task's name. */
+		*pcWriteBuffer = ' ';
+		pcWriteBuffer++;
+
+		/* Ensure always terminated. */
+		*pcWriteBuffer = 0x00;
+	}
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskList( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -268,9 +290,10 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Time\r\n****************************************\r\n";
+const char * const pcHeader = "  Abs Time      % Time\r\n****************************************\r\n";
+BaseType_t xSpacePadding;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -280,8 +303,25 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, "Task" );
+	pcWriteBuffer += strlen( pcWriteBuffer );
+
+	/* Pad the string "task" with however many bytes necessary to make it the
+	length of a task name.  Minus three for the null terminator and half the 
+	number of characters in	"Task" so the column lines up with the centre of 
+	the heading. */
+	for( xSpacePadding = strlen( "Task" ); xSpacePadding < ( configMAX_TASK_NAME_LEN - 3 ); xSpacePadding++ )
+	{
+		/* Add a space to align columns after the task's name. */
+		*pcWriteBuffer = ' ';
+		pcWriteBuffer++;
+
+		/* Ensure always terminated. */
+		*pcWriteBuffer = 0x00;
+	}
+
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskGetRunTimeStats( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -289,11 +329,11 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -306,7 +346,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The three parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The three parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -319,21 +359,21 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&xParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* Return the parameter string. */
 		memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-		sprintf( ( char * ) pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
-		strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, xParameterStringLength );
-		strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+		sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+		strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+		strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 		/* If this is the last of the three parameters then there are no more
 		strings to return after this one. */
@@ -356,11 +396,11 @@ static portBASE_TYPE lParameterNumber = 0;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -373,7 +413,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -386,20 +426,20 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&xParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 		if( pcParameter != NULL )
 		{
 			/* Return the parameter string. */
 			memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-			sprintf( ( char * ) pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
-			strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, xParameterStringLength );
-			strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+			sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+			strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+			strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 			/* There might be more parameters to return after this one. */
 			xReturn = pdTRUE;
@@ -425,13 +465,13 @@ static portBASE_TYPE lParameterNumber = 0;
 
 #if ipconfigSUPPORT_OUTGOING_PINGS == 1
 
-	static portBASE_TYPE prvPingCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+	static BaseType_t prvPingCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 	{
-	int8_t * pcParameter;
-	portBASE_TYPE lParameterStringLength, xReturn;
+	char * pcParameter;
+	BaseType_t lParameterStringLength, xReturn;
 	uint32_t ulIPAddress, ulBytesToPing;
 	const uint32_t ulDefaultBytesToPing = 8UL;
-	int8_t cBuffer[ 16 ];
+	char cBuffer[ 16 ];
 
 		/* Remove compile time warnings about unused parameters, and check the
 		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -444,12 +484,12 @@ static portBASE_TYPE lParameterNumber = 0;
 		pcWriteBuffer[ 0 ] = 0x00;
 
 		/* Obtain the number of bytes to ping. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										2,						/* Return the second parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = ( char * ) FreeRTOS_CLIGetParameter
+								(
+									pcCommandString,		/* The command string itself. */
+									2,						/* Return the second parameter. */
+									&lParameterStringLength	/* Store the parameter string length. */
+								);
 
 		if( pcParameter == NULL )
 		{
@@ -458,16 +498,16 @@ static portBASE_TYPE lParameterNumber = 0;
 		}
 		else
 		{
-			ulBytesToPing = atol( ( const char * ) pcParameter );
+			ulBytesToPing = atol( pcParameter );
 		}
 
 		/* Obtain the IP address string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										1,						/* Return the first parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = ( char * ) FreeRTOS_CLIGetParameter
+								(
+									pcCommandString,		/* The command string itself. */
+									1,						/* Return the first parameter. */
+									&lParameterStringLength	/* Store the parameter string length. */
+								);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
@@ -476,7 +516,7 @@ static portBASE_TYPE lParameterNumber = 0;
 		digit, assume the host name has been passed in. */
 		if( ( *pcParameter >= '0' ) && ( *pcParameter <= '9' ) )
 		{
-			ulIPAddress = FreeRTOS_inet_addr( ( const uint8_t * ) pcParameter );
+			ulIPAddress = FreeRTOS_inet_addr( pcParameter );
 		}
 		else
 		{
@@ -484,11 +524,11 @@ static portBASE_TYPE lParameterNumber = 0;
 			pcParameter[ lParameterStringLength ] = 0x00;
 
 			/* Attempt to resolve host. */
-			ulIPAddress = FreeRTOS_gethostbyname( ( uint8_t * ) pcParameter );
+			ulIPAddress = FreeRTOS_gethostbyname( pcParameter );
 		}
 
 		/* Convert IP address, which may have come from a DNS lookup, to string. */
-		FreeRTOS_inet_ntoa( ulIPAddress, ( char * ) cBuffer );
+		FreeRTOS_inet_ntoa( ulIPAddress, cBuffer );
 
 		if( ulIPAddress != 0 )
 		{
@@ -501,11 +541,11 @@ static portBASE_TYPE lParameterNumber = 0;
 
 		if( xReturn == pdFALSE )
 		{
-			sprintf( ( char * ) pcWriteBuffer, "%s", "Could not send ping request\r\n" );
+			sprintf( pcWriteBuffer, "%s", "Could not send ping request\r\n" );
 		}
 		else
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Ping sent to %s with identifier %d\r\n", cBuffer, xReturn );
+			sprintf( pcWriteBuffer, "Ping sent to %s with identifier %d\r\n", cBuffer, xReturn );
 		}
 
 		return pdFALSE;
@@ -516,11 +556,11 @@ static portBASE_TYPE lParameterNumber = 0;
 
 #if configINCLUDE_DEMO_DEBUG_STATS != 0
 
-	static portBASE_TYPE prvDisplayIPDebugStats( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+	static BaseType_t prvDisplayIPDebugStats( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 	{
-	static portBASE_TYPE xIndex = -1;
+	static BaseType_t xIndex = -1;
 	extern xExampleDebugStatEntry_t xIPTraceValues[];
-	portBASE_TYPE xReturn;
+	BaseType_t xReturn;
 
 		/* Remove compile time warnings about unused parameters, and check the
 		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -533,7 +573,7 @@ static portBASE_TYPE lParameterNumber = 0;
 
 		if( xIndex < xExampleDebugStatEntries() )
 		{
-			sprintf( ( char * ) pcWriteBuffer, "%s %d\r\n", ( char * ) xIPTraceValues[ xIndex ].pucDescription, ( int ) xIPTraceValues[ xIndex ].ulData );
+			sprintf( pcWriteBuffer, "%s %d\r\n", xIPTraceValues[ xIndex ].pucDescription, ( int ) xIPTraceValues[ xIndex ].ulData );
 			xReturn = pdPASS;
 		}
 		else
@@ -552,10 +592,10 @@ static portBASE_TYPE lParameterNumber = 0;
 
 #endif /* configINCLUDE_DEMO_DEBUG_STATS */
 
-static portBASE_TYPE prvDisplayIPConfig( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvDisplayIPConfig( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-static portBASE_TYPE xIndex = 0;
-portBASE_TYPE xReturn;
+static BaseType_t xIndex = 0;
+BaseType_t xReturn;
 uint32_t ulAddress;
 
 	/* Remove compile time warnings about unused parameters, and check the
@@ -569,35 +609,35 @@ uint32_t ulAddress;
 	{
 		case 0 :
 			FreeRTOS_GetAddressConfiguration( &ulAddress, NULL, NULL, NULL );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nIP address " );
+			sprintf( pcWriteBuffer, "\r\nIP address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 1 :
 			FreeRTOS_GetAddressConfiguration( NULL, &ulAddress, NULL, NULL );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nNet mask " );
+			sprintf( pcWriteBuffer, "\r\nNet mask " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 2 :
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, &ulAddress, NULL );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nGateway address " );
+			sprintf( pcWriteBuffer, "\r\nGateway address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 3 :
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, NULL, &ulAddress );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nDNS server address " );
+			sprintf( pcWriteBuffer, "\r\nDNS server address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		default :
 			ulAddress = 0;
-			sprintf( ( char * ) pcWriteBuffer, "\r\n\r\n" );
+			sprintf( pcWriteBuffer, "\r\n\r\n" );
 			xReturn = pdFALSE;
 			xIndex = 0;
 			break;
@@ -605,7 +645,7 @@ uint32_t ulAddress;
 
 	if( ulAddress != 0 )
 	{
-		FreeRTOS_inet_ntoa( ulAddress, ( ( char * ) &( pcWriteBuffer[ strlen( ( char * ) pcWriteBuffer ) ] ) ) );
+		FreeRTOS_inet_ntoa( ulAddress,  &( pcWriteBuffer[ strlen( pcWriteBuffer ) ] ) );
 	}
 
 	return xReturn;
@@ -614,10 +654,10 @@ uint32_t ulAddress;
 
 #if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
 
-	static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 	{
-	int8_t *pcParameter;
-	portBASE_TYPE lParameterStringLength;
+	const char *pcParameter;
+	BaseType_t lParameterStringLength;
 
 		/* Remove compile time warnings about unused parameters, and check the
 		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -627,35 +667,35 @@ uint32_t ulAddress;
 		configASSERT( pcWriteBuffer );
 
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										1,						/* Return the first parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							1,						/* Return the first parameter. */
+							&lParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* There are only two valid parameter values. */
-		if( strncmp( ( const char * ) pcParameter, "start", strlen( "start" ) ) == 0 )
+		if( strncmp( pcParameter, "start", strlen( "start" ) ) == 0 )
 		{
 			/* Start or restart the trace. */
 			vTraceStop();
 			vTraceClear();
 			vTraceStart();
 
-			sprintf( ( char * ) pcWriteBuffer, "Trace recording (re)started.\r\n" );
+			sprintf( pcWriteBuffer, "Trace recording (re)started.\r\n" );
 		}
-		else if( strncmp( ( const char * ) pcParameter, "stop", strlen( "stop" ) ) == 0 )
+		else if( strncmp( pcParameter, "stop", strlen( "stop" ) ) == 0 )
 		{
 			/* End the trace, if one is running. */
 			vTraceStop();
-			sprintf( ( char * ) pcWriteBuffer, "Stopping trace recording.\r\n" );
+			sprintf( pcWriteBuffer, "Stopping trace recording.\r\n" );
 		}
 		else
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
+			sprintf( pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
 		}
 
 		/* There is no more data to return after this single string, so return

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandInterpreter.h

@@ -0,0 +1,75 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+#ifndef UDP_COMMAND_INTERPRETER_H
+#define UDP_COMMAND_INTERPRETER_H
+
+void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, UBaseType_t uxPriority );
+
+#endif /* UDP_COMMAND_INTERPRETER_H */

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c

@@ -0,0 +1,248 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* FreeRTOS+CLI includes. */
+#include "FreeRTOS_CLI.h"
+
+/* FreeRTOS+UDP includes. */
+#include "FreeRTOS_UDP_IP.h"
+#include "FreeRTOS_Sockets.h"
+
+/* Demo app includes. */
+#include "UDPCommandInterpreter.h"
+
+/* Dimensions the buffer into which input characters are placed. */
+#define cmdMAX_INPUT_SIZE	60
+
+/* Dimensions the buffer into which string outputs can be placed. */
+#define cmdMAX_OUTPUT_SIZE	1250
+
+/* Dimensions the buffer passed to the recvfrom() call. */
+#define cmdSOCKET_INPUT_BUFFER_SIZE 60
+
+/*
+ * The task that runs FreeRTOS+CLI.
+ */
+void vUDPCommandInterpreterTask( void *pvParameters );
+
+/*
+ * Open and configure the UDP socket.
+ */
+static xSocket_t prvOpenUDPServerSocket( uint16_t usPort );
+
+/*-----------------------------------------------------------*/
+
+void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, UBaseType_t uxPriority )
+{
+	xTaskCreate( vUDPCommandInterpreterTask, "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );
+}
+/*-----------------------------------------------------------*/
+
+/*
+ * Task that provides the input and output for the FreeRTOS+CLI command
+ * interpreter.  In this case a UDP port is used.  See the URL in the comments
+ * within main.c for the location of the online documentation.
+ */
+void vUDPCommandInterpreterTask( void *pvParameters )
+{
+long lBytes, lByte;
+signed char cInChar, cInputIndex = 0;
+static char cInputString[ cmdMAX_INPUT_SIZE ], cOutputString[ cmdMAX_OUTPUT_SIZE ], cLocalBuffer[ cmdSOCKET_INPUT_BUFFER_SIZE ];
+BaseType_t xMoreDataToFollow;
+struct freertos_sockaddr xClient;
+socklen_t xClientAddressLength = 0; /* This is required as a parameter to maintain the sendto() Berkeley sockets API - but it is not actually used so can take any value. */
+xSocket_t xSocket;
+
+	/* Just to prevent compiler warnings. */
+	( void ) pvParameters;
+
+	/* Attempt to open the socket.  The port number is passed in the task
+	parameter.  The strange casting is to remove compiler warnings on 32-bit
+	machines. */
+	xSocket = prvOpenUDPServerSocket( ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL );
+
+	if( xSocket != FREERTOS_INVALID_SOCKET )
+	{
+		for( ;; )
+		{
+			/* Wait for incoming data on the opened socket. */
+			lBytes = FreeRTOS_recvfrom( xSocket, ( void * ) cLocalBuffer, sizeof( cLocalBuffer ), 0, &xClient, &xClientAddressLength );
+
+			if( lBytes != FREERTOS_SOCKET_ERROR )
+			{
+				/* Process each received byte in turn. */
+				lByte = 0;
+				while( lByte < lBytes )
+				{
+					/* The next character in the input buffer. */
+					cInChar = cLocalBuffer[ lByte ];
+					lByte++;
+
+					/* Newline characters are taken as the end of the command
+					string. */
+					if( cInChar == '\n' )
+					{
+						/* Process the input string received prior to the
+						newline. */
+						do
+						{
+							/* Pass the string to FreeRTOS+CLI. */
+							xMoreDataToFollow = FreeRTOS_CLIProcessCommand( cInputString, cOutputString, cmdMAX_OUTPUT_SIZE );
+
+							/* Send the output generated by the command's
+							implementation. */
+							FreeRTOS_sendto( xSocket, cOutputString,  strlen( cOutputString ), 0, &xClient, xClientAddressLength );
+
+						} while( xMoreDataToFollow != pdFALSE ); /* Until the command does not generate any more output. */
+
+						/* All the strings generated by the command processing
+						have been sent.  Clear the input string ready to receive
+						the next command. */
+						cInputIndex = 0;
+						memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );
+
+						/* Transmit a spacer, just to make the command console
+						easier to read. */
+						FreeRTOS_sendto( xSocket, "\r\n",  strlen( "\r\n" ), 0, &xClient, xClientAddressLength );
+					}
+					else
+					{
+						if( cInChar == '\r' )
+						{
+							/* Ignore the character.  Newlines are used to
+							detect the end of the input string. */
+						}
+						else if( cInChar == '\b' )
+						{
+							/* Backspace was pressed.  Erase the last character
+							in the string - if any. */
+							if( cInputIndex > 0 )
+							{
+								cInputIndex--;
+								cInputString[ cInputIndex ] = '\0';
+							}
+						}
+						else
+						{
+							/* A character was entered.  Add it to the string
+							entered so far.  When a \n is entered the complete
+							string will be passed to the command interpreter. */
+							if( cInputIndex < cmdMAX_INPUT_SIZE )
+							{
+								cInputString[ cInputIndex ] = cInChar;
+								cInputIndex++;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		/* The socket could not be opened. */
+		vTaskDelete( NULL );
+	}
+}
+/*-----------------------------------------------------------*/
+
+static xSocket_t prvOpenUDPServerSocket( uint16_t usPort )
+{
+struct freertos_sockaddr xServer;
+xSocket_t xSocket = FREERTOS_INVALID_SOCKET;
+
+	xSocket = FreeRTOS_socket( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP );
+	if( xSocket != FREERTOS_INVALID_SOCKET)
+	{
+		/* Zero out the server structure. */
+		memset( ( void * ) &xServer, 0x00, sizeof( xServer ) );
+
+		/* Set family and port. */
+		xServer.sin_port = FreeRTOS_htons( usPort );
+
+		/* Bind the address to the socket. */
+		if( FreeRTOS_bind( xSocket, &xServer, sizeof( xServer ) ) == -1 )
+		{
+			FreeRTOS_closesocket( xSocket );
+			xSocket = FREERTOS_INVALID_SOCKET;
+		}
+	}
+
+	return xSocket;
+}
+
+

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -65,7 +70,7 @@
 
 /******************************************************************************
  *
- * See the following web page for essential TwoEchoClient.c usage and 
+ * See the following web page for essential TwoEchoClient.c usage and
  * configuration details:
  * http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/Common_Echo_Clients.shtml
  *
@@ -86,18 +91,13 @@
 #include "FreeRTOS_Sockets.h"
 
 /* Small delay used between attempts to obtain a zero copy buffer. */
-#define echoTINY_DELAY	( ( portTickType ) 2 )
+#define echoTINY_DELAY	( ( TickType_t ) 2 )
 
 /* The echo tasks create a socket, send out a number of echo requests
 (listening for each echo reply), then close the socket again before
 starting over.  This delay is used between each iteration to ensure the
-network does not get too congested.  The delay is shorter when the Windows
-simulator is used because simulated time is slower than real time. */
-#ifdef _WINDOWS_
-	#define echoLOOP_DELAY	( ( portTickType ) 10 / portTICK_RATE_MS )
-#else
-	#define echoLOOP_DELAY	( ( portTickType ) 150 / portTICK_RATE_MS )
-#endif /* _WINDOWS_ */
+network does not get too congested. */
+#define echoLOOP_DELAY	( ( TickType_t ) 250 / portTICK_RATE_MS )
 
 #if ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1
 	/* When the trace recorder code is included user events are generated to
@@ -129,30 +129,30 @@ static void prvZeroCopyEchoClientTask( void *pvParameters );
 /* The receive timeout is set shorter when the windows simulator is used
 because simulated time is slower than real time. */
 #ifdef _WINDOWS_
-	const portTickType xReceiveTimeOut = 50 / portTICK_RATE_MS;
+	const TickType_t xReceiveTimeOut = 50 / portTICK_RATE_MS;
 #else
-	const portTickType xReceiveTimeOut = 500 / portTICK_RATE_MS;
+	const TickType_t xReceiveTimeOut = 500 / portTICK_RATE_MS;
 #endif
 
 /*-----------------------------------------------------------*/
 
-void vStartEchoClientTasks( uint16_t usTaskStackSize, unsigned portBASE_TYPE uxTaskPriority )
+void vStartEchoClientTasks( uint16_t usTaskStackSize, UBaseType_t uxTaskPriority )
 {
 	/* Create the echo client task that does not use the zero copy interface. */
-	xTaskCreate( 	prvEchoClientTask,						/* The function that implements the task. */
-					( const signed char * const ) "Echo0",	/* Just a text name for the task to aid debugging. */
-					usTaskStackSize,						/* The stack size is defined in FreeRTOSIPConfig.h. */
-					NULL,									/* The task parameter, not used in this case. */
-					uxTaskPriority,							/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
-					NULL );									/* The task handle is not used. */
+	xTaskCreate( 	prvEchoClientTask,	/* The function that implements the task. */
+					"Echo0",			/* Just a text name for the task to aid debugging. */
+					usTaskStackSize,	/* The stack size is defined in FreeRTOSIPConfig.h. */
+					NULL,				/* The task parameter, not used in this case. */
+					uxTaskPriority,		/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
+					NULL );				/* The task handle is not used. */
 
 	/* Create the echo client task that does use the zero copy interface. */
-	xTaskCreate( 	prvZeroCopyEchoClientTask,				/* The function that implements the task. */
-					( const signed char * const ) "Echo1",	/* Just a text name for the task to aid debugging. */
-					usTaskStackSize,						/* The stack size is defined in FreeRTOSIPConfig.h. */
-					NULL,									/* The task parameter, not used in this case. */
-					uxTaskPriority,							/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
-					NULL );									/* The task handle is not used. */
+	xTaskCreate( 	prvZeroCopyEchoClientTask,	/* The function that implements the task. */
+					"Echo1",					/* Just a text name for the task to aid debugging. */
+					usTaskStackSize,			/* The stack size is defined in FreeRTOSIPConfig.h. */
+					NULL,						/* The task parameter, not used in this case. */
+					uxTaskPriority,				/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
+					NULL );						/* The task handle is not used. */
 }
 /*-----------------------------------------------------------*/
 
@@ -160,7 +160,7 @@ static void prvEchoClientTask( void *pvParameters )
 {
 xSocket_t xSocket;
 struct freertos_sockaddr xEchoServerAddress;
-int8_t cTxString[ 25 ], cRxString[ 25 ]; /* Make sure the stack is large enough to hold these.  Turn on stack overflow checking during debug to be sure. */
+char cTxString[ 25 ], cRxString[ 25 ]; /* Make sure the stack is large enough to hold these.  Turn on stack overflow checking during debug to be sure. */
 int32_t lLoopCount = 0UL;
 const int32_t lMaxLoopCount = 50;
 volatile uint32_t ulRxCount = 0UL, ulTxCount = 0UL;
@@ -192,7 +192,7 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
 		for( lLoopCount = 0; lLoopCount < lMaxLoopCount; lLoopCount++ )
 		{
 			/* Create the string that is sent to the echo server. */
-			sprintf( ( char * ) cTxString, "Message number %u\r\n", ulTxCount );
+			sprintf( cTxString, "Message number %u\r\n", ( unsigned int ) ulTxCount );
 
 			/* Send the string to the socket.  ulFlags is set to 0, so the zero
 			copy interface is not used.  That means the data from cTxString is
@@ -201,7 +201,7 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
 			to ensure the NULL string terminator is sent as part of the message. */
 			FreeRTOS_sendto( xSocket,				/* The socket being sent to. */
 							( void * ) cTxString,	/* The data being sent. */
-							strlen( ( const char * ) cTxString ) + 1, /* The length of the data being sent. */
+							strlen( cTxString ) + 1,/* The length of the data being sent. */
 							0,						/* ulFlags with the FREERTOS_ZERO_COPY bit clear. */
 							&xEchoServerAddress,	/* The destination address. */
 							sizeof( xEchoServerAddress ) );
@@ -227,7 +227,7 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
 								&xAddressLength );
 
 			/* Compare the transmitted string to the received string. */
-			if( strcmp( ( char * ) cRxString, ( char * ) cTxString ) == 0 )
+			if( strcmp( cRxString, cTxString ) == 0 )
 			{
 				/* The echo reply was received without error. */
 				ulRxCount++;
@@ -248,7 +248,7 @@ static void prvZeroCopyEchoClientTask( void *pvParameters )
 {
 xSocket_t xSocket;
 struct freertos_sockaddr xEchoServerAddress;
-static int8_t cTxString[ 40 ];
+static char cTxString[ 40 ];
 int32_t lLoopCount = 0UL;
 volatile uint32_t ulRxCount = 0UL, ulTxCount = 0UL;
 uint32_t xAddressLength = sizeof( xEchoServerAddress );
@@ -256,9 +256,9 @@ int32_t lReturned;
 uint8_t *pucUDPPayloadBuffer;
 
 const int32_t lMaxLoopCount = 50;
-const uint8_t * const pucStringToSend = ( const uint8_t * const ) "Zero copy message number";
+const char * const pcStringToSend = "Zero copy message number";
 /* The buffer is large enough to hold the string, a number, and the string terminator. */
-const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
+const size_t xBufferLength = strlen( pcStringToSend ) + 15;
 
 	#if ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1
 	{
@@ -313,11 +313,11 @@ const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
 				/* A buffer was successfully obtained.  Create the string that is
 				sent to the echo server.  Note the string is written directly
 				into the buffer obtained from the IP stack. */
-				sprintf( ( char * ) pucUDPPayloadBuffer, "%s %u\r\n", ( const char * ) "Zero copy message number", ulTxCount );
+				sprintf( ( char * ) pucUDPPayloadBuffer, "%s %u\r\n", "Zero copy message number", ( unsigned int ) ulTxCount );
 
 				/* Also copy the string into a local buffer so it can be compared
 				with the string that is later received back from the echo server. */
-				strcpy( ( char * ) cTxString, ( char * ) pucUDPPayloadBuffer );
+				strcpy( cTxString, ( char * ) pucUDPPayloadBuffer );
 
 				/* Pass the buffer into the send function.  ulFlags has the
 				FREERTOS_ZERO_COPY bit set so the IP stack will take control of
@@ -325,7 +325,7 @@ const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
 				echoMARK_SEND_IN_TRACE_BUFFER( xZeroCopySendEvent );
 				lReturned = FreeRTOS_sendto( 	xSocket,					/* The socket being sent to. */
 												( void * ) pucUDPPayloadBuffer,	/* The buffer being passed into the IP stack. */
-												strlen( ( const char * ) cTxString ) + 1, /* The length of the data being sent.  Plus 1 to ensure the null terminator is part of the data. */
+												strlen( cTxString ) + 1, 	/* The length of the data being sent.  Plus 1 to ensure the null terminator is part of the data. */
 												FREERTOS_ZERO_COPY,			/* ulFlags with the zero copy bit is set. */
 												&xEchoServerAddress,		/* Where the data is being sent. */
 												sizeof( xEchoServerAddress ) );
@@ -376,7 +376,7 @@ const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
 				{
 					/* Compare the string sent to the echo server with the string
 					received back from the echo server. */
-					if( strcmp( ( char * ) pucUDPPayloadBuffer, ( char * ) cTxString ) == 0 )
+					if( strcmp( ( char * ) pucUDPPayloadBuffer, cTxString ) == 0 )
 					{
 						/* The strings matched. */
 						ulRxCount++;

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -70,6 +75,6 @@
  * to send to and receive from an echo server.  The other task uses the zero
  * copy interface to send to and receive from an echo server.
  */
-void vStartEchoClientTasks( uint16_t usTaskStackSize, unsigned portBASE_TYPE uxTaskPriority );
+void vStartEchoClientTasks( uint16_t usTaskStackSize, UBaseType_t uxTaskPriority );
 
 #endif /* TWO_ECHO_CLIENTS_H */

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/TraceMacros/Example1/DemoIPTrace.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -105,17 +110,18 @@ xExampleDebugStatEntry_t xIPTraceValues[] =
 {
 	/* Comment out array entries to remove individual trace items. */
 
+	{ iptraceID_NETWORK_INTERFACE_RECEIVE,			( const uint8_t * const ) "Packets received by the network interface",			prvIncrementEventCount, 0 },
+	{ iptraceID_NETWORK_INTERFACE_TRANSMIT,			( const uint8_t * const ) "Count of transmitted packets",						prvIncrementEventCount, 0 },
+	{ iptraceID_PACKET_DROPPED_TO_GENERATE_ARP,		( const uint8_t * const ) "Count of packets dropped to generate ARP",			prvIncrementEventCount, 0 },
 	{ iptraceID_NETWORK_BUFFER_OBTAINED,			( const uint8_t * const ) "Lowest ever available network buffers",				prvStoreLowest, 0xffffUL },
 	{ iptraceID_NETWORK_EVENT_RECEIVED,				( const uint8_t * const ) "Lowest ever free space in network event queue",		prvStoreLowest, 0xffffUL },
 	{ iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER,	( const uint8_t * const ) "Count of failed attempts to obtain a network buffer",prvIncrementEventCount, 0 },
 	{ iptraceID_ARP_TABLE_ENTRY_EXPIRED,			( const uint8_t * const ) "Count of expired ARP entries",						prvIncrementEventCount, 0 },
-	{ iptraceID_PACKET_DROPPED_TO_GENERATE_ARP,		( const uint8_t * const ) "Count of packets dropped to generate ARP",			prvIncrementEventCount, 0 },
 	{ iptraceID_FAILED_TO_CREATE_SOCKET,			( const uint8_t * const ) "Count of failures to create a socket",				prvIncrementEventCount, 0 },
 	{ iptraceID_RECVFROM_DISCARDING_BYTES,			( const uint8_t * const ) "Count of times recvfrom() has discarding bytes",		prvIncrementEventCount, 0 },
 	{ iptraceID_ETHERNET_RX_EVENT_LOST,				( const uint8_t * const ) "Count of lost Ethenret Rx events (event queue full?)",prvIncrementEventCount, 0 },
 	{ iptraceID_STACK_TX_EVENT_LOST,				( const uint8_t * const ) "Count of lost IP stack events (event queue full?)",	prvIncrementEventCount, 0 },
 	{ ipconfigID_BIND_FAILED,						( const uint8_t * const ) "Count of failed calls to bind()",					prvIncrementEventCount, 0 },
-	{ iptraceID_NETWORK_INTERFACE_TRANSMIT,			( const uint8_t * const ) "Count of transmitted packets",						prvIncrementEventCount, 0 },
 	{ iptraceID_RECVFROM_TIMEOUT,					( const uint8_t * const ) "Count of receive timeouts",							prvIncrementEventCount, 0 },
 	{ iptraceID_SENDTO_DATA_TOO_LONG,				( const uint8_t * const ) "Count of failed sends due to oversized payload",		prvIncrementEventCount, 0 },
 	{ iptraceID_SENDTO_SOCKET_NOT_BOUND,			( const uint8_t * const ) "Count of failed sends due to unbound socket",		prvIncrementEventCount, 0 },
@@ -126,17 +132,17 @@ xExampleDebugStatEntry_t xIPTraceValues[] =
 
 /*-----------------------------------------------------------*/
 
-portBASE_TYPE xExampleDebugStatEntries( void )
+BaseType_t xExampleDebugStatEntries( void )
 {
 	/* Return the number of entries in the xIPTraceValues[] table. */
-	return ( portBASE_TYPE ) ( sizeof( xIPTraceValues ) / sizeof( xExampleDebugStatEntry_t ) );
+	return ( BaseType_t ) ( sizeof( xIPTraceValues ) / sizeof( xExampleDebugStatEntry_t ) );
 }
 /*-----------------------------------------------------------*/
 
 void vExampleDebugStatUpdate( uint8_t ucIdentifier, uint32_t ulValue )
 {
-portBASE_TYPE xIndex;
-const portBASE_TYPE xEntries = sizeof( xIPTraceValues ) / sizeof( xExampleDebugStatEntry_t );
+BaseType_t xIndex;
+const BaseType_t xEntries = sizeof( xIPTraceValues ) / sizeof( xExampleDebugStatEntry_t );
 
 	/* Update an entry in the xIPTraceValues[] table.  Each row in the table
 	includes a pointer to a function that performs the actual update.  This

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/TraceMacros/Example1/DemoIPTrace.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -85,18 +90,21 @@ typedef struct ExampleDebugStatEntry
 
 /* Unique identifiers used to locate the entry for each trace macro in the
 xIPTraceValues[] table defined in DemoIPTrace.c. */
-#define iptraceID_NETWORK_BUFFER_OBTAINED					1
-#define iptraceID_NETWORK_BUFFER_OBTAINED_FROM_ISR			2
-#define iptraceID_NETWORK_EVENT_RECEIVED					3
-#define iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER			4
-#define iptraceID_ARP_TABLE_ENTRY_EXPIRED					5
-#define iptraceID_PACKET_DROPPED_TO_GENERATE_ARP			6
-#define iptraceID_FAILED_TO_CREATE_SOCKET					7
-#define iptraceID_RECVFROM_DISCARDING_BYTES					8
-#define iptraceID_ETHERNET_RX_EVENT_LOST					9
-#define iptraceID_STACK_TX_EVENT_LOST						10
-#define ipconfigID_BIND_FAILED								11
-#define iptraceID_NETWORK_INTERFACE_TRANSMIT				12
+#define iptraceID_NETWORK_INTERFACE_RECEIVE					0
+#define iptraceID_NETWORK_INTERFACE_TRANSMIT				1
+#define iptraceID_PACKET_DROPPED_TO_GENERATE_ARP			2
+/* Do not change IDs above this line as the ID is shared with a FreeRTOS+Nabto
+demo. */
+#define iptraceID_NETWORK_BUFFER_OBTAINED					3
+#define iptraceID_NETWORK_BUFFER_OBTAINED_FROM_ISR			4
+#define iptraceID_NETWORK_EVENT_RECEIVED					5
+#define iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER			6
+#define iptraceID_ARP_TABLE_ENTRY_EXPIRED					7
+#define iptraceID_FAILED_TO_CREATE_SOCKET					8
+#define iptraceID_RECVFROM_DISCARDING_BYTES					9
+#define iptraceID_ETHERNET_RX_EVENT_LOST					10
+#define iptraceID_STACK_TX_EVENT_LOST						11
+#define ipconfigID_BIND_FAILED								12
 #define iptraceID_RECVFROM_TIMEOUT							13
 #define iptraceID_SENDTO_DATA_TOO_LONG						14
 #define iptraceID_SENDTO_SOCKET_NOT_BOUND					15
@@ -136,6 +144,7 @@ configINCLUDE_DEMO_DEBUG_STATS setting in FreeRTOSIPConfig.h. */
 	#define iptraceNO_BUFFER_FOR_SENDTO()								vExampleDebugStatUpdate( iptraceID_NO_BUFFER_FOR_SENDTO, 0 )
 	#define iptraceWAITING_FOR_TX_DMA_DESCRIPTOR()						vExampleDebugStatUpdate( iptraceID_WAIT_FOR_TX_DMA_DESCRIPTOR, 0 )
 	#define iptraceFAILED_TO_NOTIFY_SELECT_GROUP( xSocket )				vExampleDebugStatUpdate( iptraceID_FAILED_TO_NOTIFY_SELECT_GROUP, 0 )
+	#define iptraceNETWORK_INTERFACE_RECEIVE()							vExampleDebugStatUpdate( iptraceID_NETWORK_INTERFACE_RECEIVE, 0 )
 
 	/*
 	 * The function that updates a line in the xIPTraceValues table.
@@ -145,7 +154,7 @@ configINCLUDE_DEMO_DEBUG_STATS setting in FreeRTOSIPConfig.h. */
 	/*
 	 * Returns the number of entries in the xIPTraceValues table.
 	 */
-	portBASE_TYPE xExampleDebugStatEntries( void );
+	BaseType_t xExampleDebugStatEntries( void );
 
 #endif /* configINCLUDE_DEMO_DEBUG_STATS == 1 */
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/CLI-commands.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -82,37 +87,37 @@ static void prvSaveTraceFile( void );
  * Defines a command that returns a table showing the state of each task at the
  * time the command is called.
  */
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that returns a table showing how much time each task has
  * spent in the Running state.
  */
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that expects exactly three parameters.  Each of the three
  * parameter are echoed back one at a time.
  */
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that can take a variable number of parameters.  Each
  * parameter is echoes back one at a time.
  */
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that starts/stops events being recorded for offline viewing
  * in FreeRTOS+Trace.
  */
-static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /* Structure that defines the "run-time-stats" command line command. */
 static const CLI_Command_Definition_t xRunTimeStats =
 {
-	( const int8_t * const ) "run-time-stats", /* The command string to type. */
-	( const int8_t * const ) "\r\nrun-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n\r\n",
+	"run-time-stats", /* The command string to type. */
+	"\r\nrun-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n\r\n",
 	prvRunTimeStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -120,8 +125,8 @@ static const CLI_Command_Definition_t xRunTimeStats =
 /* Structure that defines the "task-stats" command line command. */
 static const CLI_Command_Definition_t xTaskStats =
 {
-	( const int8_t * const ) "task-stats", /* The command string to type. */
-	( const int8_t * const ) "\r\ntask-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n\r\n",
+	"task-stats", /* The command string to type. */
+	"\r\ntask-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n\r\n",
 	prvTaskStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -131,8 +136,8 @@ takes exactly three parameters that the command simply echos back one at a
 time. */
 static const CLI_Command_Definition_t xThreeParameterEcho =
 {
-	( const int8_t * const ) "echo_3_parameters",
-	( const int8_t * const ) "\r\necho_3_parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n\r\n",
+	"echo_3_parameters",
+	"\r\necho_3_parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n\r\n",
 	prvThreeParameterEchoCommand, /* The function to run. */
 	3 /* Three parameters are expected, which can take any value. */
 };
@@ -142,8 +147,8 @@ takes a variable number of parameters that the command simply echos back one at
 a time. */
 static const CLI_Command_Definition_t xParameterEcho =
 {
-	( const int8_t * const ) "echo_parameters",
-	( const int8_t * const ) "\r\necho_parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n\r\n",
+	"echo_parameters",
+	"\r\necho_parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n\r\n",
 	prvParameterEchoCommand, /* The function to run. */
 	-1 /* The user can enter any number of commands. */
 };
@@ -152,8 +157,8 @@ static const CLI_Command_Definition_t xParameterEcho =
 parameter, which can be either "start" or "stop". */
 static const CLI_Command_Definition_t xStartTrace =
 {
-	( const int8_t * const ) "trace",
-	( const int8_t * const ) "\r\ntrace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n\r\n",
+	"trace",
+	"\r\ntrace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n\r\n",
 	prvStartStopTraceCommand, /* The function to run. */
 	1 /* One parameter is expected.  Valid values are "start" and "stop". */
 };
@@ -171,9 +176,9 @@ void vRegisterCLICommands( void )
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stack	#\r\n************************************************\r\n";
+const char *const pcHeader = "Task          State  Priority  Stack	#\r\n************************************************\r\n";
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -183,8 +188,8 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskList( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -192,9 +197,9 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Time\r\n****************************************\r\n";
+const char * const pcHeader = "Task            Abs Time      % Time\r\n****************************************\r\n";
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -204,8 +209,8 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskGetRunTimeStats( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -213,11 +218,11 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE lParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t lParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -230,7 +235,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The three parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The three parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -243,21 +248,21 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&lParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* Return the parameter string. */
 		memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-		sprintf( ( char * ) pcWriteBuffer, "%d: ", lParameterNumber );
-		strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, lParameterStringLength );
-		strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+		sprintf( pcWriteBuffer, "%d: ", lParameterNumber );
+		strncat( pcWriteBuffer, pcParameter, lParameterStringLength );
+		strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 		/* If this is the last of the three parameters then there are no more
 		strings to return after this one. */
@@ -280,11 +285,11 @@ static portBASE_TYPE lParameterNumber = 0;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE lParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t lParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -297,7 +302,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -310,20 +315,20 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&lParameterStringLength	/* Store the parameter string length. */
+						);
 
 		if( pcParameter != NULL )
 		{
 			/* Return the parameter string. */
 			memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-			sprintf( ( char * ) pcWriteBuffer, "%d: ", lParameterNumber );
-			strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, lParameterStringLength );
-			strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+			sprintf( pcWriteBuffer, "%d: ", lParameterNumber );
+			strncat( pcWriteBuffer, pcParameter, lParameterStringLength );
+			strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 			/* There might be more parameters to return after this one. */
 			xReturn = pdTRUE;
@@ -347,10 +352,10 @@ static portBASE_TYPE lParameterNumber = 0;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE lParameterStringLength;
+const char *pcParameter;
+BaseType_t lParameterStringLength;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -360,36 +365,36 @@ portBASE_TYPE lParameterStringLength;
 	configASSERT( pcWriteBuffer );
 
 	/* Obtain the parameter string. */
-	pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-								(
-									pcCommandString,		/* The command string itself. */
-									1,						/* Return the first parameter. */
-									&lParameterStringLength	/* Store the parameter string length. */
-								);
+	pcParameter = FreeRTOS_CLIGetParameter
+					(
+						pcCommandString,		/* The command string itself. */
+						1,						/* Return the first parameter. */
+						&lParameterStringLength	/* Store the parameter string length. */
+					);
 
 	/* Sanity check something was returned. */
 	configASSERT( pcParameter );
 
 	/* There are only two valid parameter values. */
-	if( strncmp( ( const char * ) pcParameter, "start", strlen( "start" ) ) == 0 )
+	if( strncmp( pcParameter, "start", strlen( "start" ) ) == 0 )
 	{
 		/* Start or restart the trace. */
 		vTraceStop();
 		vTraceClear();
 		uiTraceStart();
 
-		sprintf( ( char * ) pcWriteBuffer, "Trace recording (re)started.\r\n" );
+		sprintf( pcWriteBuffer, "Trace recording (re)started.\r\n" );
 	}
-	else if( strncmp( ( const char * ) pcParameter, "stop", strlen( "stop" ) ) == 0 )
+	else if( strncmp( pcParameter, "stop", strlen( "stop" ) ) == 0 )
 	{
 		/* End the trace, if one is running. */
 		vTraceStop();
-		sprintf( ( char * ) pcWriteBuffer, "Stopping trace recording and dumping log to disk.\r\n" );
+		sprintf( pcWriteBuffer, "Stopping trace recording and dumping log to disk.\r\n" );
 		prvSaveTraceFile();
 	}
 	else
 	{
-		sprintf( ( char * ) pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
+		sprintf( pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
 	}
 
 	/* There is no more data to return after this single string, so return

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/FreeRTOSConfig.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -104,7 +109,7 @@
 #define configTIMER_QUEUE_LENGTH		20
 #define configTIMER_TASK_STACK_DEPTH	( configMINIMAL_STACK_SIZE * 2 )
 
-#define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 7 )
+#define configMAX_PRIORITIES			( 7 )
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
 
 
@@ -156,6 +161,8 @@ take up unnecessary RAM. */
 
 
 /* Include the FreeRTOS+Trace FreeRTOS trace macro definitions. */
+#define TRACE_ENTER_CRITICAL_SECTION() portENTER_CRITICAL()
+#define TRACE_EXIT_CRITICAL_SECTION() portEXIT_CRITICAL()
 #include "trcKernelPort.h"
 
 #endif /* FREERTOS_CONFIG_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Run-time-stats-utils.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Trace_Recorder_Configuration/trcConfig.h

@@ -1,14 +1,14 @@
 /*******************************************************************************
- * Tracealyzer v2.4.1 Recorder Library
+ * Tracealyzer v2.7.0 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 
+ * 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
@@ -16,38 +16,121 @@
  * 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 
+ * 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 
+ * 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.
+ * Tabs are used for indent in this file (1 tab = 4 spaces)
+ *
+ * Copyright Percepio AB, 2014.
  * www.percepio.com
  ******************************************************************************/
 
 #ifndef TRCCONFIG_H
 #define TRCCONFIG_H
 
-#include <stdint.h>
+/******************************************************************************
+ * SELECTED_PORT
+ *
+ * Macro that specifies what hardware port that should be used.
+ * Available ports are:
+ *
+ * Port Name							Code	 Official	OS supported
+ * PORT_APPLICATION_DEFINED				-2		-			-
+ * PORT_NOT_SET							-1		-			-
+ * PORT_HWIndependent					0		Yes			Any
+ * PORT_Win32							1		Yes			FreeRTOS on 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_PIC32MX				9		Yes			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
+ * PORT_MICROCHIP_PIC32MZ				14		Yes			Any
+ * PORT_ARM_CORTEX_A9					15		No			Any
+ *****************************************************************************/
+
+#ifndef WIN32
+	// Set the port setting here!
+	#define SELECTED_PORT PORT_NOT_SET
+
+	#if (SELECTED_PORT == PORT_NOT_SET)
+		#error "You need to define SELECTED_PORT here!"
+	#endif
+#else
+	// For Win32 demo projects this is set automatically
+	#define SELECTED_PORT PORT_Win32
+#endif
+
+/******************************************************************************
+ * FREERTOS_VERSION
+ *
+ * Specify what version of FreeRTOS that is used. This is necessary compensate
+ * for renamed symbols in the FreeRTOS kernel (does not build if incorrect).
+ *
+ * FREERTOS_VERSION_7_3_OR_7_4 (= 1)		If using FreeRTOS v7.3.0 - v7.4.2
+ * FREERTOS_VERSION_7_5_OR_7_6 (= 2)		If using FreeRTOS v7.5.0 - v7.6.0
+ * FREERTOS_VERSION_8_0_OR_LATER (= 3)		If using FreeRTOS v8.0.0 or later
+ *****************************************************************************/
+#define FREERTOS_VERSION	FREERTOS_VERSION_8_0_OR_LATER
+
+/******************************************************************************
+ * 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
+ * to store the whole run since startup.
+ *
+ * When TRACE_RECORDER_STORE_MODE is TRACE_STORE_MODE_STOP_WHEN_FULL, the
+ * recording is stopped when the buffer becomes full. This is useful for
+ * recording events following a specific state, e.g., the startup sequence.
+ *****************************************************************************/
+#define TRACE_RECORDER_STORE_MODE TRACE_STORE_MODE_RING_BUFFER
 
 /*******************************************************************************
- * CONFIGURATION RELATED TO CAPACITY AND ALLOCATION 
+ * TRACE_SCHEDULING_ONLY
+ *
+ * Macro which should be defined as an integer value.
+ *
+ * If this setting is enabled (= 1), only scheduling events are recorded.
+ * If disabled (= 0), all events are recorded.
+ *
+ * Users of FreeRTOS+Trace Free Edition only displays scheduling events, so this
+ * option can be used to avoid storing unsupported events.
+ *
+ * Default value is 0 (store all enabled events).
+ *
  ******************************************************************************/
+#define TRACE_SCHEDULING_ONLY 0
 
 /*******************************************************************************
  * EVENT_BUFFER_SIZE
@@ -55,47 +138,298 @@
  * 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.
+ * it may store. Most events use one record (4 byte), although some events
+ * require multiple 4-byte records. You should adjust this to the amount of RAM
+ * available in the target system.
+ *
+ * Default value is 1000, which means that 4000 bytes is allocated for the
+ * event buffer.
  ******************************************************************************/
-
-#define EVENT_BUFFER_SIZE 4000 /* Adjust wrt. to available RAM */
-
+#define EVENT_BUFFER_SIZE 15000
 
 /*******************************************************************************
- * USE_LINKER_PRAGMA
+ * NTask, NISR, NQueue, NSemaphore, NMutex
  *
- * Macro which should be defined as an integer value, default is 0.
+ * A group of macros which should be defined as integer values, zero or larger.
  *
- * 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. 
+ * These define the capacity of the Object Property Table, i.e., the maximum
+ * number of objects active at any given point, within each object class (e.g.,
+ * task, queue, semaphore, ...).
  *
- * 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.
+ * If tasks or other other objects are deleted in your system, this
+ * setting does not limit the total amount of objects created, only the number
+ * of objects that have been successfully created but not yet deleted.
+ *
+ * Using too small values will cause vTraceError to be called, which stores an
+ * error message in the trace that is shown when opening the trace file.
+ *
+ * It can be wise to start with large values for these constants,
+ * unless you are very confident on these numbers. Then do a recording and
+ * check the actual usage by selecting View menu -> Trace Details ->
+ * Resource Usage -> Object Table.
  ******************************************************************************/
+#define NTask			100
+#define NISR			60
+#define NQueue			60
+#define NSemaphore		60
+#define NMutex			60
+#define NTimer			200
+#define NEventGroup		60
 
-#define USE_LINKER_PRAGMA 0
+/******************************************************************************
+ * INCLUDE_MEMMANG_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * This controls if malloc and free calls should be traced. Set this to zero to
+ * exclude malloc/free calls, or one (1) to include such events in the trace.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_MEMMANG_EVENTS 1
 
+/******************************************************************************
+ * INCLUDE_USER_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (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
+ *
+ * Default value is 1.
+ *
+ * Note that User Events are only displayed in Professional Edition.
+ *****************************************************************************/
+#define INCLUDE_USER_EVENTS 1
+
+/*****************************************************************************
+ * INCLUDE_ISR_TRACING
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * If this is zero (0), the code for recording Interrupt Service Routines is
+ * excluded to reduce code size.
+ *
+ * Default value is 1.
+ *
+ * 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_READY_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * If one (1), events are recorded when tasks enter scheduling state "ready".
+ * This uses a lot of space in the event buffer, so excluding "ready events"
+ * will allow for longer traces. Including ready events however allows for
+ * showing the initial pending time before tasks enter the execution state, and
+ * for presenting accurate response times.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_READY_EVENTS 1
+
+/*****************************************************************************
+ * INCLUDE_NEW_TIME_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * If this is zero (1), events will be generated whenever the OS clock is
+ * increased.
+ *
+ * Default value is 0.
+ *****************************************************************************/
+#define INCLUDE_NEW_TIME_EVENTS 1
+
+/******************************************************************************
+ * INCLUDE_FLOAT_SUPPORT
+ *
+ * Macro which should be defined as either zero (0) or one (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) arguments.
+ *
+ * vTracePrintF can be used with integer and string arguments in either case.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_FLOAT_SUPPORT 0
+
+/******************************************************************************
+ * INCLUDE_OBJECT_DELETE
+ *
+ * Macro which should be defined as either zero (0) or one (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.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_OBJECT_DELETE 1
 
 /*******************************************************************************
  * 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 
+ * 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.
+ * objects. If you don't use User Events or delete any kernel
+ * objects you set this to a very low value. The minimum recommended value is 4.
+ * A size of zero (0) is not allowed since a zero-sized array may result in a
+ * 32-bit pointer, i.e., using 4 bytes rather than 0.
+ *
+ * Default value is 800.
  ******************************************************************************/
-#define SYMBOL_TABLE_SIZE 1000
+#define SYMBOL_TABLE_SIZE 5000
+
+#if (SYMBOL_TABLE_SIZE == 0)
+#error "SYMBOL_TABLE_SIZE may not be zero!"
+#endif
+
+/******************************************************************************
+ * NameLenTask, NameLenQueue, ...
+ *
+ * Macros that specify the maximum lengths (number of characters) for names of
+ * kernel objects, such as tasks and queues. If longer names are used, they will
+ * be truncated when stored in the recorder.
+ *****************************************************************************/
+#define NameLenTask			15
+#define NameLenISR			15
+#define NameLenQueue		15
+#define NameLenSemaphore	15
+#define NameLenMutex		15
+#define NameLenTimer		15
+#define NameLenEventGroup 	15
+
+/******************************************************************************
+ * 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
+
+
+
+/******************************************************************************
+ *** ADVANCED SETTINGS ********************************************************
+ ******************************************************************************
+ * The remaining settings are not necessary to modify but allows for optimizing
+ * the recorder setup for your specific needs, e.g., to exclude events that you
+ * are not interested in, in order to get longer traces.
+ *****************************************************************************/
+
+/******************************************************************************
+* 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 reported addresses showing the
+* lower 24 bits only. If 0, you get the full 32-bit addresses.
+*
+* Default value is 0.
+******************************************************************************/
+#define HEAP_SIZE_BELOW_16M 0
+
+/******************************************************************************
+ * 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
+
+/******************************************************************************
+ * USE_IMPLICIT_IFE_RULES
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ * Default is 1.
+ *
+ * Tracealyzer groups the events into actor instances, based on context-switches
+ * and a definition of "Instance Finish Events", or IFEs. These are kernel calls
+ * considered to be the last event in a task instance. Some kernel calls are
+ * considered IFEs by default (e.g., delay functions), but it is also possible
+ * to specify this individually for each task (see vTraceTaskInstanceFinish).
+ *
+ * If USE_IMPLICIT_IFE_RULES is one (1), the default IFEs will be enabled, which
+ * gives a "typical" grouping of events into instances. You can combine this
+ * with calls to vTraceTaskInstanceFinish for specific tasks.
+ *
+ * If USE_IMPLICIT_IFE_RULES is zero (0), the implicit IFEs are disabled and all
+ * events withing each task is then shown as a single instance, unless  you call
+ * vTraceTaskInstanceFinish() at suitable locations to mark the IFEs.
+ *****************************************************************************/
+#define USE_IMPLICIT_IFE_RULES 1
+
+/******************************************************************************
+ * USE_16BIT_OBJECT_HANDLES
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * 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).
+ *
+ * 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.
+ *
+ * Default is 0.
+ *
+ * NOTE: An object with handle above 255 will use an extra 4-byte record in
+ * the event buffer whenever referenced. Moreover, 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, mutex, etc.
+ *****************************************************************************/
+#define USE_16BIT_OBJECT_HANDLES 0
+
+/******************************************************************************
+ * USE_TRACE_ASSERT
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ * Default is 1.
+ *
+ * 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.
+ * This is used on several places in the recorder code for sanity checks on
+ * parameters. Can be switched off to reduce CPU usage of the tracing.
+ *****************************************************************************/
+#define USE_TRACE_ASSERT 1
 
 /*******************************************************************************
  * USE_SEPARATE_USER_EVENT_BUFFER
@@ -103,10 +437,13 @@
  * 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.
+ * This enables and disables the use of the separate user event buffer. Using
+ * this separate buffer has the benefit of not overwriting the user events with
+ * kernel events (usually generated at a much higher rate), i.e., when using
+ * ring-buffer mode.
  *
  * 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 
+ * 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
@@ -121,7 +458,7 @@
  *
  * Only in use if USE_SEPARATE_USER_EVENT_BUFFER is set to 1.
  ******************************************************************************/
-#define USER_EVENT_BUFFER_SIZE 500
+#define USER_EVENT_BUFFER_SIZE 10
 
 /*******************************************************************************
  * USER_EVENT_CHANNELS
@@ -134,377 +471,5 @@
  ******************************************************************************/
 #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              15
-#define NQueue            15
-#define NSemaphore        15
-#define NMutex            15
-
-/* 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
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Trace_Recorder_Configuration/trcHardwarePort.h

@@ -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_Win32
-/*****************************************************************************/
-
-#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 <20>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

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/UDPCommandServer.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -101,7 +106,7 @@ void vUDPCommandInterpreterTask( void *pvParameters )
 long lBytes, lByte;
 signed char cInChar, cInputIndex = 0;
 static signed char cInputString[ cmdMAX_INPUT_SIZE ], cOutputString[ cmdMAX_OUTPUT_SIZE ], cLocalBuffer[ cmdSOCKET_INPUT_BUFFER_SIZE ];
-portBASE_TYPE xMoreDataToFollow;
+BaseType_t xMoreDataToFollow;
 volatile int iErrorCode = 0;
 struct sockaddr_in xClient;
 int xClientAddressLength = sizeof( struct sockaddr_in );

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/WIN32.vcxproj

@@ -151,14 +151,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcBase.h" />
-    <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcHooks.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcKernel.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcKernelPort.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcTypes.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcUser.h" />
     <ClInclude Include="FreeRTOSConfig.h" />
     <ClInclude Include="Trace_Recorder_Configuration\trcConfig.h" />
-    <ClInclude Include="Trace_Recorder_Configuration\trcHardwarePort.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/WIN32.vcxproj.filters

@@ -103,9 +103,6 @@
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcBase.h">
       <Filter>FreeRTOS+\FreeRTOS+Trace\Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcHooks.h">
-      <Filter>FreeRTOS+\FreeRTOS+Trace\Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcKernel.h">
       <Filter>FreeRTOS+\FreeRTOS+Trace\Include</Filter>
     </ClInclude>
@@ -115,8 +112,5 @@
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-Trace\Include\trcKernelPort.h">
       <Filter>FreeRTOS+\FreeRTOS+Trace\Include</Filter>
     </ClInclude>
-    <ClInclude Include="Trace_Recorder_Configuration\trcHardwarePort.h">
-      <Filter>Demo App Source\Trace Recorder Configuration</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/main.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -69,11 +74,12 @@
  * application.  It is provided as a convenient development and demonstration
  * test bed only.  This was tested using Windows XP on a dual core laptop.
  *
- * In this example, one simulated millisecond will take approximately 40ms to
- * execute, and the timing information in the FreeRTOS+Trace logs have no
- * meaningful units.  See the documentation page for the Windows simulator for
- * an explanation of the slow timing:
+ * Windows will not be running the FreeRTOS simulator threads continuously, so
+ * the timing information in the FreeRTOS+Trace logs have no meaningful units.
+ * See the documentation page for the Windows simulator for an explanation of
+ * the slow timing:
  * http://www.freertos.org/FreeRTOS-Windows-Simulator-Emulator-for-Visual-Studio-and-Eclipse-MingW.html
+ * - READ THE WEB DOCUMENTATION FOR THIS PORT FOR MORE INFORMATION ON USING IT -
  *
  * Documentation for this demo can be found on:
  * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_Trace/Free_RTOS_Plus_Trace_CLI_Example.shtml
@@ -123,9 +129,9 @@
 #define	mainQUEUE_SEND_TASK_PRIORITY		( tskIDLE_PRIORITY + 1 )
 #define mainUDP_CLI_TASK_PRIORITY			( tskIDLE_PRIORITY )
 
-/* The rate at which data is sent to the queue.  The (simulated) 50ms value is
+/* The rate at which data is sent to the queue.  The (simulated) 250ms value is
 converted to ticks using the portTICK_RATE_MS constant. */
-#define mainQUEUE_SEND_FREQUENCY_MS			( 50 / portTICK_RATE_MS )
+#define mainQUEUE_SEND_FREQUENCY_MS			( 250 / portTICK_RATE_MS )
 
 /* The number of items the queue can hold.  This is 1 as the receive task
 will remove items as they are added, meaning the send task should always find
@@ -182,17 +188,17 @@ const uint32_t ulLongTime_ms = 250UL;
 	/* Start the two tasks as described in the comments at the top of this
 	file. */
 	xTaskCreate( prvQueueReceiveTask,				/* The function that implements the task. */
-				( signed char * ) "Rx", 			/* The text name assigned to the task - for debug only as it is not used by the kernel. */
+				"Rx", 								/* The text name assigned to the task - for debug only as it is not used by the kernel. */
 				configMINIMAL_STACK_SIZE, 			/* The size of the stack to allocate to the task.  Not actually used as a stack in the Win32 simulator port. */
 				NULL,								/* The parameter passed to the task - not used in this example. */
 				mainQUEUE_RECEIVE_TASK_PRIORITY, 	/* The priority assigned to the task. */
 				NULL );								/* The task handle is not required, so NULL is passed. */
 
-	xTaskCreate( prvQueueSendTask, ( signed char * ) "TX", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_SEND_TASK_PRIORITY, NULL );
+	xTaskCreate( prvQueueSendTask, "TX", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_SEND_TASK_PRIORITY, NULL );
 
 	/* Create the task that handles the CLI on a UDP port.  The port number
 	is set using the configUDP_CLI_PORT_NUMBER setting in FreeRTOSConfig.h. */
-	xTaskCreate( vUDPCommandInterpreterTask, ( signed char * ) "CLI", configMINIMAL_STACK_SIZE, NULL, mainUDP_CLI_TASK_PRIORITY, NULL );
+	xTaskCreate( vUDPCommandInterpreterTask, "CLI", configMINIMAL_STACK_SIZE, NULL, mainUDP_CLI_TASK_PRIORITY, NULL );
 
 	/* Register commands with the FreeRTOS+CLI command interpreter. */
 	vRegisterCLICommands();
@@ -215,7 +221,7 @@ const uint32_t ulLongTime_ms = 250UL;
 
 static void prvQueueSendTask( void *pvParameters )
 {
-portTickType xNextWakeTime;
+TickType_t xNextWakeTime;
 const unsigned long ulValueToSend = 100UL;
 
 	/* Remove warning about unused parameters. */
@@ -291,10 +297,10 @@ const unsigned long ulLongSleep = 1000UL;
 
 void vApplicationTickHook( void )
 {
-	/* Write a user event to the trace log.  
+	/* Write a user event to the trace log.
 	Note tick events will not appear in the trace recording with regular period
 	because this project runs in a Windows simulator, and does not therefore
 	exhibit deterministic behaviour. */
-	vTraceUserEvent( xTickTraceUserEvent );					
+	vTraceUserEvent( xTickTraceUserEvent );
 }
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/FreeRTOSConfig.h

@@ -1,134 +0,0 @@
-/*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
-
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
-    link: http://www.freertos.org/a00114.html
-
-    1 tab == 4 spaces!
-
-    ***************************************************************************
-     *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
-     *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- * http://www.freertos.org/a00110.html
- *----------------------------------------------------------*/
-
-#define configUSE_PREEMPTION			1
-#define configUSE_IDLE_HOOK				1
-#define configUSE_TICK_HOOK				0
-#define configTICK_RATE_HZ				( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
-#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 60 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the Win32 thread. */
-#define configTOTAL_HEAP_SIZE			( ( size_t ) 0 ) /* This parameter has no effect when heap_3.c is included in the project. */
-#define configMAX_TASK_NAME_LEN			( 7 )
-#define configUSE_TRACE_FACILITY		1
-#define configUSE_16_BIT_TICKS			0
-#define configIDLE_SHOULD_YIELD			1
-#define configUSE_CO_ROUTINES 			0
-#define configUSE_MUTEXES				1
-#define configCHECK_FOR_STACK_OVERFLOW	0 /* Not applicable to the Win32 port. */
-#define configUSE_RECURSIVE_MUTEXES		1
-#define configQUEUE_REGISTRY_SIZE		0
-#define configUSE_MALLOC_FAILED_HOOK	0
-#define configUSE_APPLICATION_TASK_TAG	0
-#define configUSE_COUNTING_SEMAPHORES	1
-#define configUSE_ALTERNATIVE_API		0
-
-#define configUSE_TIMERS				1
-#define configTIMER_TASK_PRIORITY		2
-#define configTIMER_QUEUE_LENGTH		20
-#define configTIMER_TASK_STACK_DEPTH	( configMINIMAL_STACK_SIZE * 2 )
-
-#define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 7 )
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES 			0
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-
-#define INCLUDE_vTaskPrioritySet			1
-#define INCLUDE_uxTaskPriorityGet			1
-#define INCLUDE_vTaskDelete					1
-#define INCLUDE_vTaskCleanUpResources		0
-#define INCLUDE_vTaskSuspend				1
-#define INCLUDE_vTaskDelayUntil				1
-#define INCLUDE_vTaskDelay					1
-#define INCLUDE_uxTaskGetStackHighWaterMark	1
-#define INCLUDE_xTaskGetSchedulerState		1
-
-/* Run time stats gathering definitions. */
-#define configGENERATE_RUN_TIME_STATS	0
-
-extern void vAssertCalled( void );
-#define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled()
-
-/* The TCP port used by both the secure client and the secure server. */
-#define configTCP_PORT_NUMBER	5001
-
-#endif /* FREERTOS_CONFIG_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/READ_ME.url

@@ -1,5 +0,0 @@
-[InternetShortcut]
-URL=http://www.freertos.org/FreeRTOS-Plus/CyaSSL/FreeRTOS_CyaSSL_Example.shtml
-IDList=
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/SecureTCPClientTask.c

@@ -1,173 +0,0 @@
-/*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
-
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
-    link: http://www.freertos.org/a00114.html
-
-    1 tab == 4 spaces!
-
-    ***************************************************************************
-     *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
-     *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-#pragma comment( lib, "ws2_32.lib" )
-
-/* Win32 includes. */
-#include <WinSock2.h>
-
-/* CyaSSL includes. */
-#include "cyassl/ssl.h"
-
-/* Standard includes. */
-#include <stdint.h>
-#include <stdio.h>
-
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
-#include "task.h"
-
-/*-----------------------------------------------------------*/
-
-/* The CyaSSL context for the client. */
-static CYASSL_CTX* xCyaSSL_ClientContext = NULL;
-
-/*-----------------------------------------------------------*/
-
-/* See the comments at the top of main.c. */
-void vSecureTCPClientTask( void *pvParameters )
-{
-SOCKET xClientSocket;
-struct sockaddr_in xConnection;
-CYASSL* xCyaSSL_Object;
-WORD wVersionRequested;
-WSADATA xWSAData;
-uint8_t cString[ 50 ];
-portBASE_TYPE lReturned;
-uint32_t ulCount = 0UL;
-
-	/* Remove compiler warning about unused parameters. */
-	( void ) pvParameters;
-
-	/* Prepare to use WinSock. */
-	wVersionRequested = MAKEWORD( 2, 2 );
-	configASSERT( WSAStartup( wVersionRequested, &xWSAData ) == 0 );
-
-	/* Set family and port for client socket. */
-	memset( ( void * ) &xConnection, 0x00, sizeof( struct sockaddr_in ) );
-	xConnection.sin_family = AF_INET;
-	xConnection.sin_addr.s_addr = inet_addr("127.0.0.1");
-	xConnection.sin_port = htons( configTCP_PORT_NUMBER );
-
-    /* Attempt to create a context that uses the TLS V1 server protocol. */
-    xCyaSSL_ClientContext = CyaSSL_CTX_new( CyaTLSv1_client_method() );
-	configASSERT( xCyaSSL_ClientContext );
-
-    /* Load the CA certificate. */
-    lReturned = CyaSSL_CTX_load_verify_locations( xCyaSSL_ClientContext, "ca-cert.pem", 0 );
-	configASSERT( lReturned == SSL_SUCCESS );
-
-	for( ;; )
-	{
-		/* Create the socket. */
-		xClientSocket = socket( AF_INET, SOCK_STREAM, 0 );
-		configASSERT( xClientSocket != INVALID_SOCKET );
-
-		/* Connect to the secure server. */
-		if( connect( xClientSocket, ( SOCKADDR * ) &xConnection, sizeof( xConnection ) ) == 0 )
-		{
-			/* The connect was successful.  Create a CyaSSL object to associate 
-			with this connection. */
-			xCyaSSL_Object = CyaSSL_new( xCyaSSL_ClientContext );
-        
-			if( xCyaSSL_Object != NULL )
-			{
-				/* Associate the created CyaSSL object with the connected 
-				socket. */
-				lReturned = CyaSSL_set_fd( xCyaSSL_Object, xClientSocket );
-				configASSERT( lReturned == SSL_SUCCESS );
-
-				/* The count is used to differentiate between messages sent to
-				the server, and to break out of the do while loop below. */
-				ulCount = 0UL;
-
-				do
-				{
-					/* Create the string that is sent to the secure server. */
-					sprintf( ( char * ) cString, "Message number %lu\r\n", ulCount );
-
-					/* The next line is the secure equivalent of the standard 
-					sockets call:
-					lReturned = send( xClientSocket, cString, strlen( cString ) + 1, 0 ); */
-					lReturned = CyaSSL_write( xCyaSSL_Object, ( const char * ) cString, strlen( ( const char * ) cString ) + 1 );
-					
-					
-					/* Short delay to prevent the messages streaming up the
-					console too quickly. */
-					vTaskDelay( 5 );
-					ulCount++;
-
-				} while( ( lReturned != SOCKET_ERROR ) && ( ulCount < 10UL ) );
-			}
-						
-			CyaSSL_free( xCyaSSL_Object );
-			closesocket( xClientSocket );
-
-			/* Delay for a short time before starting over. */
-			vTaskDelay( 50 );
-		}
-	}
-}
-/*-----------------------------------------------------------*/
-

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/SecureTCPServerTask.c

@@ -1,283 +0,0 @@
-/*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
-
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
-    link: http://www.freertos.org/a00114.html
-
-    1 tab == 4 spaces!
-
-    ***************************************************************************
-     *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
-     *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-#pragma comment( lib, "ws2_32.lib" )
-
-/* Win32 includes. */
-#include <WinSock2.h>
-
-/* CyaSSL includes. */
-#include "cyassl/ssl.h"
-
-/* Standard includes. */
-#include <stdint.h>
-#include <stdio.h>
-
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
-#include "task.h"
-
-/* This application is using the FreeRTOS Windows simulator, which uses the
-FreeRTOS scheduler to schedule FreeRTOS task within the Windows environment.
-The Windows envrionment must not be allowed to block any Windows threads that
-are running FreeRTOS tasks, unless the FreeRTOS task is running at the FreeRTOS
-idle priority.  For simplicity, this demo uses the Windows TCP/IP stack, the
-API for which can cause Windows threads to block.  Therefore, any FreeRTOS task
-that makes calls to the Windows TCP/IP stack must be assigned the idle prioity.
-Note this is only a restriction of the simulated Windows environment - real
-FreeRTOS ports do not have this restriction. */
-#define sstSECURE_CLIENT_TASK_PRIORITY		( tskIDLE_PRIORITY )
-
-/*-----------------------------------------------------------*/
-
-/*
- * Open, configures and binds the server's TCP socket.
- */
-static SOCKET prvOpenServerSocket( void );
-
-/* 
- * Prepare the CyaSSL library for use.
- */
-static void prvInitialiseCyaSSL( void );
-
-/*
- * The task that implements the client side of the connection.
- */
-extern void vSecureTCPClientTask( void *pvParameters );
-
-/*-----------------------------------------------------------*/
-
-/* The CyaSSL context for the server. */
-static CYASSL_CTX* xCyaSSL_ServerContext = NULL;
-
-/*-----------------------------------------------------------*/
-
-/* See the comments at the top of main.c. */
-void vSecureTCPServerTask( void *pvParameters )
-{
-portBASE_TYPE xReturned;
-long lBytes;
-uint8_t cReceivedString[ 60 ];
-struct sockaddr_in xClient;
-int xClientAddressLength = sizeof( struct sockaddr_in );
-SOCKET xListeningSocket, xConnectedSocket;
-CYASSL* xCyaSSL_Object; /* Only one connection is accepted at a time, so only one object is needed at a time. */
-
-	/* Just to prevent compiler warnings. */
-	( void ) pvParameters;
-
-	/* Perform the initialisation necessary before CyaSSL can be used. */
-	prvInitialiseCyaSSL();
-	configASSERT( xCyaSSL_ServerContext );
-
-	/* Attempt to open the socket. */
-	xListeningSocket = prvOpenServerSocket();
-
-	/* Now the server socket has been created and the CyaSSL library has been
-	initialised, the task that implements the client side can be created. */
-	xTaskCreate( vSecureTCPClientTask, "Client", configMINIMAL_STACK_SIZE, NULL, sstSECURE_CLIENT_TASK_PRIORITY, NULL );
-
-	if( xListeningSocket != INVALID_SOCKET )
-	{
-		for( ;; )
-		{
-			/* Wait until the client connects. */
-			printf( "Waiting for new connection\r\n" );
-			xConnectedSocket = accept( xListeningSocket, ( struct sockaddr * ) &xClient, &xClientAddressLength );
-
-			if( xConnectedSocket != INVALID_SOCKET )
-			{
-				printf( "Connection established\r\n" );
-
-				/* A connection has been accepted by the server.  Create a 
-				CyaSSL object for use with the newly connected socket. */
-				xCyaSSL_Object = NULL;
-				xCyaSSL_Object = CyaSSL_new( xCyaSSL_ServerContext );
-    
-				if( xCyaSSL_Object != NULL )
-				{
-					/* Associate the created CyaSSL object with the connected 
-					socket. */
-					xReturned = CyaSSL_set_fd( xCyaSSL_Object, xConnectedSocket );
-					configASSERT( xReturned == SSL_SUCCESS );
-
-					do
-					{
-						/* The next line is the secure equivalent to the 
-						standard sockets call:
-						lBytes = recv( xConnectedSocket, cReceivedString, 50, 0 ); */
-						lBytes = CyaSSL_read( xCyaSSL_Object, cReceivedString, sizeof( cReceivedString ) );
-						
-						/* Print the received characters. */
-						if( lBytes > 0 )
-						{
-							printf( "Received by the secure server: %s\r\n", cReceivedString );
-						}
-
-					} while ( lBytes > 0 );
-
-					/* The connection was closed, close the socket and free the
-					CyaSSL object. */
-					closesocket( xConnectedSocket );					
-					CyaSSL_free( xCyaSSL_Object );
-					printf( "Connection closed, back to start\r\n\r\n" );
-				}								
-			}
-		} 
-	}
-	else
-	{
-		/* The socket could not be opened. */
-		vTaskDelete( NULL );
-	}
-}
-/*-----------------------------------------------------------*/
-
-static SOCKET prvOpenServerSocket( void )
-{
-WSADATA xWSAData;
-WORD wVersionRequested;
-struct sockaddr_in xConnection;
-SOCKET xSocket = INVALID_SOCKET;
-
-	wVersionRequested = MAKEWORD( 2, 2 );
-
-	/* Prepare to use WinSock. */
-	if( WSAStartup( wVersionRequested, &xWSAData ) != 0 )
-	{
-		fprintf( stderr, "Could not open Windows connection.\n" );
-	}
-	else
-	{
-		xSocket = socket( AF_INET, SOCK_STREAM, 0 );
-		if( xSocket == INVALID_SOCKET)
-		{
-			fprintf( stderr, "Could not create socket.\n" );
-			WSACleanup();
-		}
-		else
-		{
-			/* Zero out the server structure. */
-			memset( ( void * ) &xConnection, 0x00, sizeof( struct sockaddr_in ) );
-
-			xConnection.sin_family = AF_INET;
-			xConnection.sin_addr.s_addr = inet_addr("127.0.0.1");
-			xConnection.sin_port = htons( configTCP_PORT_NUMBER );
-
-			/* Bind the address to the socket. */
-			if( bind( xSocket, ( struct sockaddr * ) &xConnection, sizeof( struct sockaddr_in ) ) == -1 )
-			{
-				fprintf( stderr, "Could not socket to port %d.\n", configTCP_PORT_NUMBER );
-				closesocket( xSocket );
-				xSocket = INVALID_SOCKET;
-				WSACleanup();
-			}
-
-			if( listen( xSocket, 20 ) != 0 )
-			{
-				closesocket( xSocket );
-				xSocket = INVALID_SOCKET;
-				WSACleanup();
-			}
-		}
-	}
-
-	return xSocket;
-}
-/*-----------------------------------------------------------*/
-
-static void prvInitialiseCyaSSL( void )
-{
-int32_t iReturn;
-
-	#ifdef DEBUG_CYASSL
-	{
-		CyaSSL_Debugging_ON();
-	}
-	#endif
-
-    /* Initialise CyaSSL.  This must be done before any other CyaSSL functions
-    are called. */
-    CyaSSL_Init();
-
-    /* Attempt to create a context that uses the TLS V1 server protocol. */
-    xCyaSSL_ServerContext = CyaSSL_CTX_new( CyaTLSv1_server_method() );
-
-    if( xCyaSSL_ServerContext != NULL )
-    {
-        /* Load the CA certificate.  Real applications should ensure that
-        CyaSSL_CTX_load_verify_locations() returns SSL_SUCCESS before 
-		proceeding. */
-        iReturn = CyaSSL_CTX_load_verify_locations( xCyaSSL_ServerContext, "ca-cert.pem", 0 );
-		configASSERT( iReturn == SSL_SUCCESS );
-
-		iReturn = CyaSSL_CTX_use_certificate_file( xCyaSSL_ServerContext, "server-cert.pem", SSL_FILETYPE_PEM );
-		configASSERT( iReturn == SSL_SUCCESS );
-
-		iReturn = CyaSSL_CTX_use_PrivateKey_file( xCyaSSL_ServerContext, "server-key.pem", SSL_FILETYPE_PEM );
-		configASSERT( iReturn == SSL_SUCCESS );
-    }
-}
-
-

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/WIN32.vcxproj

@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C686325E-3261-42F7-AEB1-DDE5280E1CEB}</ProjectGuid>
-    <ProjectName>RTOSDemo</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Debug/WIN32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Source\CyaSSL;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;SIZEOF_LONG_LONG=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\Debug/WIN32.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>.\Debug/RTOSDemo.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Debug/WIN32.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/WIN32.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Release/WIN32.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_WINSOCKAPI_;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\Release/WIN32.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\Include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0c09</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>.\Release/RTOSDemo.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>.\Release/WIN32.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>..\Common\ethernet\lwip-1.4.0\ports\win32\WinPCap</AdditionalLibraryDirectories>
-      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/WIN32.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\aes.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\arc4.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\asn.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\coding.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\des3.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\dh.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\dsa.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\hc128.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\hmac.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\integer.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\logging.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\md4.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\md5.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\memory.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\misc.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\pwdbased.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\rabbit.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\random.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\rsa.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\sha.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\sha256.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\src\internal.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\src\io.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\src\keys.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\src\ssl.c" />
-    <ClCompile Include="..\..\Source\CyaSSL\src\tls.c" />
-    <ClCompile Include="..\..\..\FreeRTOS\Source\list.c" />
-    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_3.c" />
-    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c" />
-    <ClCompile Include="..\..\..\FreeRTOS\Source\queue.c" />
-    <ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c" />
-    <ClCompile Include="..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="main.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SecureTCPClientTask.c" />
-    <ClCompile Include="SecureTCPServerTask.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="FreeRTOSConfig.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/WIN32.vcxproj.filters

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{38712199-cebf-4124-bf15-398f7c3419ea}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Demo App Source">
-      <UniqueIdentifier>{34567deb-d5ab-4a56-8640-0aaec609521a}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="FreeRTOS">
-      <UniqueIdentifier>{af3445a1-4908-4170-89ed-39345d90d30c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="FreeRTOS\Source">
-      <UniqueIdentifier>{f32be356-4763-4cae-9020-974a2638cb08}</UniqueIdentifier>
-      <Extensions>*.c</Extensions>
-    </Filter>
-    <Filter Include="FreeRTOS\Source\Portable">
-      <UniqueIdentifier>{88f409e6-d396-4ac5-94bd-7a99c914be46}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="FreeRTOS+">
-      <UniqueIdentifier>{e5ad4ec7-23dc-4295-8add-2acaee488f5a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="FreeRTOS+\CyaSSL">
-      <UniqueIdentifier>{8b481200-a9e5-48a4-98ad-49d2783cd652}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="FreeRTOS+\CyaSSL\ctaocrypt">
-      <UniqueIdentifier>{738eaad9-4e49-4309-9074-c3d9e102fb4a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.c">
-      <Filter>Demo App Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c">
-      <Filter>FreeRTOS\Source\Portable</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_3.c">
-      <Filter>FreeRTOS\Source\Portable</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\timers.c">
-      <Filter>FreeRTOS\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\list.c">
-      <Filter>FreeRTOS\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\queue.c">
-      <Filter>FreeRTOS\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c">
-      <Filter>FreeRTOS\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\src\internal.c">
-      <Filter>FreeRTOS+\CyaSSL</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\src\io.c">
-      <Filter>FreeRTOS+\CyaSSL</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\src\keys.c">
-      <Filter>FreeRTOS+\CyaSSL</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\src\ssl.c">
-      <Filter>FreeRTOS+\CyaSSL</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\src\tls.c">
-      <Filter>FreeRTOS+\CyaSSL</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\aes.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\arc4.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\asn.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\coding.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\des3.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\dh.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\dsa.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\hc128.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\hmac.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\integer.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\logging.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\md4.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\md5.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\memory.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\misc.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\pwdbased.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\rabbit.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\random.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\rsa.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\sha256.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CyaSSL\ctaocrypt\src\sha.c">
-      <Filter>FreeRTOS+\CyaSSL\ctaocrypt</Filter>
-    </ClCompile>
-    <ClCompile Include="SecureTCPServerTask.c">
-      <Filter>Demo App Source</Filter>
-    </ClCompile>
-    <ClCompile Include="SecureTCPClientTask.c">
-      <Filter>Demo App Source</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="FreeRTOSConfig.h">
-      <Filter>Demo App Source</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/ca-cert.pem

@@ -1,87 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            e9:d0:a7:5f:79:25:f4:3c
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
-        Validity
-            Not Before: Oct 24 18:18:15 2011 GMT
-            Not After : Jul 20 18:18:15 2014 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
-                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
-                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
-                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
-                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
-                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
-                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
-                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
-                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
-                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
-                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
-                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
-                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
-                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
-                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
-                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
-                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
-                    36:79
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-            X509v3 Authority Key Identifier: 
-                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
-                serial:E9:D0:A7:5F:79:25:F4:3C
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
-        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
-        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
-        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
-        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
-        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
-        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
-        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
-        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
-        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
-        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
-        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
-        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
-        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
-        5a:1f:7f:ca
------BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
-A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
-dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
-MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
-8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
-EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
-dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
-mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
-CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
-P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
-dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
-BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
-9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
-PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
-Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
-G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
-ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
-rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
------END CERTIFICATE-----

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/main.c

@@ -1,140 +0,0 @@
-/*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
-
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
-    link: http://www.freertos.org/a00114.html
-
-    1 tab == 4 spaces!
-
-    ***************************************************************************
-     *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
-     *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-/* Standard includes. */
-#include <stdio.h>
-#include <stdint.h>
-
-/* FreeRTOS includes. */
-#include <FreeRTOS.h>
-#include "task.h"
-
-/* This application is using the FreeRTOS Windows simulator, which uses the
-FreeRTOS scheduler to schedule FreeRTOS task within the Windows environment.
-The Windows environment must not be allowed to block any Windows threads that
-are running FreeRTOS tasks, unless the FreeRTOS task is running at the FreeRTOS
-idle priority.  For simplicity, this demo uses the Windows TCP/IP stack, the
-API for which can cause Windows threads to block.  Therefore, any FreeRTOS task
-that makes calls to the Windows TCP/IP stack must be assigned the idle priority.
-Note this is only a restriction of the simulated Windows environment - real
-FreeRTOS ports do not have this restriction. */
-#define mainSECURE_SERVER_TASK_PRIORITY		( tskIDLE_PRIORITY )
-
-
-/*-----------------------------------------------------------*/
-
-/*
- * The task that implements the server side.
- */
-extern void vSecureTCPServerTask( void *pvParameters );
-
-/*-----------------------------------------------------------*/
-
-int main( void )
-{
-const uint32_t ulLongTime_ms = 250UL;
-
-	/* Create the TCP server task.  This will itself create the client task
-	once it has completed the CyaSSL initialisation. */
-	xTaskCreate( vSecureTCPServerTask, ( signed char * ) "Server", configMINIMAL_STACK_SIZE, NULL, mainSECURE_SERVER_TASK_PRIORITY, NULL );
-
-	/* Start the task running. */
-	vTaskStartScheduler();
-
-	/* If all is well, the scheduler will now be running, and the following
-	line will never be reached.  If the following line does execute, then
-	there was insufficient FreeRTOS heap memory available for the idle and/or
-	timer tasks	to be created.  See the memory management section on the
-	FreeRTOS web site for more details (this is standard text that is not not 
-	really applicable to the Win32 simulator port). */
-	for( ;; )
-	{
-		Sleep( ulLongTime_ms );
-	}
-}
-/*-----------------------------------------------------------*/
-
-void vApplicationIdleHook( void )
-{
-const unsigned long ulMSToSleep = 5;
-
-	/* This function is called on each cycle of the idle task if
-	configUSE_IDLE_HOOK is set to 1 in FreeRTOSConfig.h.  Sleep to reduce CPU 
-	load. */
-	Sleep( ulMSToSleep );
-}
-/*-----------------------------------------------------------*/
-
-void vAssertCalled( void )
-{
-const unsigned long ulLongSleep = 1000UL;
-
-	taskDISABLE_INTERRUPTS();
-	for( ;; )
-	{
-		Sleep( ulLongSleep );
-	}
-}
-/*-----------------------------------------------------------*/
-

FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/server-cert.pem

@@ -1,158 +0,0 @@
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number: 2 (0x2)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
-        Validity
-            Not Before: Oct 24 18:27:13 2011 GMT
-            Not After : Jul 20 18:27:13 2014 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=Support, CN=www.yassl.com/emailAddress=info@yassl.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
-                    01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
-                    f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
-                    f7:8a:ca:07:e7:35:2f:8f:e1:bd:7b:c0:2f:7c:ab:
-                    64:a8:17:fc:ca:5d:7b:ba:e0:21:e5:72:2e:6f:2e:
-                    86:d8:95:73:da:ac:1b:53:b9:5f:3f:d7:19:0d:25:
-                    4f:e1:63:63:51:8b:0b:64:3f:ad:43:b8:a5:1c:5c:
-                    34:b3:ae:00:a0:63:c5:f6:7f:0b:59:68:78:73:a6:
-                    8c:18:a9:02:6d:af:c3:19:01:2e:b8:10:e3:c6:cc:
-                    40:b4:69:a3:46:33:69:87:6e:c4:bb:17:a6:f3:e8:
-                    dd:ad:73:bc:7b:2f:21:b5:fd:66:51:0c:bd:54:b3:
-                    e1:6d:5f:1c:bc:23:73:d1:09:03:89:14:d2:10:b9:
-                    64:c3:2a:d0:a1:96:4a:bc:e1:d4:1a:5b:c7:a0:c0:
-                    c1:63:78:0f:44:37:30:32:96:80:32:23:95:a1:77:
-                    ba:13:d2:97:73:e2:5d:25:c9:6a:0d:c3:39:60:a4:
-                    b4:b0:69:42:42:09:e9:d8:08:bc:33:20:b3:58:22:
-                    a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
-                    ad:d7
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: sha1WithRSAEncryption
-        71:4e:d3:62:df:cc:4c:f7:cd:b7:6e:52:0b:6c:6e:e0:bd:c2:
-        2d:07:d7:c0:b0:6e:43:1e:35:bc:30:01:50:f0:ff:99:23:6c:
-        18:1a:41:b6:11:d6:d4:19:61:fd:e4:77:97:1c:39:e1:57:ab:
-        c5:15:63:77:11:36:5e:74:e2:24:0b:1f:41:78:ad:b7:81:e7:
-        b4:40:66:80:f0:4b:91:a0:6d:a8:6e:3d:53:d9:8b:ce:2a:e1:
-        0b:45:65:87:a1:96:ae:ee:3e:88:d5:12:1f:78:17:ae:2c:c5:
-        73:44:d8:dc:f4:af:d8:cc:ae:4c:e1:0c:be:55:a4:99:f7:6e:
-        96:c0:c8:45:87:bf:dc:51:57:ff:9e:73:37:6a:18:9c:c3:f9:
-        22:7a:f4:b0:52:bd:fc:21:30:f8:c5:ff:1e:87:7d:ad:a2:5a:
-        35:f5:22:a8:b4:0a:76:38:e6:76:b0:98:af:1b:ec:8a:0a:43:
-        74:d2:85:34:37:84:07:e1:f6:23:b2:29:de:a6:b6:b7:4c:57:
-        7e:96:06:cb:a9:16:25:29:3a:03:2d:55:7d:a6:8c:a4:f7:9e:
-        81:c9:95:b6:7c:c1:4a:ce:94:66:0c:ca:88:eb:d2:09:f5:5b:
-        19:58:82:df:27:fd:67:95:78:b7:02:06:d5:a7:61:bd:ef:3a:
-        fc:b2:61:cd
------BEGIN CERTIFICATE-----
-MIIDkDCCAngCAQIwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTExMDI0MTgyNzEzWhcN
-MTQwNzIwMTgyNzEzWjCBijELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmEx
-EDAOBgNVBAcTB0JvemVtYW4xDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwdTdXBw
-b3J0MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFX
-QfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/h
-vXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4
-pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo
-3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4
-D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHm
-YYPF0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU7TYt/MTPfNt25S
-C2xu4L3CLQfXwLBuQx41vDABUPD/mSNsGBpBthHW1Blh/eR3lxw54VerxRVjdxE2
-XnTiJAsfQXitt4HntEBmgPBLkaBtqG49U9mLzirhC0Vlh6GWru4+iNUSH3gXrizF
-c0TY3PSv2MyuTOEMvlWkmfdulsDIRYe/3FFX/55zN2oYnMP5Inr0sFK9/CEw+MX/
-Hod9raJaNfUiqLQKdjjmdrCYrxvsigpDdNKFNDeEB+H2I7Ip3qa2t0xXfpYGy6kW
-JSk6Ay1VfaaMpPeegcmVtnzBSs6UZgzKiOvSCfVbGViC3yf9Z5V4twIG1adhve86
-/LJhzQ==
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            e9:d0:a7:5f:79:25:f4:3c
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
-        Validity
-            Not Before: Oct 24 18:18:15 2011 GMT
-            Not After : Jul 20 18:18:15 2014 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
-                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
-                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
-                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
-                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
-                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
-                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
-                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
-                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
-                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
-                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
-                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
-                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
-                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
-                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
-                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
-                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
-                    36:79
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-            X509v3 Authority Key Identifier: 
-                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
-                serial:E9:D0:A7:5F:79:25:F4:3C
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
-        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
-        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
-        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
-        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
-        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
-        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
-        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
-        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
-        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
-        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
-        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
-        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
-        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
-        5a:1f:7f:ca
------BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
-A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
-dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
-MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
-8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
-EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
-dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
-mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
-CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
-P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
-dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
-BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
-9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
-PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
-Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
-G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
-ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
-rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
------END CERTIFICATE-----

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/FreeRTOSConfig.h

@@ -1,75 +1,70 @@
 /*
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details. You should have received a copy of the GNU General Public License
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be
-    viewed here: http://www.freertos.org/a00114.html and also obtained by
-    writing to Real Time Engineers Ltd., contact details for whom are available
-    on the FreeRTOS WEB site.
-
-    1 tab == 4 spaces!
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
 
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new
-    fully thread aware and reentrant UDP/IP stack.
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 
-    Integrity Systems, who sell the code with commercial support, 
-    indemnification and middleware, under the OpenRTOS brand.
-    
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 
-    engineered and independently SIL3 certified version for use in safety and 
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
     mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
 */
 
 #ifndef FREERTOS_CONFIG_H
@@ -91,7 +86,7 @@
  *----------------------------------------------------------*/
 
 #define configUSE_PREEMPTION			1
-#define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 7 )
+#define configMAX_PRIORITIES			( 7 )
 #define configTICK_RATE_HZ				( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 60 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the Win32 thread. */
 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 32U * 1024U ) )

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/config_fat_sl.h

@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded
  *
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of
@@ -38,7 +38,7 @@
 #define _CONFIG_FAT_SL_H
 
 #include "../version/ver_fat_sl.h"
-#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2
+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2
  #error Incompatible FAT_SL version number!
 #endif
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/config_fat_sl_test.h

@@ -0,0 +1,62 @@
+/*
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded
+ *
+ * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers
+ * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of
+ * the FreeRTOS kernel.  FreeRTOS+FAT SL is licensed separately from FreeRTOS,
+ * and uses a different license to FreeRTOS.  FreeRTOS+FAT SL uses a dual
+ * license model, information on which is provided below:
+ *
+ * - Open source licensing -
+ * FreeRTOS+FAT SL is a free download and may be used, modified and distributed
+ * without charge provided the user adheres to version two of the GNU General
+ * Public license (GPL) and does not remove the copyright notice or this text.
+ * The GPL V2 text is available on the gnu.org web site, and on the following
+ * URL: http://www.FreeRTOS.org/gpl-2.0.txt
+ *
+ * - Commercial licensing -
+ * Businesses and individuals who wish to incorporate FreeRTOS+FAT SL into
+ * proprietary software for redistribution in any form must first obtain a
+ * commercial license - and in-so-doing support the maintenance, support and
+ * further development of the FreeRTOS+FAT SL product.  Commercial licenses can
+ * be obtained from http://shop.freertos.org and do not require any source files
+ * to be changed.
+ *
+ * FreeRTOS+FAT SL is distributed in the hope that it will be useful.  You
+ * cannot use FreeRTOS+FAT SL unless you agree that you use the software 'as
+ * is'.  FreeRTOS+FAT SL is provided WITHOUT ANY WARRANTY; without even the
+ * implied warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Real Time Engineers Ltd. and HCC Embedded disclaims all
+ * conditions and terms, be they implied, expressed, or statutory.
+ *
+ * http://www.FreeRTOS.org
+ * http://www.FreeRTOS.org/FreeRTOS-Plus
+ *
+ */
+
+#ifndef _CONFIG_FAT_SL_TEST_H
+#define _CONFIG_FAT_SL_TEST_H
+
+#include "../version/ver_fat_sl.h"
+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2
+ #error Incompatible FAT_SL version number!
+#endif
+
+
+/*
+** Maximum size for seek test.
+** Options: 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
+*/
+#define F_MAX_SEEK_TEST 16384
+
+
+/*
+** Defines media type for testing.
+** Options: F_FAT12_MEDIA, F_FAT16_MEDIA, F_FAT32_MEDIA
+*/
+#define F_FAT_TYPE      F_FAT16_MEDIA
+
+
+#endif /* ifndef _CONFIG_STHIN_TEST_H */
+
+

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/config_mdriver_ram.h

@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded
  *
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/File-Releated-CLI-commands.c

@@ -1,75 +1,70 @@
 /*
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details. You should have received a copy of the GNU General Public License
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be
-    viewed here: http://www.freertos.org/a00114.html and also obtained by
-    writing to Real Time Engineers Ltd., contact details for whom are available
-    on the FreeRTOS WEB site.
-
-    1 tab == 4 spaces!
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
 
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new
-    fully thread aware and reentrant UDP/IP stack.
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems, who sell the code with commercial support,
-    indemnification and middleware, under the OpenRTOS brand.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
     mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
 */
 
 /* FreeRTOS includes. */
@@ -103,53 +98,53 @@
 /*
  * Print out information on a single file.
  */
-static void prvCreateFileInfoString( int8_t *pcBuffer, F_FIND *pxFindStruct );
+static void prvCreateFileInfoString( char *pcBuffer, F_FIND *pxFindStruct );
 
 /*
  * Copies an existing file into a newly created file.
  */
-static portBASE_TYPE prvPerformCopy( int8_t *pcSourceFile,
+static BaseType_t prvPerformCopy( const char *pcSourceFile,
 							int32_t lSourceFileLength,
-							int8_t *pcDestinationFile,
-							int8_t *pxWriteBuffer,
+							const char *pcDestinationFile,
+							char *pxWriteBuffer,
 							size_t xWriteBufferLen );
 
 /*
  * Implements the DIR command.
  */
-static portBASE_TYPE prvDIRCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvDIRCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the CD command.
  */
-static portBASE_TYPE prvCDCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvCDCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the DEL command.
  */
-static portBASE_TYPE prvDELCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvDELCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the TYPE command.
  */
-static portBASE_TYPE prvTYPECommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvTYPECommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the COPY command.
  */
-static portBASE_TYPE prvCOPYCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvCOPYCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the TEST command.
  */
-static portBASE_TYPE prvTESTFSCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvTESTFSCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /* Structure that defines the DIR command line command, which lists all the
 files in the current directory. */
 static const CLI_Command_Definition_t xDIR =
 {
-	( const int8_t * const ) "dir", /* The command string to type. */
-	( const int8_t * const ) "\r\ndir:\r\n Lists the files in the current directory\r\n",
+	"dir", /* The command string to type. */
+	"\r\ndir:\r\n Lists the files in the current directory\r\n",
 	prvDIRCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -158,8 +153,8 @@ static const CLI_Command_Definition_t xDIR =
 working directory. */
 static const CLI_Command_Definition_t xCD =
 {
-	( const int8_t * const ) "cd", /* The command string to type. */
-	( const int8_t * const ) "\r\ncd <dir name>:\r\n Changes the working directory\r\n",
+	"cd", /* The command string to type. */
+	"\r\ncd <dir name>:\r\n Changes the working directory\r\n",
 	prvCDCommand, /* The function to run. */
 	1 /* One parameter is expected. */
 };
@@ -168,8 +163,8 @@ static const CLI_Command_Definition_t xCD =
 contents of a file to the console. */
 static const CLI_Command_Definition_t xTYPE =
 {
-	( const int8_t * const ) "type", /* The command string to type. */
-	( const int8_t * const ) "\r\ntype <filename>:\r\n Prints file contents to the terminal\r\n",
+	"type", /* The command string to type. */
+	"\r\ntype <filename>:\r\n Prints file contents to the terminal\r\n",
 	prvTYPECommand, /* The function to run. */
 	1 /* One parameter is expected. */
 };
@@ -177,8 +172,8 @@ static const CLI_Command_Definition_t xTYPE =
 /* Structure that defines the DEL command line command, which deletes a file. */
 static const CLI_Command_Definition_t xDEL =
 {
-	( const int8_t * const ) "del", /* The command string to type. */
-	( const int8_t * const ) "\r\ndel <filename>:\r\n deletes a file or directory\r\n",
+	"del", /* The command string to type. */
+	"\r\ndel <filename>:\r\n deletes a file or directory\r\n",
 	prvDELCommand, /* The function to run. */
 	1 /* One parameter is expected. */
 };
@@ -186,8 +181,8 @@ static const CLI_Command_Definition_t xDEL =
 /* Structure that defines the COPY command line command, which deletes a file. */
 static const CLI_Command_Definition_t xCOPY =
 {
-	( const int8_t * const ) "copy", /* The command string to type. */
-	( const int8_t * const ) "\r\ncopy <source file> <dest file>:\r\n Copies <source file> to <dest file>\r\n",
+	"copy", /* The command string to type. */
+	"\r\ncopy <source file> <dest file>:\r\n Copies <source file> to <dest file>\r\n",
 	prvCOPYCommand, /* The function to run. */
 	2 /* Two parameters are expected. */
 };
@@ -196,8 +191,8 @@ static const CLI_Command_Definition_t xCOPY =
 file system driver tests. */
 static const CLI_Command_Definition_t xTEST_FS =
 {
-	( const int8_t * const ) "test-fs", /* The command string to type. */
-	( const int8_t * const ) "\r\ntest-fs:\r\n Executes file system tests.  ALL FILES WILL BE DELETED!!!\r\n",
+	"test-fs", /* The command string to type. */
+	"\r\ntest-fs:\r\n Executes file system tests.  ALL FILES WILL BE DELETED!!!\r\n",
 	prvTESTFSCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -216,10 +211,10 @@ void vRegisterFileSystemCLICommands( void )
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvTYPECommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvTYPECommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength, xReturn = pdTRUE;
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn = pdTRUE;
 static F_FILE *pxFile = NULL;
 int iChar;
 size_t xByte;
@@ -242,18 +237,18 @@ size_t xColumns = 50U;
 	if( pxFile == NULL )
 	{
 		/* The file has not been opened yet.  Find the file name. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										1,						/* Return the first parameter. */
-										&xParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							1,						/* Return the first parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* Attempt to open the requested file. */
-		pxFile = f_open( ( const char * ) pcParameter, "r" );
+		pxFile = f_open( pcParameter, "r" );
 	}
 
 	if( pxFile != NULL )
@@ -272,7 +267,7 @@ size_t xColumns = 50U;
 			}
 			else
 			{
-				pcWriteBuffer[ xByte ] = ( int8_t ) iChar;
+				pcWriteBuffer[ xByte ] = ( char ) iChar;
 			}
 		}
 	}
@@ -284,55 +279,55 @@ size_t xColumns = 50U;
 		xReturn = pdFALSE;
 	}
 
-	strcat( ( char * ) pcWriteBuffer, cliNEW_LINE );
+	strcat( pcWriteBuffer, cliNEW_LINE );
 
 	return xReturn;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvCDCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvCDCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength;
+const char *pcParameter;
+BaseType_t xParameterStringLength;
 unsigned char ucReturned;
 size_t xStringLength;
 
 	/* Obtain the parameter string. */
-	pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-								(
-									pcCommandString,		/* The command string itself. */
-									1,						/* Return the first parameter. */
-									&xParameterStringLength	/* Store the parameter string length. */
-								);
+	pcParameter = FreeRTOS_CLIGetParameter
+					(
+						pcCommandString,		/* The command string itself. */
+						1,						/* Return the first parameter. */
+						&xParameterStringLength	/* Store the parameter string length. */
+					);
 
 	/* Sanity check something was returned. */
 	configASSERT( pcParameter );
 
 	/* Attempt to move to the requested directory. */
-	ucReturned = f_chdir( ( char * ) pcParameter );
+	ucReturned = f_chdir( pcParameter );
 
 	if( ucReturned == F_NO_ERROR )
 	{
-		sprintf( ( char * ) pcWriteBuffer, "In: " );
-		xStringLength = strlen( ( const char * ) pcWriteBuffer );
-		f_getcwd( ( char * ) &( pcWriteBuffer[ xStringLength ] ), ( unsigned char ) ( xWriteBufferLen - xStringLength ) );
+		sprintf( pcWriteBuffer, "In: " );
+		xStringLength = strlen( pcWriteBuffer );
+		f_getcwd( &( pcWriteBuffer[ xStringLength ] ), ( unsigned char ) ( xWriteBufferLen - xStringLength ) );
 	}
 	else
 	{
-		sprintf( ( char * ) pcWriteBuffer, "Error" );
+		sprintf( pcWriteBuffer, "Error" );
 	}
 
-	strcat( ( char * ) pcWriteBuffer, cliNEW_LINE );
+	strcat( pcWriteBuffer, cliNEW_LINE );
 
 	return pdFALSE;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvDIRCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvDIRCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
 static F_FIND *pxFindStruct = NULL;
 unsigned char ucReturned;
-portBASE_TYPE xReturn = pdFALSE;
+BaseType_t xReturn = pdFALSE;
 
 	/* This assumes pcWriteBuffer is long enough. */
 	( void ) pcCommandString;
@@ -358,12 +353,12 @@ portBASE_TYPE xReturn = pdFALSE;
 			}
 			else
 			{
-				snprintf( ( char * ) pcWriteBuffer, xWriteBufferLen, "Error: f_findfirst() failed." );
+				snprintf( pcWriteBuffer, xWriteBufferLen, "Error: f_findfirst() failed." );
 			}
 		}
 		else
 		{
-			snprintf( ( char * ) pcWriteBuffer, xWriteBufferLen, "Failed to allocate RAM (using heap_4.c will prevent fragmentation)." );
+			snprintf( pcWriteBuffer, xWriteBufferLen, "Failed to allocate RAM (using heap_4.c will prevent fragmentation)." );
 		}
 	}
 	else
@@ -388,53 +383,53 @@ portBASE_TYPE xReturn = pdFALSE;
 		}
 	}
 
-	strcat( ( char * ) pcWriteBuffer, cliNEW_LINE );
+	strcat( pcWriteBuffer, cliNEW_LINE );
 
 	return xReturn;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvDELCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvDELCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength;
+const char *pcParameter;
+BaseType_t xParameterStringLength;
 unsigned char ucReturned;
 
 	/* This function assumes xWriteBufferLen is large enough! */
 	( void ) xWriteBufferLen;
 
 	/* Obtain the parameter string. */
-	pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-								(
-									pcCommandString,		/* The command string itself. */
-									1,						/* Return the first parameter. */
-									&xParameterStringLength	/* Store the parameter string length. */
-								);
+	pcParameter = FreeRTOS_CLIGetParameter
+					(
+						pcCommandString,		/* The command string itself. */
+						1,						/* Return the first parameter. */
+						&xParameterStringLength	/* Store the parameter string length. */
+					);
 
 	/* Sanity check something was returned. */
 	configASSERT( pcParameter );
 
 	/* Attempt to delete the file. */
-	ucReturned = f_delete( ( const char * ) pcParameter );
+	ucReturned = f_delete( pcParameter );
 
 	if( ucReturned == F_NO_ERROR )
 	{
-		sprintf( ( char * ) pcWriteBuffer, "%s was deleted", pcParameter );
+		sprintf( pcWriteBuffer, "%s was deleted", pcParameter );
 	}
 	else
 	{
-		sprintf( ( char * ) pcWriteBuffer, "Error" );
+		sprintf( pcWriteBuffer, "Error" );
 	}
 
-	strcat( ( char * ) pcWriteBuffer, cliNEW_LINE );
+	strcat( pcWriteBuffer, cliNEW_LINE );
 
 	return pdFALSE;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvTESTFSCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvTESTFSCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-unsigned portBASE_TYPE uxOriginalPriority;
+UBaseType_t uxOriginalPriority;
 
 	/* Avoid compiler warnings. */
 	( void ) xWriteBufferLen;
@@ -453,31 +448,32 @@ unsigned portBASE_TYPE uxOriginalPriority;
 	/* Reset back to the original priority. */
 	vTaskPrioritySet( NULL, uxOriginalPriority );
 
-	sprintf( ( char * ) pcWriteBuffer, "%s", "Test results were sent to Windows console" );
+	sprintf( pcWriteBuffer, "%s", "Test results were sent to Windows console" );
 
 	return pdFALSE;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvCOPYCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvCOPYCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcSourceFile, *pcDestinationFile;
-portBASE_TYPE xParameterStringLength;
+char *pcSourceFile;
+const char *pcDestinationFile;
+BaseType_t xParameterStringLength;
 long lSourceLength, lDestinationLength = 0;
 
 	/* Obtain the name of the destination file. */
-	pcDestinationFile = ( int8_t * ) FreeRTOS_CLIGetParameter
-								(
-									pcCommandString,		/* The command string itself. */
-									2,						/* Return the second parameter. */
-									&xParameterStringLength	/* Store the parameter string length. */
-								);
+	pcDestinationFile = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							2,						/* Return the second parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 	/* Sanity check something was returned. */
 	configASSERT( pcDestinationFile );
 
 	/* Obtain the name of the source file. */
-	pcSourceFile = ( int8_t * ) FreeRTOS_CLIGetParameter
+	pcSourceFile = ( char * ) FreeRTOS_CLIGetParameter
 								(
 									pcCommandString,		/* The command string itself. */
 									1,						/* Return the first parameter. */
@@ -491,20 +487,20 @@ long lSourceLength, lDestinationLength = 0;
 	pcSourceFile[ xParameterStringLength ] = 0x00;
 
 	/* See if the source file exists, obtain its length if it does. */
-	lSourceLength = f_filelength( ( const char * ) pcSourceFile );
+	lSourceLength = f_filelength( pcSourceFile );
 
 	if( lSourceLength == 0 )
 	{
-		sprintf( ( char * ) pcWriteBuffer, "Source file does not exist" );
+		sprintf( pcWriteBuffer, "Source file does not exist" );
 	}
 	else
 	{
 		/* See if the destination file exists. */
-		lDestinationLength = f_filelength( ( const char * ) pcDestinationFile );
+		lDestinationLength = f_filelength( pcDestinationFile );
 
 		if( lDestinationLength != 0 )
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Error: Destination file already exists" );
+			sprintf( pcWriteBuffer, "Error: Destination file already exists" );
 		}
 	}
 
@@ -514,29 +510,29 @@ long lSourceLength, lDestinationLength = 0;
 	{
 		if( prvPerformCopy( pcSourceFile, lSourceLength, pcDestinationFile, pcWriteBuffer, xWriteBufferLen ) == pdPASS )
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Copy made" );
+			sprintf( pcWriteBuffer, "Copy made" );
 		}
 		else
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Error during copy" );
+			sprintf( pcWriteBuffer, "Error during copy" );
 		}
 	}
 
-	strcat( ( char * ) pcWriteBuffer, cliNEW_LINE );
+	strcat( pcWriteBuffer, cliNEW_LINE );
 
 	return pdFALSE;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvPerformCopy( int8_t *pcSourceFile,
-							int32_t lSourceFileLength,
-							int8_t *pcDestinationFile,
-							int8_t *pxWriteBuffer,
-							size_t xWriteBufferLen )
+static BaseType_t prvPerformCopy( const char *pcSourceFile,
+									int32_t lSourceFileLength,
+									const char *pcDestinationFile,
+									char *pxWriteBuffer,
+									size_t xWriteBufferLen )
 {
 int32_t lBytesRead = 0, lBytesToRead, lBytesRemaining;
 F_FILE *pxFile;
-portBASE_TYPE xReturn = pdPASS;
+BaseType_t xReturn = pdPASS;
 
 	/* NOTE:  Error handling has been omitted for clarity. */
 
@@ -559,7 +555,7 @@ portBASE_TYPE xReturn = pdPASS;
 		/* Open the source file, seek past the data that has already been
 		read from the file, read the next block of data, then close the
 		file again so the destination file can be opened. */
-		pxFile = f_open( ( const char * ) pcSourceFile, "r" );
+		pxFile = f_open( pcSourceFile, "r" );
 		if( pxFile != NULL )
 		{
 			f_seek( pxFile, lBytesRead, F_SEEK_SET );
@@ -574,7 +570,7 @@ portBASE_TYPE xReturn = pdPASS;
 
 		/* Open the destination file and write the block of data to the end of
 		the file. */
-		pxFile = f_open( ( const char * ) pcDestinationFile, "a" );
+		pxFile = f_open( pcDestinationFile, "a" );
 		if( pxFile != NULL )
 		{
 			f_write( pxWriteBuffer, lBytesToRead, 1, pxFile );
@@ -593,7 +589,7 @@ portBASE_TYPE xReturn = pdPASS;
 }
 /*-----------------------------------------------------------*/
 
-static void prvCreateFileInfoString( int8_t *pcBuffer, F_FIND *pxFindStruct )
+static void prvCreateFileInfoString( char *pcBuffer, F_FIND *pxFindStruct )
 {
 const char *pcWritableFile = "writable file", *pcReadOnlyFile = "read only file", *pcDirectory = "directory";
 const char * pcAttrib;
@@ -614,5 +610,5 @@ const char * pcAttrib;
 
 	/* Create a string that includes the file name, the file size and the
 	attributes string. */
-	sprintf( ( char * ) pcBuffer, "%s [%s] [size=%d]", pxFindStruct->filename, pcAttrib, pxFindStruct->filesize );
+	sprintf( pcBuffer, "%s [%s] [size=%d]", pxFindStruct->filename, pcAttrib, pxFindStruct->filesize );
 }

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/File-system-demo.c

@@ -1,75 +1,70 @@
 /*
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details. You should have received a copy of the GNU General Public License
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be
-    viewed here: http://www.freertos.org/a00114.html and also obtained by
-    writing to Real Time Engineers Ltd., contact details for whom are available
-    on the FreeRTOS WEB site.
-
-    1 tab == 4 spaces!
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
 
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new
-    fully thread aware and reentrant UDP/IP stack.
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems, who sell the code with commercial support,
-    indemnification and middleware, under the OpenRTOS brand.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
     mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
 */
 
 /*******************************************************************************
@@ -172,9 +167,9 @@ unsigned char ucStatus;
 
 static void prvCreateDemoFilesUsing_f_write( void )
 {
-portBASE_TYPE xFileNumber, xWriteNumber;
+BaseType_t xFileNumber, xWriteNumber;
 char cFileName[ fsMAX_FILE_NAME_LEN ];
-const portBASE_TYPE xMaxFiles = 5;
+const BaseType_t xMaxFiles = 5;
 long lItemsWritten;
 F_FILE *pxFile;
 
@@ -216,9 +211,9 @@ F_FILE *pxFile;
 
 static void prvVerifyDemoFileUsing_f_read( void )
 {
-portBASE_TYPE xFileNumber, xReadNumber;
+BaseType_t xFileNumber, xReadNumber;
 char cFileName[ fsMAX_FILE_NAME_LEN ];
-const portBASE_TYPE xMaxFiles = 5;
+const BaseType_t xMaxFiles = 5;
 long lItemsRead, lChar;
 F_FILE *pxFile;
 
@@ -298,7 +293,7 @@ char cFileName[ fsMAX_FILE_NAME_LEN ];
 	/* Obtain and print out the working directory. */
 	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
 	printf( "In directory %s\r\n", cRAMBuffer );
-	configASSERT( strcmp( ( const char * ) cRAMBuffer, pcFullPath ) == 0 );
+	configASSERT( strcmp( cRAMBuffer, pcFullPath ) == 0 );
 
 	/* Generate the file name. */
 	sprintf( cFileName, "%s.txt", pcDirectory2 );
@@ -327,7 +322,7 @@ char cFileName[ fsMAX_FILE_NAME_LEN ];
 	/* Obtain and print out the working directory. */
 	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
 	printf( "Back in root directory %s\r\n", cRAMBuffer );
-	configASSERT( strcmp( ( const char * ) cRAMBuffer, pcRoot ) == 0 );
+	configASSERT( strcmp( cRAMBuffer, pcRoot ) == 0 );
 }
 /*-----------------------------------------------------------*/
 
@@ -345,7 +340,7 @@ char cFileName[ fsMAX_FILE_NAME_LEN ];
 	/* Obtain and print out the working directory. */
 	f_getcwd( cRAMBuffer, fsRAM_BUFFER_SIZE );
 	printf( "Back in directory %s\r\n", cRAMBuffer );
-	configASSERT( strcmp( ( const char * ) cRAMBuffer, pcFullPath ) == 0 );
+	configASSERT( strcmp( cRAMBuffer, pcFullPath ) == 0 );
 
 	/* Generate the file name. */
 	sprintf( cFileName, "%s.txt", pcDirectory2 );

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/Run-time-stats-utils.c

@@ -1,75 +1,70 @@
 /*
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details. You should have received a copy of the GNU General Public License
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be
-    viewed here: http://www.freertos.org/a00114.html and also obtained by
-    writing to Real Time Engineers Ltd., contact details for whom are available
-    on the FreeRTOS WEB site.
-
-    1 tab == 4 spaces!
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
 
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new
-    fully thread aware and reentrant UDP/IP stack.
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 
-    Integrity Systems, who sell the code with commercial support, 
-    indemnification and middleware, under the OpenRTOS brand.
-    
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 
-    engineered and independently SIL3 certified version for use in safety and 
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
     mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
 */
 
 /*

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/Sample-CLI-commands.c

@@ -1,75 +1,70 @@
 /*
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details. You should have received a copy of the GNU General Public License
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be
-    viewed here: http://www.freertos.org/a00114.html and also obtained by
-    writing to Real Time Engineers Ltd., contact details for whom are available
-    on the FreeRTOS WEB site.
-
-    1 tab == 4 spaces!
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
 
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, 
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new
-    fully thread aware and reentrant UDP/IP stack.
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High 
-    Integrity Systems, who sell the code with commercial support, 
-    indemnification and middleware, under the OpenRTOS brand.
-    
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety 
-    engineered and independently SIL3 certified version for use in safety and 
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
     mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
 */
 
  /******************************************************************************
@@ -100,36 +95,36 @@
 /*
  * Implements the run-time-stats command.
  */
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the task-stats command.
  */
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the echo-three-parameters command.
  */
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the echo-parameters command.
  */
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the "trace start" and "trace stop" commands;
  */
 #if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
-	static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 #endif
 
 /* Structure that defines the "run-time-stats" command line command.   This
 generates a table that shows how much run time each task has */
 static const CLI_Command_Definition_t xRunTimeStats =
 {
-	( const int8_t * const ) "run-time-stats", /* The command string to type. */
-	( const int8_t * const ) "\r\nrun-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n",
+	"run-time-stats", /* The command string to type. */
+	"\r\nrun-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n",
 	prvRunTimeStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -138,8 +133,8 @@ static const CLI_Command_Definition_t xRunTimeStats =
 a table that gives information on each task in the system. */
 static const CLI_Command_Definition_t xTaskStats =
 {
-	( const int8_t * const ) "task-stats", /* The command string to type. */
-	( const int8_t * const ) "\r\ntask-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n",
+	"task-stats", /* The command string to type. */
+	"\r\ntask-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n",
 	prvTaskStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -149,8 +144,8 @@ takes exactly three parameters that the command simply echos back one at a
 time. */
 static const CLI_Command_Definition_t xThreeParameterEcho =
 {
-	( const int8_t * const ) "echo-3-parameters",
-	( const int8_t * const ) "\r\necho-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n",
+	"echo-3-parameters",
+	"\r\necho-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n",
 	prvThreeParameterEchoCommand, /* The function to run. */
 	3 /* Three parameters are expected, which can take any value. */
 };
@@ -160,8 +155,8 @@ takes a variable number of parameters that the command simply echos back one at
 a time. */
 static const CLI_Command_Definition_t xParameterEcho =
 {
-	( const int8_t * const ) "echo-parameters",
-	( const int8_t * const ) "\r\necho-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n",
+	"echo-parameters",
+	"\r\necho-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n",
 	prvParameterEchoCommand, /* The function to run. */
 	-1 /* The user can enter any number of commands. */
 };
@@ -171,8 +166,8 @@ static const CLI_Command_Definition_t xParameterEcho =
 	parameter, which can be either "start" or "stop". */
 	static const CLI_Command_Definition_t xStartStopTrace =
 	{
-		( const int8_t * const ) "trace",
-		( const int8_t * const ) "\r\ntrace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n",
+		"trace",
+		"\r\ntrace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n",
 		prvStartStopTraceCommand, /* The function to run. */
 		1 /* One parameter is expected.  Valid values are "start" and "stop". */
 	};
@@ -196,9 +191,9 @@ void vRegisterSampleCLICommands( void )
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stack	#\r\n************************************************\r\n";
+const char *const pcHeader = "Task          State  Priority  Stack	#\r\n************************************************\r\n";
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -208,8 +203,8 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskList( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -217,9 +212,9 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Time\r\n****************************************\r\n";
+const char * const pcHeader = "Task            Abs Time      % Time\r\n****************************************\r\n";
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -229,8 +224,8 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskGetRunTimeStats( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -238,11 +233,11 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -255,7 +250,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The three parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The three parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -268,21 +263,21 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&xParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* Return the parameter string. */
 		memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-		sprintf( ( char * ) pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
-		strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, xParameterStringLength );
-		strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+		sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+		strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+		strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 		/* If this is the last of the three parameters then there are no more
 		strings to return after this one. */
@@ -305,11 +300,11 @@ static portBASE_TYPE lParameterNumber = 0;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -322,7 +317,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -335,20 +330,20 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&xParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 		if( pcParameter != NULL )
 		{
 			/* Return the parameter string. */
 			memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-			sprintf( ( char * ) pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
-			strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, xParameterStringLength );
-			strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+			sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+			strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+			strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 			/* There might be more parameters to return after this one. */
 			xReturn = pdTRUE;
@@ -374,10 +369,10 @@ static portBASE_TYPE lParameterNumber = 0;
 
 #if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
 
-	static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 	{
-	int8_t *pcParameter;
-	portBASE_TYPE lParameterStringLength;
+	const char *pcParameter;
+	BaseType_t lParameterStringLength;
 
 		/* Remove compile time warnings about unused parameters, and check the
 		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -387,35 +382,35 @@ static portBASE_TYPE lParameterNumber = 0;
 		configASSERT( pcWriteBuffer );
 
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										1,						/* Return the first parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							1,						/* Return the first parameter. */
+							&lParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* There are only two valid parameter values. */
-		if( strncmp( ( const char * ) pcParameter, "start", strlen( "start" ) ) == 0 )
+		if( strncmp( pcParameter, "start", strlen( "start" ) ) == 0 )
 		{
 			/* Start or restart the trace. */
 			vTraceStop();
 			vTraceClear();
 			vTraceStart();
 
-			sprintf( ( char * ) pcWriteBuffer, "Trace recording (re)started.\r\n" );
+			sprintf( pcWriteBuffer, "Trace recording (re)started.\r\n" );
 		}
-		else if( strncmp( ( const char * ) pcParameter, "stop", strlen( "stop" ) ) == 0 )
+		else if( strncmp( pcParameter, "stop", strlen( "stop" ) ) == 0 )
 		{
 			/* End the trace, if one is running. */
 			vTraceStop();
-			sprintf( ( char * ) pcWriteBuffer, "Stopping trace recording.\r\n" );
+			sprintf( pcWriteBuffer, "Stopping trace recording.\r\n" );
 		}
 		else
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
+			sprintf( pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
 		}
 
 		/* There is no more data to return after this single string, so return

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/UDPCommandServer.c

@@ -1,75 +1,70 @@
 /*
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details. You should have received a copy of the GNU General Public License
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be
-    viewed here: http://www.freertos.org/a00114.html and also obtained by
-    writing to Real Time Engineers Ltd., contact details for whom are available
-    on the FreeRTOS WEB site.
-
-    1 tab == 4 spaces!
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
 
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new
-    fully thread aware and reentrant UDP/IP stack.
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems, who sell the code with commercial support,
-    indemnification and middleware, under the OpenRTOS brand.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
     mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
 */
 
 
@@ -119,7 +114,7 @@ void vUDPCommandInterpreterTask( void *pvParameters )
 long lBytes, lByte;
 signed char cInChar, cInputIndex = 0;
 static signed char cInputString[ cmdMAX_INPUT_SIZE ], cOutputString[ cmdMAX_OUTPUT_SIZE ], cLocalBuffer[ cmdSOCKET_INPUT_BUFFER_SIZE ];
-portBASE_TYPE xMoreDataToFollow;
+BaseType_t xMoreDataToFollow;
 volatile int iErrorCode = 0;
 struct sockaddr_in xClient;
 int xClientAddressLength = sizeof( struct sockaddr_in );

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/WIN32.vcxproj

@@ -168,7 +168,7 @@
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\api\fat_sl.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\f_lock.h" />
     <ClInclude Include="ConfigurationFiles\config_fat_sl.h" />
-    <ClInclude Include="FreeRTOSConfig.h" />
+    <ClInclude Include="ConfigurationFiles\config_fat_sl_test.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\dir.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\drv.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\fat.h" />
@@ -176,6 +176,7 @@
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\util.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\util_sfn.h" />
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\volume.h" />
+    <ClInclude Include="ConfigurationFiles\FreeRTOSConfig.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/WIN32.vcxproj.filters

@@ -119,9 +119,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="FreeRTOSConfig.h">
-      <Filter>Configuration Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-CLI\FreeRTOS_CLI.h">
       <Filter>FreeRTOS+\FreeRTOS+CLI\include</Filter>
     </ClInclude>
@@ -173,5 +170,11 @@
     <ClInclude Include="..\..\Source\FreeRTOS-Plus-FAT-SL\fat_sl\common\f_lock.h">
       <Filter>FreeRTOS+\FreeRTOS+FAT SL</Filter>
     </ClInclude>
+    <ClInclude Include="ConfigurationFiles\config_fat_sl_test.h">
+      <Filter>Configuration Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ConfigurationFiles\FreeRTOSConfig.h">
+      <Filter>Configuration Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/main.c

@@ -1,75 +1,70 @@
 /*
-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.
-
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details. You should have received a copy of the GNU General Public License
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be
-    viewed here: http://www.freertos.org/a00114.html and also obtained by
-    writing to Real Time Engineers Ltd., contact details for whom are available
-    on the FreeRTOS WEB site.
-
-    1 tab == 4 spaces!
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
 
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, and our new
-    fully thread aware and reentrant UDP/IP stack.
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems, who sell the code with commercial support,
-    indemnification and middleware, under the OpenRTOS brand.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
     mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
 */
 
 /******************************************************************************
@@ -157,7 +152,7 @@ const uint32_t ulLongTime_ms = 250UL;
 	/* Create the task that handles the CLI on a UDP port.  The port number
 	is set using the configUDP_CLI_PORT_NUMBER setting in FreeRTOSConfig.h. */
 	xTaskCreate( vUDPCommandInterpreterTask, 	/* The function that implements the command interpreter IO handling. */
-				( signed char * ) "CLI", 		/* The name of the task - just to assist debugging. */
+				"CLI", 							/* The name of the task - just to assist debugging. */
 				configMINIMAL_STACK_SIZE, NULL, /* The size of the stack allocated to the task. */
 				mainUDP_CLI_TASK_PRIORITY, 		/* The priority at which the task will run. */
 				NULL );							/* A handle to the task is not required, so NULL is passed. */
@@ -189,7 +184,7 @@ const unsigned long ulMSToSleep = 5;
 	the	set of sample files are created from the idle task hook function. */
 	#if F_FS_THREAD_AWARE == 1
 	{
-		static portBASE_TYPE xCreatedSampleFiles = pdFALSE;
+		static BaseType_t xCreatedSampleFiles = pdFALSE;
 
 		/* Initialise the drive and file system, then create a few example
 		files.  The output from this function just goes to the stdout window,

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/ConfigurationFiles/FreeRTOSConfig.h

@@ -0,0 +1,173 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+
+/*-----------------------------------------------------------
+ * Application specific definitions.
+ *
+ * These definitions should be adjusted for your particular hardware and
+ * application requirements.
+ *
+ * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
+ * http://www.freertos.org/a00110.html
+ *
+ * The bottom of this file contains some constants specific to running the UDP
+ * stack in this demo.  Constants specific to FreeRTOS+UDP itself (rather than
+ * the demo) are contained in FreeRTOSIPConfig.h.
+ *----------------------------------------------------------*/
+
+#define configUSE_PREEMPTION			1
+#define configMAX_PRIORITIES			( 7 )
+#define configTICK_RATE_HZ				( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
+#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 60 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the Win32 thread. */
+#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 32U * 1024U ) )
+#define configMAX_TASK_NAME_LEN			( 7 )
+#define configUSE_TRACE_FACILITY		1
+#define configUSE_16_BIT_TICKS			0
+#define configIDLE_SHOULD_YIELD			1
+#define configUSE_CO_ROUTINES 			0
+#define configUSE_MUTEXES				1
+#define configUSE_RECURSIVE_MUTEXES		1
+#define configQUEUE_REGISTRY_SIZE		0
+#define configUSE_APPLICATION_TASK_TAG	0
+#define configUSE_COUNTING_SEMAPHORES	1
+#define configUSE_ALTERNATIVE_API		0
+
+/* Hook function related definitions. */
+#define configUSE_TICK_HOOK				0
+#define configUSE_IDLE_HOOK				1
+#define configUSE_MALLOC_FAILED_HOOK	1
+#define configCHECK_FOR_STACK_OVERFLOW	0 /* Not applicable to the Win32 port. */
+
+/* Software timer related definitions. */
+#define configUSE_TIMERS				1
+#define configTIMER_TASK_PRIORITY		( configMAX_PRIORITIES - 1 )
+#define configTIMER_QUEUE_LENGTH		5
+#define configTIMER_TASK_STACK_DEPTH	( configMINIMAL_STACK_SIZE * 2 )
+
+/* Run time stats gathering definitions. */
+unsigned long ulGetRunTimeCounterValue( void );
+void vConfigureTimerForRunTimeStats( void );
+#define configGENERATE_RUN_TIME_STATS	1
+#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats()
+#define portGET_RUN_TIME_COUNTER_VALUE() ulGetRunTimeCounterValue()
+
+/* Co-routine definitions. */
+#define configUSE_CO_ROUTINES 			0
+#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
+
+/* Set the following definitions to 1 to include the API function, or zero
+to exclude the API function. */
+#define INCLUDE_vTaskPrioritySet			1
+#define INCLUDE_uxTaskPriorityGet			1
+#define INCLUDE_vTaskDelete					1
+#define INCLUDE_vTaskCleanUpResources		0
+#define INCLUDE_vTaskSuspend				1
+#define INCLUDE_vTaskDelayUntil				1
+#define INCLUDE_vTaskDelay					1
+#define INCLUDE_uxTaskGetStackHighWaterMark	1
+#define INCLUDE_xTaskGetSchedulerState		1
+#define INCLUDE_xTimerGetTimerTaskHandle	0
+#define INCLUDE_xTaskGetIdleTaskHandle		0
+#define INCLUDE_xQueueGetMutexHolder		1
+#define INCLUDE_xTaskGetCurrentTaskHandle	1
+
+/* 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 
+FreeRTOS/Source/tasks.c for limitations. */
+#define configUSE_STATS_FORMATTING_FUNCTIONS	1
+
+/* Assert call defined for debug builds. */
+#ifdef _DEBUG
+	extern void vAssertCalled( const char *pcFile, unsigned long ulLine );
+	#define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled( __FILE__, __LINE__ )
+#endif /* _DEBUG */
+
+
+
+/* Application specific definitions follow. **********************************/
+
+/* The UDP port to use for incoming command inputs.  The outgoing port is
+set to ( configUDP_CLI_PORT_NUMBER + 1 ). */
+#define configUDP_CLI_PORT_NUMBER	5001
+
+/* The size of the global output buffer that is available for use when there
+are multiple command interpreters running at once (for example, one on a UART
+and one on TCP/IP).  This is done to prevent an output buffer being defined by
+each implementation - which would waste RAM.  In this case, there is only one
+command interpreter running, and it has its own local output buffer, so the
+global buffer is just set to be one byte long as it is not used and should not
+take up unnecessary RAM. */
+#define configCOMMAND_INT_MAX_OUTPUT_SIZE 1
+
+#endif /* FREERTOS_CONFIG_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/ConfigurationFiles/redconf.c

@@ -0,0 +1,15 @@
+/*  THIS FILE WAS GENERATED BY THE DATALIGHT RELIANCE EDGE CONFIGURATION
+    UTILITY.  DO NOT MODIFY.
+*/
+/** @file
+*/
+#include <redconf.h>
+#include <redtypes.h>
+#include <redmacs.h>
+#include <redvolume.h>
+
+
+const VOLCONF gaRedVolConf[REDCONF_VOLUME_COUNT] =
+{
+    { 512U, 65536U, false, 256U, "" }
+};

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/ConfigurationFiles/redconf.h

@@ -0,0 +1,104 @@
+/*  THIS FILE WAS GENERATED BY THE DATALIGHT RELIANCE EDGE CONFIGURATION
+    UTILITY.  DO NOT MODIFY.
+*/
+/** @file
+*/
+#ifndef REDCONF_H
+#define REDCONF_H
+
+
+#include <string.h>
+
+#define REDCONF_READ_ONLY 0
+
+#define REDCONF_API_POSIX 1
+
+#define REDCONF_API_FSE 0
+
+#define REDCONF_API_POSIX_FORMAT 1
+
+#define REDCONF_API_POSIX_LINK 1
+
+#define REDCONF_API_POSIX_UNLINK 1
+
+#define REDCONF_API_POSIX_MKDIR 1
+
+#define REDCONF_API_POSIX_RMDIR 1
+
+#define REDCONF_API_POSIX_RENAME 1
+
+#define REDCONF_RENAME_ATOMIC 1
+
+#define REDCONF_API_POSIX_FTRUNCATE 1
+
+#define REDCONF_API_POSIX_READDIR 1
+
+#define REDCONF_NAME_MAX 28U
+
+#define REDCONF_PATH_SEPARATOR '/'
+
+#define REDCONF_TASK_COUNT 10U
+
+#define REDCONF_HANDLE_COUNT 10U
+
+#define REDCONF_API_FSE_FORMAT 0
+
+#define REDCONF_API_FSE_TRUNCATE 0
+
+#define REDCONF_API_FSE_TRANSMASKGET 0
+
+#define REDCONF_API_FSE_TRANSMASKSET 0
+
+#define REDCONF_OUTPUT 1
+
+#define REDCONF_ASSERTS 1
+
+#define REDCONF_BLOCK_SIZE 512U
+
+#define REDCONF_VOLUME_COUNT 1U
+
+#define REDCONF_ENDIAN_BIG 0
+
+#define REDCONF_ALIGNMENT_SIZE 4U
+
+#define REDCONF_CRC_ALGORITHM CRC_SLICEBY8
+
+#define REDCONF_INODE_BLOCKS 1
+
+#define REDCONF_INODE_TIMESTAMPS 1
+
+#define REDCONF_ATIME 0
+
+#define REDCONF_DIRECT_POINTERS 4U
+
+#define REDCONF_INDIRECT_POINTERS 32U
+
+#define REDCONF_BUFFER_COUNT 12U
+
+#define RedMemCpyUnchecked memcpy
+
+#define RedMemMoveUnchecked memmove
+
+#define RedMemSetUnchecked memset
+
+#define RedMemCmpUnchecked memcmp
+
+#define RedStrLenUnchecked strlen
+
+#define RedStrCmpUnchecked strcmp
+
+#define RedStrNCmpUnchecked strncmp
+
+#define RedStrNCpyUnchecked strncpy
+
+#define REDCONF_TRANSACT_DEFAULT (( RED_TRANSACT_CREAT | RED_TRANSACT_MKDIR | RED_TRANSACT_RENAME | RED_TRANSACT_LINK | RED_TRANSACT_UNLINK | RED_TRANSACT_FSYNC | RED_TRANSACT_CLOSE | RED_TRANSACT_VOLFULL | RED_TRANSACT_UMOUNT ) & RED_TRANSACT_MASK)
+
+#define REDCONF_IMAP_INLINE 0
+
+#define REDCONF_IMAP_EXTERNAL 1
+
+#define REDCONF_IMAGE_BUILDER 0
+
+#define REDCONF_CHECKER 0
+
+#endif

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/ConfigurationFiles/redtypes.h

@@ -0,0 +1,110 @@
+/*             ----> DO NOT REMOVE THE FOLLOWING NOTICE <----
+
+                   Copyright (c) 2014-2015 Datalight, Inc.
+                       All Rights Reserved Worldwide.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; use version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but "AS-IS," WITHOUT ANY WARRANTY; without even the implied warranty
+    of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+/*  Businesses and individuals that for commercial or other reasons cannot
+    comply with the terms of the GPLv2 license may obtain a commercial license
+    before incorporating Reliance Edge into proprietary software for
+    distribution in any form.  Visit http://www.datalight.com/reliance-edge for
+    more information.
+*/
+/** @file
+    @brief Defines basic types used by Reliance Edge.
+
+    The following types *must* be defined by this header, either directly (using
+    typedef) or indirectly (by including other headers, such as the C99 headers
+    stdint.h and stdbool.h):
+
+    - bool: Boolean type, capable of storing true (1) or false (0)
+    - uint8_t: Unsigned 8-bit integer
+    - int8_t: Signed 8-bit integer
+    - uint16_t: Unsigned 16-bit integer
+    - int16_t: Signed 16-bit integer
+    - uint32_t: Unsigned 32-bit integer
+    - int32_t: Signed 32-bit integer
+    - uint64_t: Unsigned 64-bit integer
+    - int64_t: Signed 64-bit integer
+    - uintptr_t: Unsigned integer capable of storing a pointer, preferably the
+      same size as pointers themselves.
+
+    These types deliberately use the same names as the standard C99 types, so
+    that if the C99 headers stdint.h and stdbool.h are available, they may be
+    included here.
+
+    If the user application defines similar types, those may be reused.  For
+    example, suppose there is an application header apptypes.h which defines
+    types with a similar purpose but different names.  That header could be
+    reused to define the types Reliance Edge needs:
+
+    ~~~{.c}
+    #include <apptypes.h>
+
+    typedef BOOL bool;
+    typedef BYTE uint8_t;
+    typedef INT8 int8_t;
+    // And so on...
+    ~~~
+
+    If there are neither C99 headers nor suitable types in application headers,
+    this header should be populated with typedefs that define the required types
+    in terms of the standard C types.  This requires knowledge of the size of
+    the C types on the target hardware (e.g., how big is an "int" or a pointer).
+    Below is an example which assumes the target has 8-bit chars, 16-bit shorts,
+    32-bit ints, 32-bit pointers, and 64-bit long longs:
+
+    ~~~{.c}
+    typedef int bool;
+    typedef unsigned char uint8_t;
+    typedef signed char int8_t;
+    typedef unsigned short uint16_t;
+    typedef short int16_t;
+    typedef unsigned int uint32_t;
+    typedef int int32_t;
+    typedef unsigned long long uint64_t;
+    typedef long long int64_t;
+    typedef uint32_t uintptr_t;
+    ~~~
+*/
+#ifndef REDTYPES_H
+#define REDTYPES_H
+
+
+typedef int bool;                   /**< @brief Boolean type; either true or false. */
+
+typedef unsigned __int8 uint8_t;    /**< @brief Unsigned 8-bit integer. */
+typedef          __int8 int8_t;     /**< @brief Signed 8-bit integer. */
+
+typedef unsigned __int16 uint16_t;  /**< @brief Unsigned 16-bit integer. */
+typedef          __int16 int16_t;   /**< @brief Signed 16-bit integer. */
+
+typedef unsigned __int32 uint32_t;  /**< @brief Unsigned 32-bit integer. */
+typedef          __int32 int32_t;   /**< @brief Signed 32-bit integer. */
+
+typedef unsigned __int64 uint64_t;  /**< @brief Unsigned 64-bit integer. */
+typedef          __int64 int64_t;   /**< @brief Signed 64-bit integer. */
+
+/** @brief Unsigned integer capable of storing a pointer.
+*/
+#ifdef _WIN64
+typedef uint64_t uintptr_t;
+#else
+typedef uint32_t uintptr_t;
+#endif
+
+
+#endif
+

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/File-system-demo.c

@@ -0,0 +1,331 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/*******************************************************************************
+ * See the URL in the comments within main.c for the location of the online
+ * documentation.
+ ******************************************************************************/
+
+/* Standard includes. */
+#include <stdio.h>
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+
+/* File system includes. */
+#include <redposix.h>
+
+/* The number of bytes read/written to the example files at a time. */
+#define fsRAM_BUFFER_SIZE	200
+
+/* The volume prefix is an empty string, for convenience since there is only one
+volume in this demo.
+*/
+#define fsVOLUME_NAME		""
+
+/*-----------------------------------------------------------*/
+
+/*
+ * Creates and verifies different files on the volume, demonstrating the use of
+ * various different API functions.
+ */
+void vCreateAndVerifySampleFiles( void );
+
+/*
+ * Create a set of example files in the root directory of the volume using
+ * f_write().
+ */
+static void prvCreateDemoFiles( void );
+
+/*
+ * Use f_read() to read back and verify the files that were created by
+ * prvCreateDemoFiles().
+ */
+static void prvVerifyDemoFiles( void );
+
+/*-----------------------------------------------------------*/
+
+/* A buffer used to both create content to write to disk, and read content back
+from a disk.  Note there is no mutual exclusion on this buffer. */
+static char cRAMBuffer[ fsRAM_BUFFER_SIZE ];
+
+/* Names of directories that are created. */
+static const char *pcDirectory1 = "/SUB1", *pcDirectory2 = "/SUB1/SUB2";
+
+/*-----------------------------------------------------------*/
+
+void vCreateAndVerifySampleFiles( void )
+{
+int32_t lStatus;
+
+	/* First initialize the Reliance Edge driver. */
+	lStatus = red_init();
+
+	/* Format the volume. */
+	if( lStatus == 0 )
+	{
+		lStatus = red_format( fsVOLUME_NAME );
+	}
+
+	/* Mount the volume. */
+	if( lStatus == 0 )
+	{
+		lStatus = red_mount( fsVOLUME_NAME );
+	}
+
+	if( lStatus == 0 )
+	{
+		/* Create a set of files using red_write(). */
+		prvCreateDemoFiles();
+
+		/* Read back and verify the files that were created using red_write(). */
+		prvVerifyDemoFiles();
+	}
+}
+/*-----------------------------------------------------------*/
+
+static void prvCreateDemoFiles( void )
+{
+BaseType_t xFileNumber, xWriteNumber;
+char cFilePath[ 64 ];
+const BaseType_t xMaxFiles = 5;
+uint32_t ulEventMask;
+int32_t lBytesWritten, lFildes, lStatus;
+int iByte;
+
+	/* Save the current transaction point settings. */
+	lStatus = red_gettransmask( fsVOLUME_NAME, &ulEventMask );
+	configASSERT( lStatus == 0 );
+
+	/* Disable automatic transaction points so that all of the files can be
+	created in one atomic operation. */
+	lStatus = red_settransmask( fsVOLUME_NAME, RED_TRANSACT_MANUAL );
+	configASSERT( lStatus == 0 );
+
+	/* Create xMaxFiles files.  Each created file will be
+	( xFileNumber * fsRAM_BUFFER_SIZE ) bytes in length, and filled
+	with a different repeating character. */
+	for( xFileNumber = 1; xFileNumber <= xMaxFiles; xFileNumber++ )
+	{
+		/* Generate a file name. */
+		sprintf( cFilePath, "/root%03d.txt", xFileNumber );
+
+		/* Print out the file name and the directory into which the file is
+		being written. */
+		printf( "Creating file %s\r\n", cFilePath );
+
+		/* Open the file, creating the file if it does not already exist. */
+		lFildes = red_open( cFilePath, RED_O_CREAT|RED_O_TRUNC|RED_O_WRONLY );
+		configASSERT( lFildes != -1 );
+
+		/* Fill the RAM buffer with data that will be written to the file.  This
+		is just a repeating ascii character that indicates the file number. */
+		memset( cRAMBuffer, ( int ) ( '0' + xFileNumber ), fsRAM_BUFFER_SIZE );
+
+		/* Write the RAM buffer to the opened file a number of times.  The
+		number of times the RAM buffer is written to the file depends on the
+		file number, so the length of each created file will be different. */
+		for( xWriteNumber = 0; xWriteNumber < xFileNumber; xWriteNumber++ )
+		{
+			lBytesWritten = red_write( lFildes, cRAMBuffer, fsRAM_BUFFER_SIZE );
+			configASSERT( lBytesWritten == fsRAM_BUFFER_SIZE );
+		}
+
+		/* Close the file so another file can be created. */
+		lStatus = red_close( lFildes );
+		configASSERT( lStatus == 0 );
+	}
+
+	/* Commit a transaction point, atomically adding the set of files to the
+	transacted state. */
+	lStatus = red_transact( fsVOLUME_NAME );
+	configASSERT( lStatus == 0 );
+
+	/* Create a sub directory. */
+	printf( "Creating directory %s\r\n", pcDirectory1 );
+
+	lStatus = red_mkdir( pcDirectory1 );
+	configASSERT( lStatus == 0 );
+
+	/* Create a subdirectory in the new directory. */
+	printf( "Creating directory %s\r\n", pcDirectory2 );
+
+	lStatus = red_mkdir( pcDirectory2 );
+	configASSERT( lStatus == 0 );
+
+	/* Generate the file name. */
+	sprintf( cFilePath, "%s/file.txt", pcDirectory2 );
+
+	/* Print out the file name and the directory into which the file is being
+	written. */
+	printf( "Writing file %s\r\n", cFilePath );
+
+	lFildes = red_open( cFilePath, RED_O_CREAT|RED_O_TRUNC|RED_O_WRONLY );
+
+	/* Write the file.  It is filled with incrementing ascii characters starting
+	from '0'. */
+	for( iByte = 0; iByte < fsRAM_BUFFER_SIZE; iByte++ )
+	{
+		cRAMBuffer[ iByte ] = ( char ) ( ( int ) '0' + iByte );
+	}
+
+	lBytesWritten = red_write( lFildes, cRAMBuffer, fsRAM_BUFFER_SIZE );
+	configASSERT( lBytesWritten == fsRAM_BUFFER_SIZE );
+
+	/* Finished so close the file. */
+	lStatus = red_close( lFildes );
+	configASSERT( lStatus == 0 );
+
+	/* Commit a transaction point, atomically adding the set of files and
+	directories to the transacted state. */
+	lStatus = red_transact( fsVOLUME_NAME );
+	configASSERT( lStatus == 0 );
+
+	/* Restore previous transaction point settings. */
+	lStatus = red_settransmask( fsVOLUME_NAME, ulEventMask );
+	configASSERT( lStatus == 0 );
+}
+/*-----------------------------------------------------------*/
+
+static void prvVerifyDemoFiles( void )
+{
+BaseType_t xFileNumber, xReadNumber;
+char cFilePath[ 64 ];
+const BaseType_t xMaxFiles = 5;
+long lChar;
+int32_t lBytesRead, lFildes, lStatus;
+int iByte;
+
+	/* Read back the files that were created by prvCreateDemoFiles(). */
+	for( xFileNumber = 1; xFileNumber <= xMaxFiles; xFileNumber++ )
+	{
+		/* Generate the file name. */
+		sprintf( cFilePath, "/root%03d.txt", xFileNumber );
+
+		/* Print out the file name and the directory from which the file is
+		being read. */
+		printf( "Reading file %s\r\n", cFilePath );
+
+		/* Open the file for reading. */
+		lFildes = red_open( cFilePath, RED_O_RDONLY );
+		configASSERT( lFildes != -1 );
+
+		/* Read the file into the RAM buffer, checking the file contents are as
+		expected.  The size of the file depends on the file number. */
+		for( xReadNumber = 0; xReadNumber < xFileNumber; xReadNumber++ )
+		{
+			/* Start with the RAM buffer clear. */
+			memset( cRAMBuffer, 0x00, fsRAM_BUFFER_SIZE );
+
+			lBytesRead = red_read( lFildes, cRAMBuffer, fsRAM_BUFFER_SIZE );
+			configASSERT( lBytesRead == fsRAM_BUFFER_SIZE );
+
+			/* Check the RAM buffer is filled with the expected data.  Each
+			file contains a different repeating ascii character that indicates
+			the number of the file. */
+			for( lChar = 0; lChar < fsRAM_BUFFER_SIZE; lChar++ )
+			{
+				configASSERT( cRAMBuffer[ lChar ] == ( '0' + ( char ) xFileNumber ) );
+			}
+		}
+
+		/* Close the file. */
+		lStatus = red_close( lFildes );
+		configASSERT( lStatus == 0 );
+	}
+
+	/* Generate the file name. */
+	sprintf( cFilePath, "%s/file.txt", pcDirectory2 );
+
+	/* Print out the file name and the directory from which the file is being
+	read. */
+	printf( "Reading file %s\r\n", cFilePath );
+
+	/* This time the file is opened for reading. */
+	lFildes = red_open( cFilePath, RED_O_RDONLY );
+	configASSERT( lFildes != -1 );
+
+	/* Read the file. */
+	lBytesRead = red_read( lFildes, cRAMBuffer, fsRAM_BUFFER_SIZE );
+	configASSERT( lBytesRead == fsRAM_BUFFER_SIZE );
+
+	/* Verify the file 1 byte at a time. */
+	for( iByte = 0; iByte < fsRAM_BUFFER_SIZE; iByte++ )
+	{
+		configASSERT( cRAMBuffer[ iByte ] == ( char ) ( ( int ) '0' + iByte ) );
+	}
+
+	/* Finished so close the file. */
+	lStatus = red_close( lFildes );
+	configASSERT( lStatus == 0 );
+}
+
+
+
+

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Instructions_ReadMe.url

@@ -0,0 +1,6 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+URL=http://www.freertos.org/FreeRTOS-Plus/Fail_Safe_File_System/Fail_Safe_Embedded_File_System_demo.shtml
+IDList=
+HotKey=0

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Run-time-stats-utils.c

@@ -0,0 +1,132 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/*
+ * Utility functions required to gather run time statistics.  See:
+ * http://www.freertos.org/rtos-run-time-stats.html
+ *
+ * Note that this is a simulated port, where simulated time is a lot slower than
+ * real time, therefore the run time counter values have no real meaningful
+ * units.
+ *
+ * Also note that it is assumed this demo is going to be used for short periods
+ * of time only, and therefore timer overflows are not handled.
+*/
+
+/* FreeRTOS includes. */
+#include <FreeRTOS.h>
+
+/* Variables used in the creation of the run time stats time base.  Run time 
+stats record how much time each task spends in the Running state. */
+static long long llInitialRunTimeCounterValue = 0LL, llTicksPerHundedthMillisecond = 0LL;
+
+/*-----------------------------------------------------------*/
+
+void vConfigureTimerForRunTimeStats( void )
+{
+LARGE_INTEGER liPerformanceCounterFrequency, liInitialRunTimeValue;
+
+	/* Initialise the variables used to create the run time stats time base.
+	Run time stats record how much time each task spends in the Running 
+	state. */
+
+	if( QueryPerformanceFrequency( &liPerformanceCounterFrequency ) == 0 )
+	{
+		llTicksPerHundedthMillisecond = 1;
+	}
+	else
+	{
+		/* How many times does the performance counter increment in 1/100th
+		millisecond. */
+		llTicksPerHundedthMillisecond = liPerformanceCounterFrequency.QuadPart / 100000LL;
+
+		/* What is the performance counter value now, this will be subtracted
+		from readings taken at run time. */
+		QueryPerformanceCounter( &liInitialRunTimeValue );
+		llInitialRunTimeCounterValue = liInitialRunTimeValue.QuadPart;
+	}
+}
+/*-----------------------------------------------------------*/
+
+unsigned long ulGetRunTimeCounterValue( void )
+{
+LARGE_INTEGER liCurrentCount;
+unsigned long ulReturn;
+
+	/* What is the performance counter value now? */
+	QueryPerformanceCounter( &liCurrentCount );
+
+	/* Subtract the performance counter value reading taken when the 
+	application started to get a count from that reference point, then
+	scale to (simulated) 1/100ths of a millisecond. */
+	ulReturn = ( unsigned long ) ( ( liCurrentCount.QuadPart - llInitialRunTimeCounterValue ) / llTicksPerHundedthMillisecond );
+
+	return ulReturn;
+}
+/*-----------------------------------------------------------*/

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Sample-CLI-commands.c

@@ -0,0 +1,421 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+ /******************************************************************************
+ *
+ * See the following URL for information on the commands defined in this file:
+ * http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/Ethernet_Related_CLI_Commands.shtml
+ *
+ ******************************************************************************/
+
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+/* FreeRTOS+CLI includes. */
+#include "FreeRTOS_CLI.h"
+
+#ifndef  configINCLUDE_TRACE_RELATED_CLI_COMMANDS
+	#define configINCLUDE_TRACE_RELATED_CLI_COMMANDS 0
+#endif
+
+
+/*
+ * Implements the run-time-stats command.
+ */
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the task-stats command.
+ */
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the echo-three-parameters command.
+ */
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the echo-parameters command.
+ */
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+
+/*
+ * Implements the "trace start" and "trace stop" commands;
+ */
+#if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
+#endif
+
+/* Structure that defines the "run-time-stats" command line command.   This
+generates a table that shows how much run time each task has */
+static const CLI_Command_Definition_t xRunTimeStats =
+{
+	"run-time-stats", /* The command string to type. */
+	"\r\nrun-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n",
+	prvRunTimeStatsCommand, /* The function to run. */
+	0 /* No parameters are expected. */
+};
+
+/* Structure that defines the "task-stats" command line command.  This generates
+a table that gives information on each task in the system. */
+static const CLI_Command_Definition_t xTaskStats =
+{
+	"task-stats", /* The command string to type. */
+	"\r\ntask-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n",
+	prvTaskStatsCommand, /* The function to run. */
+	0 /* No parameters are expected. */
+};
+
+/* Structure that defines the "echo_3_parameters" command line command.  This
+takes exactly three parameters that the command simply echos back one at a
+time. */
+static const CLI_Command_Definition_t xThreeParameterEcho =
+{
+	"echo-3-parameters",
+	"\r\necho-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n",
+	prvThreeParameterEchoCommand, /* The function to run. */
+	3 /* Three parameters are expected, which can take any value. */
+};
+
+/* Structure that defines the "echo_parameters" command line command.  This
+takes a variable number of parameters that the command simply echos back one at
+a time. */
+static const CLI_Command_Definition_t xParameterEcho =
+{
+	"echo-parameters",
+	"\r\necho-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n",
+	prvParameterEchoCommand, /* The function to run. */
+	-1 /* The user can enter any number of commands. */
+};
+
+#if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
+	/* Structure that defines the "trace" command line command.  This takes a single
+	parameter, which can be either "start" or "stop". */
+	static const CLI_Command_Definition_t xStartStopTrace =
+	{
+		"trace",
+		"\r\ntrace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n",
+		prvStartStopTraceCommand, /* The function to run. */
+		1 /* One parameter is expected.  Valid values are "start" and "stop". */
+	};
+#endif /* configINCLUDE_TRACE_RELATED_CLI_COMMANDS */
+
+/*-----------------------------------------------------------*/
+
+void vRegisterSampleCLICommands( void )
+{
+	/* Register all the command line commands defined immediately above. */
+	FreeRTOS_CLIRegisterCommand( &xTaskStats );
+	FreeRTOS_CLIRegisterCommand( &xRunTimeStats );
+	FreeRTOS_CLIRegisterCommand( &xThreeParameterEcho );
+	FreeRTOS_CLIRegisterCommand( &xParameterEcho );
+
+	#if( configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1 )
+	{
+		FreeRTOS_CLIRegisterCommand( & xStartStopTrace );
+	}
+	#endif
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *const pcHeader = "Task          State  Priority  Stack	#\r\n************************************************\r\n";
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	/* Generate a table of task stats. */
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskList( pcWriteBuffer + strlen( pcHeader ) );
+
+	/* There is no more data to return after this single string, so return
+	pdFALSE. */
+	return pdFALSE;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char * const pcHeader = "Task            Abs Time      % Time\r\n****************************************\r\n";
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	/* Generate a table of task stats. */
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskGetRunTimeStats( pcWriteBuffer + strlen( pcHeader ) );
+
+	/* There is no more data to return after this single string, so return
+	pdFALSE. */
+	return pdFALSE;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	if( lParameterNumber == 0 )
+	{
+		/* The first time the function is called after the command has been
+		entered just a header string is returned. */
+		sprintf( pcWriteBuffer, "The three parameters were:\r\n" );
+
+		/* Next time the function is called the first parameter will be echoed
+		back. */
+		lParameterNumber = 1L;
+
+		/* There is more data to be returned as no parameters have been echoed
+		back yet. */
+		xReturn = pdPASS;
+	}
+	else
+	{
+		/* Obtain the parameter string. */
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
+
+		/* Sanity check something was returned. */
+		configASSERT( pcParameter );
+
+		/* Return the parameter string. */
+		memset( pcWriteBuffer, 0x00, xWriteBufferLen );
+		sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+		strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+		strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+
+		/* If this is the last of the three parameters then there are no more
+		strings to return after this one. */
+		if( lParameterNumber == 3L )
+		{
+			/* If this is the last of the three parameters then there are no more
+			strings to return after this one. */
+			xReturn = pdFALSE;
+			lParameterNumber = 0L;
+		}
+		else
+		{
+			/* There are more parameters to return after this one. */
+			xReturn = pdTRUE;
+			lParameterNumber++;
+		}
+	}
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+{
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
+
+	/* Remove compile time warnings about unused parameters, and check the
+	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+	write buffer length is adequate, so does not check for buffer overflows. */
+	( void ) pcCommandString;
+	( void ) xWriteBufferLen;
+	configASSERT( pcWriteBuffer );
+
+	if( lParameterNumber == 0 )
+	{
+		/* The first time the function is called after the command has been
+		entered just a header string is returned. */
+		sprintf( pcWriteBuffer, "The parameters were:\r\n" );
+
+		/* Next time the function is called the first parameter will be echoed
+		back. */
+		lParameterNumber = 1L;
+
+		/* There is more data to be returned as no parameters have been echoed
+		back yet. */
+		xReturn = pdPASS;
+	}
+	else
+	{
+		/* Obtain the parameter string. */
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
+
+		if( pcParameter != NULL )
+		{
+			/* Return the parameter string. */
+			memset( pcWriteBuffer, 0x00, xWriteBufferLen );
+			sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+			strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+			strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+
+			/* There might be more parameters to return after this one. */
+			xReturn = pdTRUE;
+			lParameterNumber++;
+		}
+		else
+		{
+			/* No more parameters were found.  Make sure the write buffer does
+			not contain a valid string. */
+			pcWriteBuffer[ 0 ] = 0x00;
+
+			/* No more data to return. */
+			xReturn = pdFALSE;
+
+			/* Start over the next time this command is executed. */
+			lParameterNumber = 0;
+		}
+	}
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+#if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
+
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
+	{
+	const char *pcParameter;
+	BaseType_t lParameterStringLength;
+
+		/* Remove compile time warnings about unused parameters, and check the
+		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
+		write buffer length is adequate, so does not check for buffer overflows. */
+		( void ) pcCommandString;
+		( void ) xWriteBufferLen;
+		configASSERT( pcWriteBuffer );
+
+		/* Obtain the parameter string. */
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							1,						/* Return the first parameter. */
+							&lParameterStringLength	/* Store the parameter string length. */
+						);
+
+		/* Sanity check something was returned. */
+		configASSERT( pcParameter );
+
+		/* There are only two valid parameter values. */
+		if( strncmp( pcParameter, "start", strlen( "start" ) ) == 0 )
+		{
+			/* Start or restart the trace. */
+			vTraceStop();
+			vTraceClear();
+			vTraceStart();
+
+			sprintf( pcWriteBuffer, "Trace recording (re)started.\r\n" );
+		}
+		else if( strncmp( pcParameter, "stop", strlen( "stop" ) ) == 0 )
+		{
+			/* End the trace, if one is running. */
+			vTraceStop();
+			sprintf( pcWriteBuffer, "Stopping trace recording.\r\n" );
+		}
+		else
+		{
+			sprintf( pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
+		}
+
+		/* There is no more data to return after this single string, so return
+		pdFALSE. */
+		return pdFALSE;
+	}
+
+#endif /* configINCLUDE_TRACE_RELATED_CLI_COMMANDS */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/UDPCommandServer.c

@@ -0,0 +1,271 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+
+#pragma comment( lib, "ws2_32.lib" )
+
+/* Win32 includes. */
+#include <WinSock2.h>
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+
+/* FreeRTOS+CLI includes. */
+#include "FreeRTOS_CLI.h"
+
+/* Dimensions the buffer into which input characters are placed. */
+#define cmdMAX_INPUT_SIZE	60
+
+/* Dimensions the buffer into which string outputs can be placed. */
+#define cmdMAX_OUTPUT_SIZE	1024
+
+/* Dimensions the buffer passed to the recvfrom() call. */
+#define cmdSOCKET_INPUT_BUFFER_SIZE 60
+
+/* DEL acts as a backspace. */
+#define cmdASCII_DEL		( 0x7F )
+
+/*
+ * Open and configure the UDP socket.
+ */
+static SOCKET prvOpenUDPSocket( void );
+
+/*-----------------------------------------------------------*/
+
+/*
+ * Task that provides the input and output for the FreeRTOS+CLI command
+ * interpreter.  In this case a WinSock UDP port is used for convenience as this
+ * demo runs in a simulated environment on a Windows PC.  See the URL in the
+ * comments within main.c for the location of the online documentation.
+ */
+void vUDPCommandInterpreterTask( void *pvParameters )
+{
+long lBytes, lByte;
+signed char cInChar, cInputIndex = 0;
+static signed char cInputString[ cmdMAX_INPUT_SIZE ], cOutputString[ cmdMAX_OUTPUT_SIZE ], cLocalBuffer[ cmdSOCKET_INPUT_BUFFER_SIZE ];
+BaseType_t xMoreDataToFollow;
+volatile int iErrorCode = 0;
+struct sockaddr_in xClient;
+int xClientAddressLength = sizeof( struct sockaddr_in );
+SOCKET xSocket;
+
+	/* Just to prevent compiler warnings. */
+	( void ) pvParameters;
+
+	/* Attempt to open the socket. */
+	xSocket = prvOpenUDPSocket();
+
+	if( xSocket != INVALID_SOCKET )
+	{
+		for( ;; )
+		{
+			/* Wait for incoming data on the opened socket. */
+			lBytes = recvfrom( xSocket, cLocalBuffer, sizeof( cLocalBuffer ), 0, ( struct sockaddr * ) &xClient, &xClientAddressLength );
+
+			if( lBytes == SOCKET_ERROR )
+			{
+				/* Something went wrong, but it is not handled by this simple
+				example. */
+				iErrorCode = WSAGetLastError();
+			}
+			else
+			{
+				/* Process each received byte in turn. */
+				lByte = 0;
+				while( lByte < lBytes )
+				{
+					/* The next character in the input buffer. */
+					cInChar = cLocalBuffer[ lByte ];
+					lByte++;
+
+					/* Newline characters are taken as the end of the command
+					string. */
+					if( cInChar == '\n' )
+					{
+						/* Process the input string received prior to the
+						newline. */
+						do
+						{
+							/* Pass the string to FreeRTOS+CLI. */
+							xMoreDataToFollow = FreeRTOS_CLIProcessCommand( cInputString, cOutputString, cmdMAX_OUTPUT_SIZE );
+
+							/* Send the output generated by the command's
+							implementation. */
+							sendto( xSocket, cOutputString,  strlen( cOutputString ), 0, ( SOCKADDR * ) &xClient, xClientAddressLength );
+
+						} while( xMoreDataToFollow != pdFALSE ); /* Until the command does not generate any more output. */
+
+						/* All the strings generated by the command processing
+						have been sent.  Clear the input string ready to receive
+						the next command. */
+						cInputIndex = 0;
+						memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );
+
+						/* Transmit a spacer, just to make the command console
+						easier to read. */
+						sendto( xSocket, "\r\n",  strlen( "\r\n" ), 0, ( SOCKADDR * ) &xClient, xClientAddressLength );
+					}
+					else
+					{
+						if( cInChar == '\r' )
+						{
+							/* Ignore the character.  Newlines are used to
+							detect the end of the input string. */
+						}
+						else if( ( cInChar == '\b' ) || ( cInChar == cmdASCII_DEL ) )
+						{
+							/* Backspace was pressed.  Erase the last character
+							in the string - if any. */
+							if( cInputIndex > 0 )
+							{
+								cInputIndex--;
+								cInputString[ cInputIndex ] = '\0';
+							}
+						}
+						else
+						{
+							/* A character was entered.  Add it to the string
+							entered so far.  When a \n is entered the complete
+							string will be passed to the command interpreter. */
+							if( cInputIndex < cmdMAX_INPUT_SIZE )
+							{
+								cInputString[ cInputIndex ] = cInChar;
+								cInputIndex++;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		/* The socket could not be opened. */
+		vTaskDelete( NULL );
+	}
+}
+/*-----------------------------------------------------------*/
+
+static SOCKET prvOpenUDPSocket( void )
+{
+WSADATA xWSAData;
+WORD wVersionRequested;
+struct sockaddr_in xServer;
+SOCKET xSocket = INVALID_SOCKET;
+
+	wVersionRequested = MAKEWORD( 2, 2 );
+
+	/* Prepare to use WinSock. */
+	if( WSAStartup( wVersionRequested, &xWSAData ) != 0 )
+	{
+		fprintf( stderr, "Could not open Windows connection.\n" );
+	}
+	else
+	{
+		xSocket = socket( AF_INET, SOCK_DGRAM, 0 );
+		if( xSocket == INVALID_SOCKET)
+		{
+			fprintf( stderr, "Could not create socket.\n" );
+			WSACleanup();
+		}
+		else
+		{
+			/* Zero out the server structure. */
+			memset( ( void * ) &xServer, 0x00, sizeof( struct sockaddr_in ) );
+
+			/* Set family and port. */
+			xServer.sin_family = AF_INET;
+			xServer.sin_port = htons( configUDP_CLI_PORT_NUMBER );
+
+			/* Assign the loopback address */
+			xServer.sin_addr.S_un.S_un_b.s_b1 = 127;
+			xServer.sin_addr.S_un.S_un_b.s_b2 = 0;
+			xServer.sin_addr.S_un.S_un_b.s_b3 = 0;
+			xServer.sin_addr.S_un.S_un_b.s_b4 = 1;
+
+			/* Bind the address to the socket. */
+			if( bind( xSocket, ( struct sockaddr * ) &xServer, sizeof( struct sockaddr_in ) ) == -1 )
+			{
+				fprintf( stderr, "Could not socket to port %d.\n", configUDP_CLI_PORT_NUMBER );
+				closesocket( xSocket );
+				xSocket = INVALID_SOCKET;
+				WSACleanup();
+			}
+		}
+	}
+
+	return xSocket;
+}
+
+

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/WIN32.vcxproj

@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C686325E-3261-42F7-AEB1-DDE5280E1CEB}</ProjectGuid>
+    <ProjectName>RTOSDemo</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/WIN32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\Source\Reliance-Edge\os\freertos\include;..\..\Source\Reliance-Edge\projects\freertos\win32-demo;..\..\Source\Reliance-Edge\core\include;..\..\Source\Reliance-Edge\include;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\FreeRTOS-Plus-CLI;.;.\ConfigurationFiles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/WIN32.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>.\Debug/RTOSDemo.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/WIN32.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>.\WinPCap</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/WIN32.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/WIN32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>_WINSOCKAPI_;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/WIN32.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalIncludeDirectories>..\Common\Utils;..\Common\ethernet\lwip-1.4.0\ports\win32\WinPCap;..\Common\ethernet\lwip-1.4.0\src\include\ipv4;..\Common\ethernet\lwip-1.4.0\src\include;..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\ethernet\lwip-1.4.0\ports\win32\include;..\Common\Include;.\lwIP_Apps;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>.\Release/RTOSDemo.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/WIN32.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>..\Common\ethernet\lwip-1.4.0\ports\win32\WinPCap</AdditionalLibraryDirectories>
+      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/WIN32.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_4.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\list.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\queue.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\timers.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-CLI\FreeRTOS_CLI.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\blockio.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\buffer.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\core.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\dir.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\format.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\imap.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\imapextern.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\imapinline.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\inode.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\inodedata.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\volume.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\fse\fse.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osassert.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osbdev.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osclock.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osmutex.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osoutput.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\ostask.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\ostimestamp.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\posix\path.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\posix\posix.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\posix\fsstress.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\atoi.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\math.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\printf.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\rand.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\toolcmn\getopt.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\toolcmn\toolcmn.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\bitmap.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\crc.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\endian.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\memory.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\namelen.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\sign.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\string.c" />
+    <ClCompile Include="ConfigurationFiles\redconf.c" />
+    <ClCompile Include="File-Related-CLI-commands.c" />
+    <ClCompile Include="File-system-demo.c" />
+    <ClCompile Include="main.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="Run-time-stats-utils.c" />
+    <ClCompile Include="Sample-CLI-commands.c" />
+    <ClCompile Include="UDPCommandServer.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\FreeRTOS.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\projdefs.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\queue.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\semphr.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\task.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\timers.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-CLI\FreeRTOS_CLI.h" />
+    <ClInclude Include="..\..\Source\Reliance-Edge\os\freertos\include\ostypes.h" />
+    <ClInclude Include="ConfigurationFiles\FreeRTOSConfig.h" />
+    <ClInclude Include="ConfigurationFiles\redconf.h" />
+    <ClInclude Include="ConfigurationFiles\redtypes.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/WIN32.vcxproj.filters

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{38712199-cebf-4124-bf15-398f7c3419ea}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="FreeRTOS">
+      <UniqueIdentifier>{af3445a1-4908-4170-89ed-39345d90d30c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS\Source">
+      <UniqueIdentifier>{f32be356-4763-4cae-9020-974a2638cb08}</UniqueIdentifier>
+      <Extensions>*.c</Extensions>
+    </Filter>
+    <Filter Include="FreeRTOS\Source\Portable">
+      <UniqueIdentifier>{88f409e6-d396-4ac5-94bd-7a99c914be46}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+">
+      <UniqueIdentifier>{e5ad4ec7-23dc-4295-8add-2acaee488f5a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+\FreeRTOS+CLI">
+      <UniqueIdentifier>{fd43c0ed-fdbc-437f-a5a3-c50399690bd7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+\FreeRTOS+CLI\include">
+      <UniqueIdentifier>{c5889fe2-af0f-4cea-927f-6a6935ec5e14}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Configuration Files">
+      <UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="FreeRTOS\Source\include">
+      <UniqueIdentifier>{ab23827c-126c-4e5a-bc99-8efa44d8a8bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+\FreeRTOS+Reliance Edge">
+      <UniqueIdentifier>{9c9c3b2d-6958-407d-b742-23fbf73678ed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+\FreeRTOS+Reliance Edge\test">
+      <UniqueIdentifier>{e47b8f1d-1582-4e56-9c2f-ca2cdbea1b86}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+\FreeRTOS+Reliance Edge\port">
+      <UniqueIdentifier>{9ecfe142-5bd2-472b-9568-243fa6169874}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+\FreeRTOS+Reliance Edge\driver">
+      <UniqueIdentifier>{28ee3d7e-231b-4094-8a10-ad89fc82f705}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FreeRTOS+\FreeRTOS+Reliance Edge\util">
+      <UniqueIdentifier>{a955d01e-1f95-4c34-9558-14c52b75576f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c">
+      <Filter>FreeRTOS\Source\Portable</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\timers.c">
+      <Filter>FreeRTOS\Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\list.c">
+      <Filter>FreeRTOS\Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\queue.c">
+      <Filter>FreeRTOS\Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c">
+      <Filter>FreeRTOS\Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_4.c">
+      <Filter>FreeRTOS\Source\Portable</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-CLI\FreeRTOS_CLI.c">
+      <Filter>FreeRTOS+\FreeRTOS+CLI</Filter>
+    </ClCompile>
+    <ClCompile Include="UDPCommandServer.c" />
+    <ClCompile Include="File-system-demo.c" />
+    <ClCompile Include="main.c" />
+    <ClCompile Include="Run-time-stats-utils.c" />
+    <ClCompile Include="Sample-CLI-commands.c" />
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\printf.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\test</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\rand.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\test</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\posix\fsstress.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\test</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\ostimestamp.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osassert.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osbdev.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osclock.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osmutex.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\osoutput.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\os\freertos\services\ostask.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\volume.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\blockio.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\buffer.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\core.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\dir.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\format.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\fse\fse.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\imap.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\imapextern.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\imapinline.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\inode.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\core\driver\inodedata.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\posix\path.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\posix\posix.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\bitmap.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\string.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\crc.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\endian.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\memory.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\namelen.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\util\sign.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\util</Filter>
+    </ClCompile>
+    <ClCompile Include="File-Related-CLI-commands.c" />
+    <ClCompile Include="ConfigurationFiles\redconf.c">
+      <Filter>Configuration Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\atoi.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\test</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\tests\util\math.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\test</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\toolcmn\getopt.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\test</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Reliance-Edge\toolcmn\toolcmn.c">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\test</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-CLI\FreeRTOS_CLI.h">
+      <Filter>FreeRTOS+\FreeRTOS+CLI\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\timers.h">
+      <Filter>FreeRTOS\Source\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\FreeRTOS.h">
+      <Filter>FreeRTOS\Source\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\projdefs.h">
+      <Filter>FreeRTOS\Source\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\queue.h">
+      <Filter>FreeRTOS\Source\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\semphr.h">
+      <Filter>FreeRTOS\Source\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\task.h">
+      <Filter>FreeRTOS\Source\include</Filter>
+    </ClInclude>
+    <ClInclude Include="ConfigurationFiles\FreeRTOSConfig.h">
+      <Filter>Configuration Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Reliance-Edge\os\freertos\include\ostypes.h">
+      <Filter>FreeRTOS+\FreeRTOS+Reliance Edge\port</Filter>
+    </ClInclude>
+    <ClInclude Include="ConfigurationFiles\redconf.h">
+      <Filter>Configuration Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ConfigurationFiles\redtypes.h">
+      <Filter>Configuration Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/main.c

@@ -0,0 +1,207 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+/******************************************************************************
+ *
+ * This demo is described on the following web page:
+ * TODO: This link describes the FAT version of this demo.
+ * http://www.freertos.org/FreeRTOS-Plus/Fail_Safe_File_System/Fail_Safe_Embedded_File_System_demo.shtml
+ *
+ ******************************************************************************/
+
+/* Standard includes. */
+#include <stdio.h>
+#include <stdint.h>
+
+/* FreeRTOS includes. */
+#include <FreeRTOS.h>
+#include "task.h"
+#include "queue.h"
+#include "semphr.h"
+
+/* Priorities at which the tasks are created. */
+#define mainUDP_CLI_TASK_PRIORITY			( tskIDLE_PRIORITY )
+
+/*-----------------------------------------------------------*/
+
+/*
+ * Register the generic commands that can be used with FreeRTOS+CLI.
+ */
+extern void vRegisterSampleCLICommands( void );
+
+/*
+ * Register the file system commands that can be used with FreeRTOS+CLI.
+ */
+extern void vRegisterFileSystemCLICommands( void );
+
+/*
+ * The task that implements the UDP command interpreter using FreeRTOS+CLI.
+ */
+extern void vUDPCommandInterpreterTask( void *pvParameters );
+
+/*
+ * Creates and verifies different files on the volume, demonstrating the use of
+ * various different API functions.
+ */
+extern void vCreateAndVerifySampleFiles( void );
+
+/*-----------------------------------------------------------*/
+
+/* See http://www.freertos.org/FreeRTOS-Plus/Fail_Safe_File_System/Fail_Safe_Embedded_File_System_demo.shtml
+for instructions. */
+
+int main( void )
+{
+const uint32_t ulLongTime_ms = 250UL;
+
+	/* Initialise the drive and file system, then create a few example
+	files.  The output from this function just goes to the stdout window,
+	allowing the output to be viewed when the UDP command console is not
+	connected. */
+	vCreateAndVerifySampleFiles();
+
+	/* Register generic commands with the FreeRTOS+CLI command interpreter. */
+	vRegisterSampleCLICommands();
+
+	/* Register file system related commands with the FreeRTOS+CLI command
+	interpreter. */
+	vRegisterFileSystemCLICommands();
+
+	/* Create the task that handles the CLI on a UDP port.  The port number
+	is set using the configUDP_CLI_PORT_NUMBER setting in FreeRTOSConfig.h. */
+	xTaskCreate( vUDPCommandInterpreterTask, 	/* The function that implements the command interpreter IO handling. */
+				"CLI", 							/* The name of the task - just to assist debugging. */
+				configMINIMAL_STACK_SIZE, NULL, /* The size of the stack allocated to the task. */
+				mainUDP_CLI_TASK_PRIORITY, 		/* The priority at which the task will run. */
+				NULL );							/* A handle to the task is not required, so NULL is passed. */
+
+	/* Start the RTOS scheduler. */
+	vTaskStartScheduler();
+
+	/* If all is well, the scheduler will now be running, and the following
+	line will never be reached.  If the following line does execute, then
+	there was insufficient FreeRTOS heap memory available for the idle and/or
+	timer tasks	to be created.  See the memory management section on the
+	FreeRTOS web site for more details (this is standard text that is not not
+	really applicable to the Win32 simulator port). */
+	for( ;; )
+	{
+		Sleep( ulLongTime_ms );
+	}
+}
+/*-----------------------------------------------------------*/
+
+void vApplicationIdleHook( void )
+{
+const unsigned long ulMSToSleep = 5;
+
+	/* This function is called on each cycle of the idle task if
+	configUSE_IDLE_HOOK is set to 1 in FreeRTOSConfig.h.  Sleep to reduce CPU
+	load. */
+	Sleep( ulMSToSleep );
+}
+/*-----------------------------------------------------------*/
+
+void vAssertCalled( const char *pcFile, unsigned long ulLine )
+{
+volatile uint32_t ulSetToNonZeroToExitLoop = 0;
+
+	printf( "ASSERT FAILED: File %s, line %u\r\n", pcFile, ulLine );
+
+	taskENTER_CRITICAL();
+	{
+		while( ulSetToNonZeroToExitLoop == 0 )
+		{
+			/* Do not leave the assert function unless the debugger is used to
+			set ulSetToNonZeroToExitLoop to a non-zero value. */
+		}
+	}
+	taskEXIT_CRITICAL();
+}
+/*-----------------------------------------------------------*/
+
+void vApplicationMallocFailedHook( void )
+{
+	/* vApplicationMallocFailedHook() will only be called if
+	configUSE_MALLOC_FAILED_HOOK is set to 1 in FreeRTOSConfig.h.  It is a hook
+	function that will get called if a call to pvPortMalloc() fails.
+	pvPortMalloc() is called internally by the kernel whenever a task, queue,
+	timer or semaphore is created.  It is also called by various parts of the
+	demo application.  If heap_1.c, heap_2.c or heap_4.c are used, then the
+	size of the heap available to pvPortMalloc() is defined by
+	configTOTAL_HEAP_SIZE in FreeRTOSConfig.h, and the xPortGetFreeHeapSize()
+	API function can be used to query the size of free heap space that remains
+	(although it does not provide information on how the remaining heap might
+	be fragmented). */
+	taskDISABLE_INTERRUPTS();
+	for( ;; );
+}
+
+
+

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_CLI_FAT_SL_SAM4E_Atmel_Studio/Read_Me_Instructions.url

@@ -0,0 +1,5 @@
+[InternetShortcut]
+URL=http://www.freertos.org/Atmel_SAM4E_RTOS_Demo.html
+IDList=
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_CLI_FAT_SL_SAM4E_Atmel_Studio/See also FreeRTOS+TCP.url

@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+URL=http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/index.html
+IDList=

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/.cproject

@@ -1,20 +1,18 @@
 <?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">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -80,6 +78,7 @@
 								<option id="com.crt.advproject.link.gcc.hdrlib.2006557555" name="Use C library" superClass="com.crt.advproject.link.gcc.hdrlib" value="com.crt.advproject.gcc.link.hdrlib.codered.nohost" valueType="enumerated"/>
 								<option id="gnu.c.link.option.nodeflibs.2072403274" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.c.link.option.nodeflibs" value="false" valueType="boolean"/>
 								<option id="com.crt.advproject.link.gcc.multicore.slave.1911982348" name="Multicore slave" superClass="com.crt.advproject.link.gcc.multicore.slave"/>
+								<option id="com.crt.advproject.link.gcc.multicore.master.userobjs.502901386" superClass="com.crt.advproject.link.gcc.multicore.master.userobjs" valueType="userObjs"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1085761099" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -87,22 +86,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 +102,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 +134,8 @@
 	<storageModule moduleId="com.crt.config">
 		<projectStorage>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#13;
 &lt;TargetConfig&gt;&#13;
-&lt;Properties property_0="" property_2="LPC1850A_4350A_SPIFI.cfx" property_3="NXP" property_4="LPC1830" property_count="5" version="1"/&gt;&#13;
-&lt;infoList vendor="NXP"&gt;&lt;info chip="LPC1830" match_id="0x0" name="LPC1830" stub="crt_emu_lpc18_43_nxp"&gt;&lt;chip&gt;&lt;name&gt;LPC1830&lt;/name&gt;&#13;
+&lt;Properties property_0="" property_2="LPC1850A_4350A_SPIFI.cfx" property_3="NXP" property_4="LPC1830" property_count="5" version="70200"/&gt;&#13;
+&lt;infoList vendor="NXP"&gt;&lt;info chip="LPC1830" match_id="0x0" name="LPC1830" resetscript="LPC18LPC43ExternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"&gt;&lt;chip&gt;&lt;name&gt;LPC1830&lt;/name&gt;&#13;
 &lt;family&gt;LPC18xx&lt;/family&gt;&#13;
 &lt;vendor&gt;NXP (formerly Philips)&lt;/vendor&gt;&#13;
 &lt;reset board="None" core="Real" sys="Real"/&gt;&#13;
@@ -156,10 +155,12 @@
 &lt;peripheralInstance derived_from="V7M_ITM" id="ITM" location="0xe0000000"/&gt;&#13;
 &lt;peripheralInstance derived_from="SCT" id="SCT" location="0x40000000"/&gt;&#13;
 &lt;peripheralInstance derived_from="GPDMA" id="GPDMA" location="0x40002000"/&gt;&#13;
+&lt;peripheralInstance derived_from="SPIFI" id="SPIFI" location="0x40003000"/&gt;&#13;
 &lt;peripheralInstance derived_from="SDMMC" id="SDMMC" location="0x40004000"/&gt;&#13;
 &lt;peripheralInstance derived_from="EMC" id="EMC" location="0x40005000"/&gt;&#13;
 &lt;peripheralInstance derived_from="USB0" id="USB0" location="0x40006000"/&gt;&#13;
 &lt;peripheralInstance derived_from="USB1" id="USB1" location="0x40007000"/&gt;&#13;
+&lt;peripheralInstance derived_from="EEPROM" id="EEPROM" location="0x4000e000"/&gt;&#13;
 &lt;peripheralInstance derived_from="ETHERNET" id="ETHERNET" location="0x40010000"/&gt;&#13;
 &lt;peripheralInstance derived_from="ATIMER" id="ATIMER" location="0x40040000"/&gt;&#13;
 &lt;peripheralInstance derived_from="REGFILE" id="REGFILE" location="0x40041000"/&gt;&#13;

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CLI-commands.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -95,50 +100,50 @@ commands. */
 /*
  * Implements the run-time-stats command.
  */
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the task-stats command.
  */
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the echo-three-parameters command.
  */
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the echo-parameters command.
  */
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that prints out IP address information.
  */
-static portBASE_TYPE prvDisplayIPConfig( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvDisplayIPConfig( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that prints out the gathered demo debug stats.
  */
-static portBASE_TYPE prvDisplayIPDebugStats( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvDisplayIPDebugStats( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Defines a command that sends an ICMP ping request to an IP address.
  */
-static portBASE_TYPE prvPingCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+static BaseType_t prvPingCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 
 /*
  * Implements the "trace start" and "trace stop" commands;
  */
 #if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
-	static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString );
 #endif
 
 /* Structure that defines the "ip-config" command line command. */
 static const CLI_Command_Definition_t xIPConfig =
 {
-	( const int8_t * const ) "ip-config",
-	( const int8_t * const ) "ip-config:\r\n Displays IP address configuration\r\n\r\n",
+	"ip-config",
+	"ip-config:\r\n Displays IP address configuration\r\n\r\n",
 	prvDisplayIPConfig,
 	0
 };
@@ -147,8 +152,8 @@ static const CLI_Command_Definition_t xIPConfig =
 	/* Structure that defines the "ip-debug-stats" command line command. */
 	static const CLI_Command_Definition_t xIPDebugStats =
 	{
-		( const int8_t * const ) "ip-debug-stats", /* The command string to type. */
-		( const int8_t * const ) "ip-debug-stats:\r\n Shows some IP stack stats useful for debug - an example only.\r\n\r\n",
+		"ip-debug-stats", /* The command string to type. */
+		"ip-debug-stats:\r\n Shows some IP stack stats useful for debug - an example only.\r\n\r\n",
 		prvDisplayIPDebugStats, /* The function to run. */
 		0 /* No parameters are expected. */
 	};
@@ -158,8 +163,8 @@ static const CLI_Command_Definition_t xIPConfig =
 generates a table that shows how much run time each task has */
 static const CLI_Command_Definition_t xRunTimeStats =
 {
-	( const int8_t * const ) "run-time-stats", /* The command string to type. */
-	( const int8_t * const ) "run-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n\r\n",
+	"run-time-stats", /* The command string to type. */
+	"run-time-stats:\r\n Displays a table showing how much processing time each FreeRTOS task has used\r\n\r\n",
 	prvRunTimeStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -168,8 +173,8 @@ static const CLI_Command_Definition_t xRunTimeStats =
 a table that gives information on each task in the system. */
 static const CLI_Command_Definition_t xTaskStats =
 {
-	( const int8_t * const ) "task-stats", /* The command string to type. */
-	( const int8_t * const ) "task-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n\r\n",
+	"task-stats", /* The command string to type. */
+	"task-stats:\r\n Displays a table showing the state of each FreeRTOS task\r\n\r\n",
 	prvTaskStatsCommand, /* The function to run. */
 	0 /* No parameters are expected. */
 };
@@ -179,8 +184,8 @@ takes exactly three parameters that the command simply echos back one at a
 time. */
 static const CLI_Command_Definition_t xThreeParameterEcho =
 {
-	( const int8_t * const ) "echo-3-parameters",
-	( const int8_t * const ) "echo-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n\r\n",
+	"echo-3-parameters",
+	"echo-3-parameters <param1> <param2> <param3>:\r\n Expects three parameters, echos each in turn\r\n\r\n",
 	prvThreeParameterEchoCommand, /* The function to run. */
 	3 /* Three parameters are expected, which can take any value. */
 };
@@ -190,8 +195,8 @@ takes a variable number of parameters that the command simply echos back one at
 a time. */
 static const CLI_Command_Definition_t xParameterEcho =
 {
-	( const int8_t * const ) "echo-parameters",
-	( const int8_t * const ) "echo-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n\r\n",
+	"echo-parameters",
+	"echo-parameters <...>:\r\n Take variable number of parameters, echos each in turn\r\n\r\n",
 	prvParameterEchoCommand, /* The function to run. */
 	-1 /* The user can enter any number of commands. */
 };
@@ -203,8 +208,8 @@ static const CLI_Command_Definition_t xParameterEcho =
 	parameters. */
 	static const CLI_Command_Definition_t xPing =
 	{
-		( const int8_t * const ) "ping",
-		( const int8_t * const ) "ping <ipaddress> <optional:bytes to send>:\r\n for example, ping 192.168.0.3 8, or ping www.example.com\r\n\r\n",
+		"ping",
+		"ping <ipaddress> <optional:bytes to send>:\r\n for example, ping 192.168.0.3 8, or ping www.example.com\r\n\r\n",
 		prvPingCommand, /* The function to run. */
 		-1 /* Ping can take either one or two parameter, so the number of parameters has to be determined by the ping command implementation. */
 	};
@@ -216,8 +221,8 @@ static const CLI_Command_Definition_t xParameterEcho =
 	parameter, which can be either "start" or "stop". */
 	static const CLI_Command_Definition_t xStartStopTrace =
 	{
-		( const int8_t * const ) "trace",
-		( const int8_t * const ) "trace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n\r\n",
+		"trace",
+		"trace [start | stop]:\r\n Starts or stops a trace recording for viewing in FreeRTOS+Trace\r\n\r\n",
 		prvStartStopTraceCommand, /* The function to run. */
 		1 /* One parameter is expected.  Valid values are "start" and "stop". */
 	};
@@ -247,9 +252,9 @@ void vRegisterCLICommands( void )
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvTaskStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvTaskStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stack	#\r\n************************************************\r\n";
+const char *const pcHeader = "Task          State  Priority  Stack	#\r\n************************************************\r\n";
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -259,8 +264,8 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskList( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -268,9 +273,9 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvRunTimeStatsCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvRunTimeStatsCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Time\r\n****************************************\r\n";
+const char * const pcHeader = "Task            Abs Time      % Time\r\n****************************************\r\n";
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -280,8 +285,8 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 	configASSERT( pcWriteBuffer );
 
 	/* Generate a table of task stats. */
-	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	strcpy( pcWriteBuffer, pcHeader );
+	vTaskGetRunTimeStats( pcWriteBuffer + strlen( pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -289,11 +294,11 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvThreeParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvThreeParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -306,7 +311,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The three parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The three parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -319,21 +324,21 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&xParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* Return the parameter string. */
 		memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-		sprintf( ( char * ) pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
-		strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, xParameterStringLength );
-		strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+		sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+		strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+		strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 		/* If this is the last of the three parameters then there are no more
 		strings to return after this one. */
@@ -356,11 +361,11 @@ static portBASE_TYPE lParameterNumber = 0;
 }
 /*-----------------------------------------------------------*/
 
-static portBASE_TYPE prvParameterEchoCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvParameterEchoCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-int8_t *pcParameter;
-portBASE_TYPE xParameterStringLength, xReturn;
-static portBASE_TYPE lParameterNumber = 0;
+const char *pcParameter;
+BaseType_t xParameterStringLength, xReturn;
+static BaseType_t lParameterNumber = 0;
 
 	/* Remove compile time warnings about unused parameters, and check the
 	write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -373,7 +378,7 @@ static portBASE_TYPE lParameterNumber = 0;
 	{
 		/* The first time the function is called after the command has been
 		entered just a header string is returned. */
-		sprintf( ( char * ) pcWriteBuffer, "The parameters were:\r\n" );
+		sprintf( pcWriteBuffer, "The parameters were:\r\n" );
 
 		/* Next time the function is called the first parameter will be echoed
 		back. */
@@ -386,20 +391,20 @@ static portBASE_TYPE lParameterNumber = 0;
 	else
 	{
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										lParameterNumber,		/* Return the next parameter. */
-										&xParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							lParameterNumber,		/* Return the next parameter. */
+							&xParameterStringLength	/* Store the parameter string length. */
+						);
 
 		if( pcParameter != NULL )
 		{
 			/* Return the parameter string. */
 			memset( pcWriteBuffer, 0x00, xWriteBufferLen );
-			sprintf( ( char * ) pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
-			strncat( ( char * ) pcWriteBuffer, ( const char * ) pcParameter, xParameterStringLength );
-			strncat( ( char * ) pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
+			sprintf( pcWriteBuffer, "%d: ", ( int ) lParameterNumber );
+			strncat( pcWriteBuffer, pcParameter, xParameterStringLength );
+			strncat( pcWriteBuffer, "\r\n", strlen( "\r\n" ) );
 
 			/* There might be more parameters to return after this one. */
 			xReturn = pdTRUE;
@@ -425,13 +430,13 @@ static portBASE_TYPE lParameterNumber = 0;
 
 #if ipconfigSUPPORT_OUTGOING_PINGS == 1
 
-	static portBASE_TYPE prvPingCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+	static BaseType_t prvPingCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 	{
-	int8_t * pcParameter;
-	portBASE_TYPE lParameterStringLength, xReturn;
+	char * pcParameter;
+	BaseType_t lParameterStringLength, xReturn;
 	uint32_t ulIPAddress, ulBytesToPing;
 	const uint32_t ulDefaultBytesToPing = 8UL;
-	int8_t cBuffer[ 16 ];
+	char cBuffer[ 16 ];
 
 		/* Remove compile time warnings about unused parameters, and check the
 		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -444,12 +449,12 @@ static portBASE_TYPE lParameterNumber = 0;
 		pcWriteBuffer[ 0 ] = 0x00;
 
 		/* Obtain the number of bytes to ping. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										2,						/* Return the second parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = ( char * ) FreeRTOS_CLIGetParameter
+								(
+									pcCommandString,		/* The command string itself. */
+									2,						/* Return the second parameter. */
+									&lParameterStringLength	/* Store the parameter string length. */
+								);
 
 		if( pcParameter == NULL )
 		{
@@ -458,16 +463,16 @@ static portBASE_TYPE lParameterNumber = 0;
 		}
 		else
 		{
-			ulBytesToPing = atol( ( const char * ) pcParameter );
+			ulBytesToPing = atol( pcParameter );
 		}
 
 		/* Obtain the IP address string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										1,						/* Return the first parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = ( char * ) FreeRTOS_CLIGetParameter
+								(
+									pcCommandString,		/* The command string itself. */
+									1,						/* Return the first parameter. */
+									&lParameterStringLength	/* Store the parameter string length. */
+								);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
@@ -476,7 +481,7 @@ static portBASE_TYPE lParameterNumber = 0;
 		digit, assume the host name has been passed in. */
 		if( ( *pcParameter >= '0' ) && ( *pcParameter <= '9' ) )
 		{
-			ulIPAddress = FreeRTOS_inet_addr( ( const uint8_t * ) pcParameter );
+			ulIPAddress = FreeRTOS_inet_addr( pcParameter );
 		}
 		else
 		{
@@ -484,11 +489,11 @@ static portBASE_TYPE lParameterNumber = 0;
 			pcParameter[ lParameterStringLength ] = 0x00;
 
 			/* Attempt to resolve host. */
-			ulIPAddress = FreeRTOS_gethostbyname( ( uint8_t * ) pcParameter );
+			ulIPAddress = FreeRTOS_gethostbyname( pcParameter );
 		}
 
 		/* Convert IP address, which may have come from a DNS lookup, to string. */
-		FreeRTOS_inet_ntoa( ulIPAddress, ( char * ) cBuffer );
+		FreeRTOS_inet_ntoa( ulIPAddress, cBuffer );
 
 		if( ulIPAddress != 0 )
 		{
@@ -501,11 +506,11 @@ static portBASE_TYPE lParameterNumber = 0;
 
 		if( xReturn == pdFALSE )
 		{
-			sprintf( ( char * ) pcWriteBuffer, "%s", "Could not send ping request\r\n" );
+			sprintf( pcWriteBuffer, "%s", "Could not send ping request\r\n" );
 		}
 		else
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Ping sent to %s with identifier %d\r\n", cBuffer, xReturn );
+			sprintf( pcWriteBuffer, "Ping sent to %s with identifier %d\r\n", cBuffer, xReturn );
 		}
 
 		return pdFALSE;
@@ -516,11 +521,11 @@ static portBASE_TYPE lParameterNumber = 0;
 
 #if configINCLUDE_DEMO_DEBUG_STATS != 0
 
-	static portBASE_TYPE prvDisplayIPDebugStats( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+	static BaseType_t prvDisplayIPDebugStats( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 	{
-	static portBASE_TYPE xIndex = -1;
+	static BaseType_t xIndex = -1;
 	extern xExampleDebugStatEntry_t xIPTraceValues[];
-	portBASE_TYPE xReturn;
+	BaseType_t xReturn;
 
 		/* Remove compile time warnings about unused parameters, and check the
 		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -533,7 +538,7 @@ static portBASE_TYPE lParameterNumber = 0;
 
 		if( xIndex < xExampleDebugStatEntries() )
 		{
-			sprintf( ( char * ) pcWriteBuffer, "%s %d\r\n", ( char * ) xIPTraceValues[ xIndex ].pucDescription, ( int ) xIPTraceValues[ xIndex ].ulData );
+			sprintf( pcWriteBuffer, "%s %d\r\n", xIPTraceValues[ xIndex ].pucDescription, ( int ) xIPTraceValues[ xIndex ].ulData );
 			xReturn = pdPASS;
 		}
 		else
@@ -552,10 +557,10 @@ static portBASE_TYPE lParameterNumber = 0;
 
 #endif /* configINCLUDE_DEMO_DEBUG_STATS */
 
-static portBASE_TYPE prvDisplayIPConfig( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+static BaseType_t prvDisplayIPConfig( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 {
-static portBASE_TYPE xIndex = 0;
-portBASE_TYPE xReturn;
+static BaseType_t xIndex = 0;
+BaseType_t xReturn;
 uint32_t ulAddress;
 
 	/* Remove compile time warnings about unused parameters, and check the
@@ -569,35 +574,35 @@ uint32_t ulAddress;
 	{
 		case 0 :
 			FreeRTOS_GetAddressConfiguration( &ulAddress, NULL, NULL, NULL );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nIP address " );
+			sprintf( pcWriteBuffer, "\r\nIP address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 1 :
 			FreeRTOS_GetAddressConfiguration( NULL, &ulAddress, NULL, NULL );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nNet mask " );
+			sprintf( pcWriteBuffer, "\r\nNet mask " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 2 :
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, &ulAddress, NULL );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nGateway address " );
+			sprintf( pcWriteBuffer, "\r\nGateway address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 3 :
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, NULL, &ulAddress );
-			sprintf( ( char * ) pcWriteBuffer, "\r\nDNS server address " );
+			sprintf( pcWriteBuffer, "\r\nDNS server address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		default :
 			ulAddress = 0;
-			sprintf( ( char * ) pcWriteBuffer, "\r\n\r\n" );
+			sprintf( pcWriteBuffer, "\r\n\r\n" );
 			xReturn = pdFALSE;
 			xIndex = 0;
 			break;
@@ -605,7 +610,7 @@ uint32_t ulAddress;
 
 	if( ulAddress != 0 )
 	{
-		FreeRTOS_inet_ntoa( ulAddress, ( ( char * ) &( pcWriteBuffer[ strlen( ( char * ) pcWriteBuffer ) ] ) ) );
+		FreeRTOS_inet_ntoa( ulAddress,  &( pcWriteBuffer[ strlen( pcWriteBuffer ) ] ) );
 	}
 
 	return xReturn;
@@ -614,10 +619,10 @@ uint32_t ulAddress;
 
 #if configINCLUDE_TRACE_RELATED_CLI_COMMANDS == 1
 
-	static portBASE_TYPE prvStartStopTraceCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString )
+	static BaseType_t prvStartStopTraceCommand( char *pcWriteBuffer, size_t xWriteBufferLen, const char *pcCommandString )
 	{
-	int8_t *pcParameter;
-	portBASE_TYPE lParameterStringLength;
+	const char *pcParameter;
+	BaseType_t lParameterStringLength;
 
 		/* Remove compile time warnings about unused parameters, and check the
 		write buffer is not NULL.  NOTE - for simplicity, this example assumes the
@@ -627,35 +632,35 @@ uint32_t ulAddress;
 		configASSERT( pcWriteBuffer );
 
 		/* Obtain the parameter string. */
-		pcParameter = ( int8_t * ) FreeRTOS_CLIGetParameter
-									(
-										pcCommandString,		/* The command string itself. */
-										1,						/* Return the first parameter. */
-										&lParameterStringLength	/* Store the parameter string length. */
-									);
+		pcParameter = FreeRTOS_CLIGetParameter
+						(
+							pcCommandString,		/* The command string itself. */
+							1,						/* Return the first parameter. */
+							&lParameterStringLength	/* Store the parameter string length. */
+						);
 
 		/* Sanity check something was returned. */
 		configASSERT( pcParameter );
 
 		/* There are only two valid parameter values. */
-		if( strncmp( ( const char * ) pcParameter, "start", strlen( "start" ) ) == 0 )
+		if( strncmp( pcParameter, "start", strlen( "start" ) ) == 0 )
 		{
 			/* Start or restart the trace. */
 			vTraceStop();
 			vTraceClear();
 			vTraceStart();
 
-			sprintf( ( char * ) pcWriteBuffer, "Trace recording (re)started.\r\n" );
+			sprintf( pcWriteBuffer, "Trace recording (re)started.\r\n" );
 		}
-		else if( strncmp( ( const char * ) pcParameter, "stop", strlen( "stop" ) ) == 0 )
+		else if( strncmp( pcParameter, "stop", strlen( "stop" ) ) == 0 )
 		{
 			/* End the trace, if one is running. */
 			vTraceStop();
-			sprintf( ( char * ) pcWriteBuffer, "Stopping trace recording.\r\n" );
+			sprintf( pcWriteBuffer, "Stopping trace recording.\r\n" );
 		}
 		else
 		{
-			sprintf( ( char * ) pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
+			sprintf( pcWriteBuffer, "Valid parameters are 'start' and 'stop'.\r\n" );
 		}
 
 		/* There is no more data to return after this single string, so return

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CreateProjectDirectoryStructure.bat

@@ -51,7 +51,6 @@ IF EXIST FreeRTOS_Source Goto END
 
 	REM Copy the FreeRTOS+UDP core files
 	copy %FREERTOS_UDP_SOURCE%\*.c FreeRTOS_Plus_UDP
-	copy %FREERTOS_UDP_SOURCE%\include\*.h FreeRTOS_Plus_UDP
 	copy %FREERTOS_UDP_SOURCE%\readme.txt FreeRTOS_Plus_UDP
 	copy %FREERTOS_UDP_SOURCE%\include\*.* FreeRTOS_Plus_UDP\include
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/Examples/USB_CDC/CDCCommandConsole.c

@@ -1,54 +1,70 @@
 /*
-    FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd.
-
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *
-     *    Complete, revised, and edited pdf reference manuals are also       *
-     *    available.                                                         *
-     *                                                                       *
-     *    Purchasing FreeRTOS documentation will not only help you, by       *
-     *    ensuring you get running as quickly as possible and with an        *
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *
-     *    the FreeRTOS project to continue with its mission of providing     *
-     *    professional grade, cross platform, de facto standard solutions    *
-     *    for microcontrollers - completely free of charge!                  *
-     *                                                                       *
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *
-     *                                                                       *
-     *    Thank you for using FreeRTOS, and thank you for your support!      *
-     *                                                                       *
-    ***************************************************************************
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
-    >>>NOTE<<< The modification to the GPL is included to allow you to
-    distribute a combined work that includes FreeRTOS without being obliged to
-    provide the source code for proprietary components outside of the FreeRTOS
-    kernel.  FreeRTOS is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-    more details. You should have received a copy of the GNU General Public
-    License and the FreeRTOS license exception along with FreeRTOS; if not it
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained
-    by writing to Richard Barry, contact details for whom are available on the
-    FreeRTOS WEB site.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
 
     1 tab == 4 spaces!
-
-    http://www.FreeRTOS.org - Documentation, latest information, license and
-    contact details.
-
-    http://www.SafeRTOS.com - A version that is certified for use in safety
-    critical systems.
-
-    http://www.OpenRTOS.com - Commercial support, development, porting,
-    licensing and training services.
 */
 
 /*
@@ -91,7 +107,7 @@ static void prvCDCCommandConsoleTask( void *pvParameters );
  * Obtain a character from the CDC input.  The calling task will be held in the
  * Blocked state (so other tasks can execute) until a character is avilable.
  */
-int8_t cGetCDCChar( void );
+char cGetCDCChar( void );
 
 /*
  * Initialise the third party virtual comport files driver
@@ -109,13 +125,13 @@ task. */
 static xSemaphoreHandle xCDCMutex = NULL;
 
 /* Const messages output by the command console. */
-static const uint8_t * const pcWelcomeMessage = ( uint8_t * ) "FreeRTOS command server.\r\nType Help to view a list of registered commands.\r\n\r\n>";
-static const uint8_t * const pcEndOfOutputMessage = ( uint8_t * ) "\r\n[Press ENTER to execute the previous command again]\r\n>";
-static const uint8_t * const pcNewLine = ( uint8_t * ) "\r\n";
+static const char * const pcWelcomeMessage = "FreeRTOS command server.\r\nType Help to view a list of registered commands.\r\n\r\n>";
+static const char * const pcEndOfOutputMessage = "\r\n[Press ENTER to execute the previous command again]\r\n>";
+static const char * const pcNewLine = "\r\n";
 
 /*-----------------------------------------------------------*/
 
-void vCDCCommandConsoleStart( uint16_t usStackSize, unsigned portBASE_TYPE uxPriority )
+void vCDCCommandConsoleStart( uint16_t usStackSize, UBaseType_t uxPriority )
 {
 	/* Create the semaphores and mutexes used by the CDC to task interface. */
 	xCDCMutex = xSemaphoreCreateMutex();
@@ -125,24 +141,26 @@ void vCDCCommandConsoleStart( uint16_t usStackSize, unsigned portBASE_TYPE uxPri
 
 	/* Add the semaphore and mutex to the queue registry for viewing in the
 	kernel aware state viewer. */
-	vQueueAddToRegistry( xCDCMutex, ( signed char * ) "CDCMu" );
-	vQueueAddToRegistry( xNewDataSemaphore, ( signed char * ) "CDCDat" );
+	vQueueAddToRegistry( xCDCMutex, "CDCMu" );
+	vQueueAddToRegistry( xNewDataSemaphore, "CDCDat" );
 
 	/* Create that task that handles the console itself. */
-	xTaskCreate( 	prvCDCCommandConsoleTask,			/* The task that implements the command console. */
-					( const int8_t * const ) "CDCCmd",	/* Text name assigned to the task.  This is just to assist debugging.  The kernel does not use this name itself. */
-					usStackSize,						/* The size of the stack allocated to the task. */
-					NULL,								/* The parameter is not used, so NULL is passed. */
-					uxPriority,							/* The priority allocated to the task. */
-					NULL );								/* A handle is not required, so just pass NULL. */
+	xTaskCreate( 	prvCDCCommandConsoleTask,	/* The task that implements the command console. */
+					"CDCCmd",					/* Text name assigned to the task.  This is just to assist debugging.  The kernel does not use this name itself. */
+					usStackSize,				/* The size of the stack allocated to the task. */
+					NULL,						/* The parameter is not used, so NULL is passed. */
+					uxPriority,					/* The priority allocated to the task. */
+					NULL );						/* A handle is not required, so just pass NULL. */
 }
 /*-----------------------------------------------------------*/
 
 static void prvCDCCommandConsoleTask( void *pvParameters )
 {
-int8_t cRxedChar, cInputIndex = 0, *pcOutputString;
-static int8_t cInputString[ cmdMAX_INPUT_SIZE ], cLastInputString[ cmdMAX_INPUT_SIZE ];
-portBASE_TYPE xReturned;
+char cRxedChar;
+uint8_t ucInputIndex = 0;
+char *pcOutputString;
+static char cInputString[ cmdMAX_INPUT_SIZE ], cLastInputString[ cmdMAX_INPUT_SIZE ];
+BaseType_t xReturned;
 
 	( void ) pvParameters;
 
@@ -156,7 +174,7 @@ portBASE_TYPE xReturned;
 
 	/* Send the welcome message.  This probably won't be seen as the console
 	will not have been connected yet. */
-	USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcWelcomeMessage, strlen( ( const char * ) pcWelcomeMessage ) );
+	USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcWelcomeMessage, strlen( pcWelcomeMessage ) );
 
 	for( ;; )
 	{
@@ -175,14 +193,14 @@ portBASE_TYPE xReturned;
 			if( cRxedChar == '\n' || cRxedChar == '\r' )
 			{
 				/* Just to space the output from the input. */
-				USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcNewLine, strlen( ( const char * ) pcNewLine ) );
+				USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcNewLine, strlen( pcNewLine ) );
 
 				/* See if the command is empty, indicating that the last command is
 				to be executed again. */
-				if( cInputIndex == 0 )
+				if( ucInputIndex == 0 )
 				{
 					/* Copy the last command back into the input string. */
-					strcpy( ( char * ) cInputString, ( char * ) cLastInputString );
+					strcpy( cInputString, cLastInputString );
 				}
 
 				/* Pass the received command to the command interpreter.  The
@@ -195,7 +213,7 @@ portBASE_TYPE xReturned;
 					xReturned = FreeRTOS_CLIProcessCommand( cInputString, pcOutputString, configCOMMAND_INT_MAX_OUTPUT_SIZE );
 
 					/* Write the generated string to the CDC. */
-					USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcOutputString, strlen( ( const char * ) pcOutputString ) );
+					USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcOutputString, strlen( pcOutputString ) );
 					vTaskDelay( 1 );
 
 				} while( xReturned != pdFALSE );
@@ -204,11 +222,11 @@ portBASE_TYPE xReturned;
 				Clear the input	string ready to receive the next command.  Remember
 				the command that was just processed first in case it is to be
 				processed again. */
-				strcpy( ( char * ) cLastInputString, ( char * ) cInputString );
-				cInputIndex = 0;
+				strcpy( cLastInputString, cInputString );
+				ucInputIndex = 0;
 				memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );
 
-				USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcEndOfOutputMessage, strlen( ( const char * ) pcEndOfOutputMessage ) );
+				USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcEndOfOutputMessage, strlen( pcEndOfOutputMessage ) );
 			}
 			else
 			{
@@ -220,10 +238,10 @@ portBASE_TYPE xReturned;
 				{
 					/* Backspace was pressed.  Erase the last character in the
 					string - if any. */
-					if( cInputIndex > 0 )
+					if( ucInputIndex > 0 )
 					{
-						cInputIndex--;
-						cInputString[ cInputIndex ] = '\0';
+						ucInputIndex--;
+						cInputString[ ucInputIndex ] = '\0';
 					}
 				}
 				else
@@ -233,10 +251,10 @@ portBASE_TYPE xReturned;
 					string will be passed to the command interpreter. */
 					if( ( cRxedChar >= ' ' ) && ( cRxedChar <= '~' ) )
 					{
-						if( cInputIndex < cmdMAX_INPUT_SIZE )
+						if( ucInputIndex < cmdMAX_INPUT_SIZE )
 						{
-							cInputString[ cInputIndex ] = cRxedChar;
-							cInputIndex++;
+							cInputString[ ucInputIndex ] = cRxedChar;
+							ucInputIndex++;
 						}
 					}
 				}
@@ -249,20 +267,20 @@ portBASE_TYPE xReturned;
 }
 /*-----------------------------------------------------------*/
 
-void vOutputString( const uint8_t * const pucMessage )
+void vOutputString( const char * const pcMessage )
 {
 	if( xSemaphoreTake( xCDCMutex, cmdMAX_MUTEX_WAIT ) == pdPASS )
 	{
-		USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pucMessage, strlen( ( const char * ) pucMessage ) );
+		USB_WriteEP( CDC_DEP_IN, ( uint8_t * ) pcMessage, strlen( pcMessage ) );
 		xSemaphoreGive( xCDCMutex );
 	}
 }
 /*-----------------------------------------------------------*/
 
-int8_t cGetCDCChar( void )
+char cGetCDCChar( void )
 {
 int32_t lAvailableBytes, xBytes = 0;
-int8_t cInputChar;
+char cInputChar;
 
 	do
 	{
@@ -274,7 +292,7 @@ int8_t cInputChar;
 			{
 				/* Attempt to read one character. */
 				xBytes = 1;
-				xBytes = CDC_RdOutBuf( ( char * ) &cInputChar, &xBytes );
+				xBytes = CDC_RdOutBuf( &cInputChar, &xBytes );
 
 				xSemaphoreGive( xCDCMutex );
 			}
@@ -296,7 +314,7 @@ int8_t cInputChar;
 /* Callback function executed by the USB interrupt when new data arrives. */
 void vCDCNewDataNotify( void )
 {
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+BaseType_t xHigherPriorityTaskWoken = pdFALSE;
 
 	configASSERT( xNewDataSemaphore );
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/Examples/include/CDCCommandConsole.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -69,7 +74,7 @@
  * Create the task that implements a command console using the USB virtual com
  * port driver for intput and output.
  */
-void vCDCCommandConsoleStart( uint16_t usStackSize, unsigned portBASE_TYPE uxPriority );
+void vCDCCommandConsoleStart( uint16_t usStackSize, UBaseType_t uxPriority );
 
 #endif /* CDC_COMMAND_CONSOLE_H */
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/Examples/include/TwoEchoClients.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -70,6 +75,6 @@
  * to send to and receive from an echo server.  The other task uses the zero
  * copy interface to send to and receive from an echo server.
  */
-void vStartEchoClientTasks( uint16_t usTaskStackSize, unsigned portBASE_TYPE uxTaskPriority );
+void vStartEchoClientTasks( uint16_t usTaskStackSize, UBaseType_t uxTaskPriority );
 
 #endif /* TWO_ECHO_CLIENTS_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -91,7 +96,7 @@ extern uint32_t SystemCoreClock;
 #define configTICK_RATE_HZ				100
 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 300 )
 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 40 * 1024 ) ) /* Has not effect in this demo as the heap is manually pointed to AHB RAM. */
-#define configMAX_TASK_NAME_LEN			( 12 )
+#define configMAX_TASK_NAME_LEN			( 9 )
 #define configIDLE_SHOULD_YIELD			0
 #define configQUEUE_REGISTRY_SIZE		10
 #define configUSE_TRACE_FACILITY		1
@@ -138,7 +143,7 @@ to exclude the API function. */
 
 /* 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
 
@@ -155,7 +160,7 @@ is one */
 #ifdef __NVIC_PRIO_BITS
 	#define configPRIO_BITS       __NVIC_PRIO_BITS
 #else
-	#define configPRIO_BITS       5        /* 32 priority levels */
+	#define configPRIO_BITS       3        /* 8 priority levels */
 #endif
 
 /* The maximum priority an interrupt that uses an interrupt safe FreeRTOS API
@@ -163,7 +168,7 @@ function can have.  Note that lower priority have numerically higher values.  */
 #define configMAX_LIBRARY_INTERRUPT_PRIORITY	( 5 )
 
 /* The minimum possible interrupt priority. */
-#define configMIN_LIBRARY_INTERRUPT_PRIORITY	( 31 )
+#define configMIN_LIBRARY_INTERRUPT_PRIORITY	( 7 )
 
 /* The lowest priority. */
 #define configKERNEL_INTERRUPT_PRIORITY 		( configMIN_LIBRARY_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
@@ -178,15 +183,13 @@ standard names. */
 #define xPortSysTickHandler SysTick_Handler
 
 
-
-
 /*
  * DEMO APPLICATION SPECIFIC DEFINITIONS FOLLOW FROM HERE
  */
 
 /* 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:
@@ -254,9 +257,9 @@ ipconfigUSE_DNS is set to 1 but a DNS server cannot be contacted. */
 
 /* Default gateway IP address configuration.  Used in ipconfigUSE_DNS is set to
 0, or ipconfigUSE_DNS is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0	192
-#define configGATEWAY_ADDR1	168
-#define configGATEWAY_ADDR2	1
+#define configGATEWAY_ADDR0	172
+#define configGATEWAY_ADDR1	25
+#define configGATEWAY_ADDR2	218
 #define configGATEWAY_ADDR3	1
 
 /* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSIPConfig.h

@@ -1,5 +1,6 @@
 /*
- * FreeRTOS+UDP V1.0.0 (C) 2013 Real Time Engineers ltd.
+ * FreeRTOS+UDP V1.0.1 (C) 2013 Real Time Engineers ltd.
+ * All rights reserved
  *
  * FreeRTOS+UDP is an add-on component to FreeRTOS.  It is not, in itself, part
  * of the FreeRTOS kernel.  FreeRTOS+UDP is licensed separately from FreeRTOS,

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/LEDs.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -99,11 +104,11 @@ static xTimerHandle xLEDToggleTimer = NULL;
 	GPIO_SetDir( ledLED1_PORT, ledLED1_BIT, 1 );
 
     /* Create the timer used to toggle LED0. */
-	xLEDToggleTimer = xTimerCreate(	( const int8_t * ) "LEDTmr", 	/* Just a text name to associate with the timer, useful for debugging, but not used by the kernel. */
-								ledTOGGLE_RATE,						/* The period of the timer. */
-								pdTRUE,								/* This timer will autoreload, so uxAutoReload is set to pdTRUE. */
-								NULL,								/* The timer ID is not used, so can be set to NULL. */
-								prvLEDToggleTimerCallback );		/* The callback function executed each time the timer expires. */
+	xLEDToggleTimer = xTimerCreate(	"LEDTmr", 		/* Just a text name to associate with the timer, useful for debugging, but not used by the kernel. */
+									ledTOGGLE_RATE,	/* The period of the timer. */
+									pdTRUE,			/* This timer will autoreload, so uxAutoReload is set to pdTRUE. */
+									NULL,			/* The timer ID is not used, so can be set to NULL. */
+									prvLEDToggleTimerCallback );		/* The callback function executed each time the timer expires. */
 
     /* Sanity check that the timer was actually created. */
     configASSERT( xLEDToggleTimer );

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/RunTimeStatsTimer.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/See also FreeRTOS+TCP.url

@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+URL=http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/index.html
+IDList=

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/CMSISv2p10_LPC18xx_DriverLib/inc/LPC18xx.h

@@ -158,7 +158,7 @@ typedef enum {
 
 #define __CM3_REV              		0x0101		/*!< Cortex-M3 Core Revision               */
 #define __MPU_PRESENT           	1         	/*!< MPU present or not                    */
-#define __NVIC_PRIO_BITS          	4         	/*!< Number of Bits used for Priority Levels */
+#define __NVIC_PRIO_BITS          	3         	/*!< Number of Bits used for Priority Levels */
 #define __Vendor_SysTickConfig    	0         	/*!< Set to 1 if different SysTick Config is used */
 /** @} */ /* End of group Configuration_of_CMSIS */
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcConfig.h

@@ -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
-

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/FreeRTOS_Plus_Trace_Recorder/Trace_Recorder_Configuration/trcHardwarePort.h

@@ -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 <20>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

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/USB_CDC/usbhw.c

@@ -132,10 +132,10 @@ void USB_Init (LPC_USBDRV_INIT_T* cbs)
 
 #ifdef USE_USB0
 	NVIC_EnableIRQ(USB0_IRQn); //  enable USB0 interrrupts
-	NVIC_SetPriority(USB0_IRQn, configMAX_SYSCALL_INTERRUPT_PRIORITY );
+	NVIC_SetPriority(USB0_IRQn, configMIN_LIBRARY_INTERRUPT_PRIORITY );
 #else
   	NVIC_EnableIRQ(USB1_IRQn); //  enable USB1 interrrupts
-  	NVIC_SetPriority(USB0_IRQn, configMAX_SYSCALL_INTERRUPT_PRIORITY );
+  	NVIC_SetPriority(USB0_IRQn, configMIN_LIBRARY_INTERRUPT_PRIORITY );
 #endif
 
 	USB_Reset();

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/board.h

@@ -0,0 +1,3 @@
+/* The name of this header file is set by the trace recorder code, but the name
+of the actual header file is used below. */
+#include "lpc18xx.h"

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/cr_startup_lpc18xx.c

@@ -413,7 +413,6 @@ void NMI_Handler(void)
 __attribute__ ((section(".after_vectors")))
 void HardFault_Handler(void)
 {
-return;
     __asm volatile
     (
         " tst lr, #4                                                \n"

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/main.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -178,7 +183,7 @@ int main( void )
 }
 /*-----------------------------------------------------------*/
 
-void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName )
+void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )
 {
 	( void ) pcTaskName;
 	( void ) pxTask;
@@ -212,7 +217,7 @@ void vApplicationMallocFailedHook( void )
 /* Called by FreeRTOS+UDP when the network connects. */
 void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent )
 {
-static portBASE_TYPE xTaskAlreadyCreated = pdFALSE;
+static BaseType_t xTaskAlreadyCreated = pdFALSE;
 
 	if( eNetworkEvent == eNetworkUp )
 	{
@@ -231,24 +236,24 @@ static portBASE_TYPE xTaskAlreadyCreated = pdFALSE;
 /* Called by FreeRTOS+UDP when a reply is received to an outgoing ping request. */
 void vApplicationPingReplyHook( ePingReplyStatus_t eStatus, uint16_t usIdentifier )
 {
-static const uint8_t *pucSuccess = ( uint8_t * ) "\r\n\r\nPing reply received - ";
-static const uint8_t *pucInvalidChecksum = ( uint8_t * ) "\r\n\r\nPing reply received with invalid checksum - ";
-static const uint8_t *pucInvalidData = ( uint8_t * ) "\r\n\r\nPing reply received with invalid data - ";
-static uint8_t ucMessage[ 50 ];
-void vOutputString( const uint8_t * const pucMessage );
+static const char *pcSuccess = "\r\n\r\nPing reply received - ";
+static const char *pcInvalidChecksum = "\r\n\r\nPing reply received with invalid checksum - ";
+static const char *pcInvalidData = "\r\n\r\nPing reply received with invalid data - ";
+static char cMessage[ 50 ];
+void vOutputString( const char * const pcMessage );
 
 	switch( eStatus )
 	{
 		case eSuccess	:
-			vOutputString( pucSuccess );
+			vOutputString( pcSuccess );
 			break;
 
 		case eInvalidChecksum :
-			vOutputString( pucInvalidChecksum );
+			vOutputString( pcInvalidChecksum );
 			break;
 
 		case eInvalidData :
-			vOutputString( pucInvalidData );
+			vOutputString( pcInvalidData );
 			break;
 
 		default :
@@ -257,7 +262,7 @@ void vOutputString( const uint8_t * const pucMessage );
 			break;
 	}
 
-	sprintf( ( char * ) ucMessage, "identifier %d\r\n\r\n", ( int ) usIdentifier );
-	vOutputString( ucMessage );
+	sprintf( cMessage, "identifier %d\r\n\r\n", ( int ) usIdentifier );
+	vOutputString( cMessage );
 }
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/trcConfig.h

@@ -1,55 +1,136 @@
 /*******************************************************************************
- * FreeRTOS+Trace v2.3.0 Recorder Library
+ * Tracealyzer v2.7.0 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 
- * overapproximated, although larger values values implies more RAM usage.
+ * 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 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 
- * sold or in other ways commercially redistributed without explicit written 
+ * 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 
+ * 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.
  *
- * 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/
+ * Tabs are used for indent in this file (1 tab = 4 spaces)
  *
- * Copyright Percepio AB, 2012.
+ * Copyright Percepio AB, 2014.
  * www.percepio.com
  ******************************************************************************/
 
 #ifndef TRCCONFIG_H
 #define TRCCONFIG_H
 
+/******************************************************************************
+ * SELECTED_PORT
+ *
+ * Macro that specifies what hardware port that should be used.
+ * Available ports are:
+ *
+ * Port Name							Code	 Official	OS supported
+ * PORT_APPLICATION_DEFINED				-2		-			-
+ * PORT_NOT_SET							-1		-			-
+ * PORT_HWIndependent					0		Yes			Any
+ * PORT_Win32							1		Yes			FreeRTOS on 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_PIC32MX				9		Yes			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
+ * PORT_MICROCHIP_PIC32MZ				14		Yes			Any
+ * PORT_ARM_CORTEX_A9					15		No			Any
+ *****************************************************************************/
+
+#ifndef WIN32
+	// Set the port setting here!
+	#define SELECTED_PORT PORT_ARM_CortexM
+
+	#if (SELECTED_PORT == PORT_NOT_SET)
+		#error "You need to define SELECTED_PORT here!"
+	#endif
+#else
+	// For Win32 demo projects this is set automatically
+	#define SELECTED_PORT PORT_Win32
+#endif
+
+/******************************************************************************
+ * FREERTOS_VERSION
+ *
+ * Specify what version of FreeRTOS that is used. This is necessary compensate
+ * for renamed symbols in the FreeRTOS kernel (does not build if incorrect).
+ *
+ * FREERTOS_VERSION_7_3_OR_7_4 (= 1)		If using FreeRTOS v7.3.0 - v7.4.2
+ * FREERTOS_VERSION_7_5_OR_7_6 (= 2)		If using FreeRTOS v7.5.0 - v7.6.0
+ * FREERTOS_VERSION_8_0_OR_LATER (= 3)		If using FreeRTOS v8.0.0 or later
+ *****************************************************************************/
+#define FREERTOS_VERSION	FREERTOS_VERSION_8_0_OR_LATER
+
+/******************************************************************************
+ * 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
+ * to store the whole run since startup.
+ *
+ * When TRACE_RECORDER_STORE_MODE is TRACE_STORE_MODE_STOP_WHEN_FULL, the
+ * recording is stopped when the buffer becomes full. This is useful for
+ * recording events following a specific state, e.g., the startup sequence.
+ *****************************************************************************/
+#define TRACE_RECORDER_STORE_MODE TRACE_STORE_MODE_RING_BUFFER
+
 /*******************************************************************************
- * CONFIGURATION RELATED TO CAPACITY AND ALLOCATION 
+ * TRACE_SCHEDULING_ONLY
+ *
+ * Macro which should be defined as an integer value.
+ *
+ * If this setting is enabled (= 1), only scheduling events are recorded.
+ * If disabled (= 0), all events are recorded.
+ *
+ * Users of FreeRTOS+Trace Free Edition only displays scheduling events, so this
+ * option can be used to avoid storing unsupported events.
+ *
+ * Default value is 0 (store all enabled events).
+ *
  ******************************************************************************/
+#define TRACE_SCHEDULING_ONLY 0
 
 /*******************************************************************************
  * EVENT_BUFFER_SIZE
@@ -57,390 +138,338 @@
  * 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.
+ * it may store. Most events use one record (4 byte), although some events
+ * require multiple 4-byte records. You should adjust this to the amount of RAM
+ * available in the target system.
+ *
+ * Default value is 1000, which means that 4000 bytes is allocated for the
+ * event buffer.
  ******************************************************************************/
+#define EVENT_BUFFER_SIZE 1000
 
-    #define EVENT_BUFFER_SIZE 10000 /* Adjust wrt. to available RAM */
+/*******************************************************************************
+ * NTask, NISR, NQueue, NSemaphore, NMutex
+ *
+ * A group of macros which should be defined as integer values, zero or larger.
+ *
+ * These define the capacity of the Object Property Table, i.e., the maximum
+ * number of objects active at any given point, within each object class (e.g.,
+ * task, queue, semaphore, ...).
+ *
+ * If tasks or other other objects are deleted in your system, this
+ * setting does not limit the total amount of objects created, only the number
+ * of objects that have been successfully created but not yet deleted.
+ *
+ * Using too small values will cause vTraceError to be called, which stores an
+ * error message in the trace that is shown when opening the trace file.
+ *
+ * It can be wise to start with large values for these constants,
+ * unless you are very confident on these numbers. Then do a recording and
+ * check the actual usage by selecting View menu -> Trace Details ->
+ * Resource Usage -> Object Table.
+ ******************************************************************************/
+#define NTask			15
+#define NISR			4
+#define NQueue			10
+#define NSemaphore		10
+#define NMutex			5
+#define NTimer			10
+#define NEventGroup		1
+
+/******************************************************************************
+ * INCLUDE_MEMMANG_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * This controls if malloc and free calls should be traced. Set this to zero to
+ * exclude malloc/free calls, or one (1) to include such events in the trace.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_MEMMANG_EVENTS 1
+
+/******************************************************************************
+ * INCLUDE_USER_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (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
+ *
+ * Default value is 1.
+ *
+ * Note that User Events are only displayed in Professional Edition.
+ *****************************************************************************/
+#define INCLUDE_USER_EVENTS 0
+
+/*****************************************************************************
+ * INCLUDE_ISR_TRACING
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * If this is zero (0), the code for recording Interrupt Service Routines is
+ * excluded to reduce code size.
+ *
+ * Default value is 1.
+ *
+ * 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_READY_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * If one (1), events are recorded when tasks enter scheduling state "ready".
+ * This uses a lot of space in the event buffer, so excluding "ready events"
+ * will allow for longer traces. Including ready events however allows for
+ * showing the initial pending time before tasks enter the execution state, and
+ * for presenting accurate response times.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_READY_EVENTS 1
+
+/*****************************************************************************
+ * INCLUDE_NEW_TIME_EVENTS
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ *
+ * If this is zero (1), events will be generated whenever the OS clock is
+ * increased.
+ *
+ * Default value is 0.
+ *****************************************************************************/
+#define INCLUDE_NEW_TIME_EVENTS 0
+
+/******************************************************************************
+ * INCLUDE_FLOAT_SUPPORT
+ *
+ * Macro which should be defined as either zero (0) or one (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) arguments.
+ *
+ * vTracePrintF can be used with integer and string arguments in either case.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_FLOAT_SUPPORT 0
+
+/******************************************************************************
+ * INCLUDE_OBJECT_DELETE
+ *
+ * Macro which should be defined as either zero (0) or one (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.
+ *
+ * Default value is 1.
+ *****************************************************************************/
+#define INCLUDE_OBJECT_DELETE 1
 
 /*******************************************************************************
  * 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 
+ * 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.
+ * objects. If you don't use User Events or delete any kernel
+ * objects you set this to a very low value. The minimum recommended value is 4.
+ * A size of zero (0) is not allowed since a zero-sized array may result in a
+ * 32-bit pointer, i.e., using 4 bytes rather than 0.
+ *
+ * Default value is 800.
  ******************************************************************************/
-#define SYMBOL_TABLE_SIZE 1000
+#define SYMBOL_TABLE_SIZE 5000
 
-/*******************************************************************************
- * 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 FreeRTOS+Trace. 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
- * 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.
- * Moreover, one task slot is used to indicate "(startup)", i.e., a fictive 
- * task that represent the time before the FreeRTOS 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
-
-/* Maximum object name length for each class (includes zero termination) */
-#define NameLenTask       configMAX_TASK_NAME_LEN
-#define NameLenISR        10
-#define NameLenQueue      15
-#define NameLenSemaphore  15
-#define NameLenMutex      15
+#if (SYMBOL_TABLE_SIZE == 0)
+#error "SYMBOL_TABLE_SIZE may not be zero!"
+#endif
 
 /******************************************************************************
- * TRACE_DESCRIPTION
+ * NameLenTask, NameLenQueue, ...
  *
- * Macro which should be defined as a string.
- *
- * This string is stored in the trace and displayed in FreeRTOS+Trace. 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.
+ * Macros that specify the maximum lengths (number of characters) for names of
+ * kernel objects, such as tasks and queues. If longer names are used, they will
+ * be truncated when stored in the recorder.
  *****************************************************************************/
-#define TRACE_DESCRIPTION "FreeRTOS+Trace Demo"
-
-/******************************************************************************
- * 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
-
+#define NameLenTask			15
+#define NameLenISR			15
+#define NameLenQueue		15
+#define NameLenSemaphore	15
+#define NameLenMutex		15
+#define NameLenTimer		15
+#define NameLenEventGroup 	15
 
 /******************************************************************************
  * TRACE_DATA_ALLOCATION
  *
- * This defines how to allocate the recorder data structure, i.e., using a 
+ * 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 
+ * 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
+ *** ADVANCED SETTINGS ********************************************************
+ ******************************************************************************
+ * The remaining settings are not necessary to modify but allows for optimizing
+ * the recorder setup for your specific needs, e.g., to exclude events that you
+ * are not interested in, in order to get longer traces.
  *****************************************************************************/
 
 /******************************************************************************
- * 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 1
+* 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 reported addresses showing the
+* lower 24 bits only. If 0, you get the full 32-bit addresses.
+*
+* Default value is 0.
+******************************************************************************/
+#define HEAP_SIZE_BELOW_16M 0
 
 /******************************************************************************
- * INCLUDE_USER_EVENTS
+ * USE_LINKER_PRAGMA
  *
- * Macro which should be defined as either zero (0) or one (1). 
- * Default is 1.
+ * Macro which should be defined as an integer value, default is 0.
  *
- * 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 FreeRTOS+Trace Standard Edition or Professional Edition is required
- * for User Events, they are not displayed in FreeRTOS+Trace Free Edition.
- *****************************************************************************/
-#define INCLUDE_USER_EVENTS 1
-
-/*****************************************************************************
- * INCLUDE_READY_EVENTS
+ * 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.
  *
- * Macro which should be defined as either zero (0) or one (1). 
- * Default is 1.
+ * Example (for IAR Embedded Workbench and NXP LPC17xx):
+ * #pragma location="AHB_RAM_MEMORY"
  *
- * 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_ISR_TRACING
+ * 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.
  *
- * 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.
- *****************************************************************************/
-#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, 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. 
- *****************************************************************************/
-#ifdef INCLUDE_OBJECT_DELETE
-#undef INCLUDE_OBJECT_DELETE
-#endif
-
-#define INCLUDE_OBJECT_DELETE 1
-
-/******************************************************************************
- * CONFIGURATION RELATED TO BEHAVIOR
- *****************************************************************************/
-
-/******************************************************************************
- * 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.
- *
- * 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
- * "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
- * 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.
- *
- * 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
- * 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.
- *****************************************************************************/
-#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
-
-/******************************************************************************
- * 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
+ * Note that this only applies if using static allocation, see below.
+ ******************************************************************************/
+#define USE_LINKER_PRAGMA 0
 
 /******************************************************************************
  * USE_IMPLICIT_IFE_RULES
  *
- * Macro which should be defined as either zero (0) or one (1). 
+ * Macro which should be defined as either zero (0) or one (1).
  * Default is 1.
  *
- * ### Instance Finish Events (IFE) ###
+ * Tracealyzer groups the events into actor instances, based on context-switches
+ * and a definition of "Instance Finish Events", or IFEs. These are kernel calls
+ * considered to be the last event in a task instance. Some kernel calls are
+ * considered IFEs by default (e.g., delay functions), but it is also possible
+ * to specify this individually for each task (see vTraceTaskInstanceFinish).
  *
- * 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),
- * 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 default IFEs will be enabled, which
+ * gives a "typical" grouping of events into instances. You can combine this
+ * with calls to vTraceTaskInstanceFinish for specific tasks.
  *
- * 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)
- *
- * However, Implicit IFEs only applies to blocking kernel calls. If an
- * xQueueReceive 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
- *
- *     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 like
- * vTaskDelay, 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.
+ * If USE_IMPLICIT_IFE_RULES is zero (0), the implicit IFEs are disabled and all
+ * events withing each task is then shown as a single instance, unless  you call
+ * vTraceTaskInstanceFinish() at suitable locations to mark the IFEs.
  *****************************************************************************/
 #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).
+ *
+ * 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).
+ *
+ * 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.
+ *
  * Default is 0.
  *
- * If enabled (1), the recorder will include code for saving the trace
- * to a local file system.
+ * NOTE: An object with handle above 255 will use an extra 4-byte record in
+ * the event buffer whenever referenced. Moreover, 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, mutex, etc.
+ *****************************************************************************/
+#define USE_16BIT_OBJECT_HANDLES 0
+
+/******************************************************************************
+ * USE_TRACE_ASSERT
+ *
+ * Macro which should be defined as either zero (0) or one (1).
+ * Default is 1.
+ *
+ * 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.
+ * This is used on several places in the recorder code for sanity checks on
+ * parameters. Can be switched off to reduce CPU usage of the tracing.
+ *****************************************************************************/
+#define USE_TRACE_ASSERT 1
+
+/*******************************************************************************
+ * 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. Using
+ * this separate buffer has the benefit of not overwriting the user events with
+ * kernel events (usually generated at a much higher rate), i.e., when using
+ * ring-buffer mode.
+ *
+ * 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.
  ******************************************************************************/
-#ifdef WIN32
-    #define INCLUDE_SAVE_TO_FILE 1
-#else
-    #define INCLUDE_SAVE_TO_FILE 0
-#endif
+#define USE_SEPARATE_USER_EVENT_BUFFER 0
 
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_PRIORITY
+/*******************************************************************************
+ * USER_EVENT_BUFFER_SIZE
  *
- * Macro which sets the priority of the "recorder status monitor" task.
+ * Macro which should be defined as an integer value.
  *
- * 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.
+ * 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.
  *
- * 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)
+ * Only in use if USE_SEPARATE_USER_EVENT_BUFFER is set to 1.
+ ******************************************************************************/
+#define USER_EVENT_BUFFER_SIZE 10
 
-/******************************************************************************
- * TRACE_PROGRESS_MONITOR_TASK_STACKSIZE
+/*******************************************************************************
+ * USER_EVENT_CHANNELS
  *
- * Macro which sets the stack size of the "recorder status monitor" task.
+ * Macro which should be defined as an integer value.
  *
- * 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.
+ * This defines the number of allowed user event channels.
  *
- * 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 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
-#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 ""
+ * Only in use if USE_SEPARATE_USER_EVENT_BUFFER is set to 1.
+ ******************************************************************************/
+#define CHANNEL_FORMAT_PAIRS 32
 
 #endif
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/SelectServer.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -80,7 +85,7 @@
 #include "FreeRTOS_UDP_IP.h"
 #include "FreeRTOS_Sockets.h"
 
-#define selTINY_DELAY				( ( portTickType ) 2 )
+#define selTINY_DELAY				( ( TickType_t ) 2 )
 #define selNUMBER_OF_SOCKETS		( 3 )
 #define selSELECT_QUEUE_SIZE		( selNUMBER_OF_SOCKETS * 2 )
 
@@ -100,14 +105,14 @@ static xSocket_t xRxSockets[ selNUMBER_OF_SOCKETS ] = { 0 };
 
 /*-----------------------------------------------------------*/
 
-void vStartSelectUDPServerTasks( uint16_t usStackSize, uint32_t ulFirstPortNumber, unsigned portBASE_TYPE uxPriority )
+void vStartSelectUDPServerTasks( uint16_t usStackSize, uint32_t ulFirstPortNumber, UBaseType_t uxPriority )
 {
 	/* Create task that sends to multiple sockets, and the task that uses the
 	FreeRTOS_select() function to receive from multiple sockets.  The first
 	port number to use is passed into both tasks using the task's parameter.
 	Other port numbers are consecutive from the first. */
-	xTaskCreate( prvMultipleSocketTxTask, ( const signed char * const ) "MultiTx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
-	xTaskCreate( prvMultipleSocketRxTask, ( const signed char * const ) "MultiRx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
+	xTaskCreate( prvMultipleSocketTxTask, "MultiTx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
+	xTaskCreate( prvMultipleSocketRxTask, "MultiRx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
 }
 /*-----------------------------------------------------------*/
 
@@ -119,7 +124,7 @@ struct freertos_sockaddr xAddress;
 uint32_t xClientLength = sizeof( struct freertos_sockaddr ), ulFirstRxPortNumber, x;
 uint32_t ulReceivedValue = 0, ulExpectedValue = 0UL, ulReceivedCount[ selNUMBER_OF_SOCKETS ] = { 0 };
 int32_t lBytes;
-const portTickType xRxBlockTime = 0;
+const TickType_t xRxBlockTime = 0;
 
 	/* The number of the port the first Rx socket will be bound to is passed in
 	as the task parameter.  Other port numbers used are consecutive from this. */
@@ -196,7 +201,7 @@ uint32_t ulTxValue = 0;
 struct freertos_sockaddr xDestinationAddress;
 uint32_t ulIPAddress, ulFirstDestinationPortNumber, xPortNumber;
 xSocket_t xTxSocket;
-const portTickType xShortDelay = 100 / portTICK_RATE_MS, xSendBlockTime = 500 / portTICK_RATE_MS;
+const TickType_t xShortDelay = 100 / portTICK_RATE_MS, xSendBlockTime = 500 / portTICK_RATE_MS;
 
 	srand( ( unsigned int ) &xPortNumber );
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/SimpleClientAndServer.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -62,7 +67,7 @@
     1 tab == 4 spaces!
 */
 
-/* 
+/*
  * Creates two transmitting tasks and two receiving tasks.  The transmitting
  * tasks send values that are received by the receiving tasks.  One set of tasks
  * uses the standard API.  The other set of tasks uses the zero copy API.
@@ -80,7 +85,7 @@
 #include "FreeRTOS_UDP_IP.h"
 #include "FreeRTOS_Sockets.h"
 
-#define simpTINY_DELAY	( ( portTickType ) 2 )
+#define simpTINY_DELAY	( ( TickType_t ) 2 )
 
 /*
  * Uses a socket to send data without using the zero copy option.
@@ -108,7 +113,7 @@ static void prvSimpleZeroCopyServerTask( void *pvParameters );
 
 /*-----------------------------------------------------------*/
 
-void vStartSimpleUDPClientServerTasks( uint16_t usStackSize, uint32_t ulPort, unsigned portBASE_TYPE uxPriority )
+void vStartSimpleUDPClientServerTasks( uint16_t usStackSize, uint32_t ulPort, UBaseType_t uxPriority )
 {
 	/* Create the client and server tasks that do not use the zero copy
 	interface. */
@@ -125,11 +130,11 @@ static void prvSimpleClientTask( void *pvParameters )
 {
 xSocket_t xClientSocket;
 struct freertos_sockaddr xDestinationAddress;
-uint8_t cString[ 50 ];
-portBASE_TYPE lReturned;
+char cString[ 50 ];
+BaseType_t lReturned;
 uint32_t ulCount = 0UL, ulIPAddress;
 const uint32_t ulLoopsPerSocket = 10UL;
-const portTickType x150ms = 150UL / portTICK_RATE_MS;
+const TickType_t x150ms = 150UL / portTICK_RATE_MS;
 
 	/* Remove compiler warning about unused parameters. */
 	( void ) pvParameters;
@@ -161,13 +166,13 @@ const portTickType x150ms = 150UL / portTICK_RATE_MS;
 		do
 		{
 			/* Create the string that is sent to the server. */
-			sprintf( ( char * ) cString, "Server received (not zero copy): Message number %lu\r\n", ulCount );
+			sprintf( cString, "Server received (not zero copy): Message number %lu\r\n", ulCount );
 
 			/* Send the string to the socket.  ulFlags is set to 0, so the zero
 			copy option is not selected.  That means the data from cString[] is
 			copied into a network buffer inside FreeRTOS_sendto(), and cString[]
 			can be reused as soon as FreeRTOS_sendto() has returned. */
-			lReturned = FreeRTOS_sendto( xClientSocket, ( void * ) cString, strlen( ( const char * ) cString ), 0, &xDestinationAddress, sizeof( xDestinationAddress ) );
+			lReturned = FreeRTOS_sendto( xClientSocket, ( void * ) cString, strlen( cString ), 0, &xDestinationAddress, sizeof( xDestinationAddress ) );
 
 			ulCount++;
 
@@ -186,7 +191,7 @@ const portTickType x150ms = 150UL / portTICK_RATE_MS;
 static void prvSimpleServerTask( void *pvParameters )
 {
 long lBytes;
-uint8_t cReceivedString[ 60 ];
+char cReceivedString[ 60 ];
 struct freertos_sockaddr xClient, xBindAddress;
 uint32_t xClientLength = sizeof( xClient );
 xSocket_t xListeningSocket;
@@ -225,11 +230,11 @@ xSocket_t xListeningSocket;
 		/* Print the received characters. */
 		if( lBytes > 0 )
 		{
-			vOutputString( ( char * ) cReceivedString );
+			vOutputString( cReceivedString );
 		}
 
 		/* Error check. */
-		configASSERT( lBytes == ( portBASE_TYPE ) strlen( ( const char * ) cReceivedString ) );
+		configASSERT( lBytes == ( BaseType_t ) strlen( cReceivedString ) );
 	}
 }
 /*-----------------------------------------------------------*/
@@ -239,13 +244,13 @@ static void prvSimpleZeroCopyUDPClientTask( void *pvParameters )
 xSocket_t xClientSocket;
 uint8_t *pucUDPPayloadBuffer;
 struct freertos_sockaddr xDestinationAddress;
-portBASE_TYPE lReturned;
+BaseType_t lReturned;
 uint32_t ulCount = 0UL, ulIPAddress;
 const uint32_t ulLoopsPerSocket = 10UL;
-const uint8_t *pucStringToSend = ( const uint8_t * ) "Server received (using zero copy): Message number ";
-const portTickType x150ms = 150UL / portTICK_RATE_MS;
+const char *pcStringToSend = "Server received (using zero copy): Message number ";
+const TickType_t x150ms = 150UL / portTICK_RATE_MS;
 /* 15 is added to ensure the number, \r\n and terminating zero fit. */
-const size_t xStringLength = strlen( ( char * ) pucStringToSend ) + 15;
+const size_t xStringLength = strlen( pcStringToSend ) + 15;
 
 	/* Remove compiler warning about unused parameters. */
 	( void ) pvParameters;
@@ -295,7 +300,7 @@ const size_t xStringLength = strlen( ( char * ) pucStringToSend ) + 15;
 			end.  Note that the string is being written directly into the buffer
 			obtained from the IP stack above. */
 			memset( ( void * ) pucUDPPayloadBuffer, 0x00, xStringLength );
-			sprintf( ( char * ) pucUDPPayloadBuffer, "%s%lu\r\n", ( char * ) pucStringToSend, ulCount );
+			sprintf( ( char * ) pucUDPPayloadBuffer, "%s%lu\r\n", pcStringToSend, ulCount );
 
 			/* Pass the buffer into the send function.  ulFlags has the
 			FREERTOS_ZERO_COPY bit set so the IP stack will take control of the
@@ -378,7 +383,7 @@ xSocket_t xListeningSocket;
 
 		/* It is expected to receive one more byte than the string length as
 		the NULL terminator is also transmitted. */
-		configASSERT( lBytes == ( ( portBASE_TYPE ) strlen( ( const char * ) pucUDPPayloadBuffer ) + 1 ) );
+		configASSERT( lBytes == ( ( BaseType_t ) strlen( ( const char * ) pucUDPPayloadBuffer ) + 1 ) );
 
 		/* Print the received characters. */
 		if( lBytes > 0 )

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -101,13 +106,13 @@ static xSocket_t prvOpenUDPServerSocket( uint16_t usPort );
 
 /*-----------------------------------------------------------*/
 
-void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, unsigned portBASE_TYPE uxPriority )
+void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, UBaseType_t uxPriority )
 {
-	xTaskCreate( vUDPCommandInterpreterTask, ( signed char * ) "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );
+	xTaskCreate( vUDPCommandInterpreterTask, "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );
 }
 /*-----------------------------------------------------------*/
 
-/* 
+/*
  * Task that provides the input and output for the FreeRTOS+CLI command
  * interpreter.  In this case a UDP port is used.  See the URL in the comments
  * within main.c for the location of the online documentation.
@@ -117,7 +122,7 @@ void vUDPCommandInterpreterTask( void *pvParameters )
 long lBytes, lByte;
 signed char cInChar, cInputIndex = 0;
 static signed char cInputString[ cmdMAX_INPUT_SIZE ], cOutputString[ cmdMAX_OUTPUT_SIZE ], cLocalBuffer[ cmdSOCKET_INPUT_BUFFER_SIZE ];
-portBASE_TYPE xMoreDataToFollow;
+BaseType_t xMoreDataToFollow;
 struct freertos_sockaddr xClient;
 socklen_t xClientAddressLength = 0; /* This is required as a parameter to maintain the sendto() Berkeley sockets API - but it is not actually used so can take any value. */
 xSocket_t xSocket;
@@ -153,25 +158,25 @@ extern const uint8_t ucMACAddress[ 6 ];
 					string. */
 					if( cInChar == '\n' )
 					{
-						/* Process the input string received prior to the 
+						/* Process the input string received prior to the
 						newline. */
 						do
 						{
 							/* Pass the string to FreeRTOS+CLI. */
 							xMoreDataToFollow = FreeRTOS_CLIProcessCommand( cInputString, cOutputString, cmdMAX_OUTPUT_SIZE );
-							
+
 							/* Send the output generated by the command's
 							implementation. */
-							FreeRTOS_sendto( xSocket, cOutputString,  strlen( ( const char * ) cOutputString ), 0, &xClient, xClientAddressLength );
+							FreeRTOS_sendto( xSocket, cOutputString,  strlen( cOutputString ), 0, &xClient, xClientAddressLength );
 
 						} while( xMoreDataToFollow != pdFALSE ); /* Until the command does not generate any more output. */
 
-						/* All the strings generated by the command processing 
-						have been sent.  Clear the input string ready to receive 
+						/* All the strings generated by the command processing
+						have been sent.  Clear the input string ready to receive
 						the next command. */
 						cInputIndex = 0;
 						memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );
-						
+
 						/* Transmit a spacer, just to make the command console
 						easier to read. */
 						FreeRTOS_sendto( xSocket, "\r\n",  strlen( "\r\n" ), 0, &xClient, xClientAddressLength );
@@ -180,12 +185,12 @@ extern const uint8_t ucMACAddress[ 6 ];
 					{
 						if( cInChar == '\r' )
 						{
-							/* Ignore the character.  Newlines are used to 
+							/* Ignore the character.  Newlines are used to
 							detect the end of the input string. */
 						}
 						else if( cInChar == '\b' )
 						{
-							/* Backspace was pressed.  Erase the last character 
+							/* Backspace was pressed.  Erase the last character
 							in the string - if any. */
 							if( cInputIndex > 0 )
 							{
@@ -207,7 +212,7 @@ extern const uint8_t ucMACAddress[ 6 ];
 					}
 				}
 			}
-		} 
+		}
 	}
 	else
 	{
@@ -233,7 +238,7 @@ xSocket_t xSocket = FREERTOS_INVALID_SOCKET;
 
 		/* Bind the address to the socket. */
 		if( FreeRTOS_bind( xSocket, &xServer, sizeof( xServer ) ) == -1 )
-		{			
+		{
 			FreeRTOS_closesocket( xSocket );
 			xSocket = FREERTOS_INVALID_SOCKET;
 		}

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/include/SelectServer.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -65,6 +70,6 @@
 #ifndef SELECT_SERVER_H
 #define SELECT_SERVER_H
 
-void vStartSelectUDPServerTasks( uint16_t usStackSize, uint32_t ulFirstPortNumber, unsigned portBASE_TYPE uxPriority );
+void vStartSelectUDPServerTasks( uint16_t usStackSize, uint32_t ulFirstPortNumber, UBaseType_t uxPriority );
 
 #endif /* SELECT_SERVER_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/include/SimpleClientAndServer.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -65,6 +70,6 @@
 #ifndef SIMPLE_CLIENT_AND_SERVER_H
 #define SIMPLE_CLIENT_AND_SERVER_H
 
-void vStartSimpleUDPClientServerTasks( uint16_t usStackSize, uint32_t ulsPort, unsigned portBASE_TYPE uxPriority );
+void vStartSimpleUDPClientServerTasks( uint16_t usStackSize, uint32_t ulsPort, UBaseType_t uxPriority );
 
 #endif /* SIMPLE_CLIENT_AND_SERVER_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/include/UDPCommandInterpreter.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -65,6 +70,6 @@
 #ifndef UDP_COMMAND_INTERPRETER_H
 #define UDP_COMMAND_INTERPRETER_H
 
-void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, unsigned portBASE_TYPE uxPriority );
+void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, UBaseType_t uxPriority );
 
 #endif /* UDP_COMMAND_INTERPRETER_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -81,7 +86,7 @@
  *----------------------------------------------------------*/
 
 #define configUSE_PREEMPTION			1
-#define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 7 )
+#define configMAX_PRIORITIES			( 7 )
 #define configTICK_RATE_HZ				( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 60 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the Win32 thread. */
 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 32U * 1024U ) )
@@ -137,7 +142,7 @@ to exclude the API function. */
 
 /* 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
 
@@ -178,7 +183,10 @@ example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 1
 results in the wired network being used, while setting
 configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
 used. */
-#define configNETWORK_INTERFACE_TO_USE 1L
+#define configNETWORK_INTERFACE_TO_USE 4L
+
+/* Only when using BufferAllocation_1.c. */
+#define configUSE_STATIC_BUFFERS 1
 
 /* The address of an echo server that will be used by the two demo echo client
 tasks.
@@ -186,7 +194,7 @@ http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Exampl
 #define configECHO_SERVER_ADDR0	172
 #define configECHO_SERVER_ADDR1 25
 #define configECHO_SERVER_ADDR2 218
-#define configECHO_SERVER_ADDR3 200
+#define configECHO_SERVER_ADDR3 100
 
 /* Default MAC address configuration.  The demo creates a virtual network
 connection that uses this MAC address by accessing the raw Ethernet/WiFi data

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/Run-time-stats-utils.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/See also FreeRTOS+TCP.url

@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+URL=http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/index.html
+IDList=

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WIN32.vcxproj

@@ -139,6 +139,9 @@
     <ClCompile Include="..\..\Source\FreeRTOS-Plus-UDP\FreeRTOS_DNS.c" />
     <ClCompile Include="..\..\Source\FreeRTOS-Plus-UDP\FreeRTOS_Sockets.c" />
     <ClCompile Include="..\..\Source\FreeRTOS-Plus-UDP\FreeRTOS_UDP_IP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-UDP\portable\BufferManagement\BufferAllocation_1.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\Source\FreeRTOS-Plus-UDP\portable\BufferManagement\BufferAllocation_2.c" />
     <ClCompile Include="..\..\Source\FreeRTOS-Plus-UDP\portable\NetworkInterface\WinPCap\NetworkInterface.c" />
     <ClCompile Include="..\Common\FreeRTOS_Plus_UDP_Demos\CLICommands\CLI-commands.c" />

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WIN32.vcxproj.filters

@@ -109,6 +109,9 @@
     <ClCompile Include="DemoTasks\SelectServer.c">
       <Filter>Demo App Source\DemoTasks</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-UDP\portable\BufferManagement\BufferAllocation_1.c">
+      <Filter>FreeRTOS+\FreeRTOS+UDP\portable</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FreeRTOSConfig.h">

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/arch.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -118,9 +123,9 @@ void vNetifTx( void )
 }
 /*-----------------------------------------------------------*/
 
-unsigned portBASE_TYPE uxNetifRx( void )
+UBaseType_t uxNetifRx( void )
 {
-unsigned portBASE_TYPE xDataLen;
+UBaseType_t xDataLen;
 unsigned char *pucTemp;
 
 	/* Check there is really data available. */
@@ -155,9 +160,9 @@ unsigned char *pucTemp;
 }
 /*-----------------------------------------------------------*/
 
-portBASE_TYPE xNetifInit( void )
+BaseType_t xNetifInit( void )
 {
-portBASE_TYPE x;
+BaseType_t x;
 pcap_if_t *pxAllNetworkInterfaces;
 
 	/* Allocate a free buffer to each buffer pointer. */
@@ -326,7 +331,7 @@ unsigned long ulNetMask;
 	/* Create a task that simulates an interrupt in a real system.  This will
 	block waiting for packets, then send a message to the uIP task when data
 	is available. */
-	xTaskCreate( prvInterruptSimulator, ( signed char * ) "MAC_ISR", configMINIMAL_STACK_SIZE, NULL, ( configuIP_TASK_PRIORITY - 1 ), NULL );
+	xTaskCreate( prvInterruptSimulator, "MAC_ISR", configMINIMAL_STACK_SIZE, NULL, ( configuIP_TASK_PRIORITY - 1 ), NULL );
 }
 /*-----------------------------------------------------------*/
 

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/netif.h

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -77,13 +82,13 @@ void vNetifTx( void );
  * bytes are placed in uip_buf.  The number of bytes copied into uip_buf is
  * returned.
  */
-unsigned portBASE_TYPE uxNetifRx( void );
+UBaseType_t uxNetifRx( void );
 
 /*
  * Prepare a packet capture session.  This will print out all the network 
  * interfaces available, and the one actually used is set by the 
  * configNETWORK_INTERFACE_TO_USE constant that is defined in 
  * FreeRTOSConfig.h. */
-portBASE_TYPE xNetifInit( void );
+BaseType_t xNetifInit( void );
 
 #endif /* NET_IF_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/pcap-stdinc.h

@@ -39,14 +39,13 @@
 #endif
 
 /*
- * Avoids a compiler warning in case this was already defined      
+ * Avoids a compiler warning in case this was already defined
  * (someone defined _WINSOCKAPI_ when including 'windows.h', in order
  * to prevent it from including 'winsock.h')
  */
 #ifdef _WINSOCKAPI_
 #undef _WINSOCKAPI_
 #endif
-//_RB_#include <winsock2.h>
 
 #include <fcntl.h>
 
@@ -66,7 +65,7 @@
 #define strdup _strdup
 #endif
 
-#define inline __inline 
+#define inline __inline
 
 #ifdef __MINGW32__
 #include <stdint.h>
@@ -88,6 +87,6 @@ typedef __int64    intptr_t;
 typedef _W64 int   intptr_t;
 #endif
 #define _INTPTR_T_DEFINED
-#endif 
+#endif
 
 #endif /*__MINGW32__*/

FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/main.c

@@ -1,59 +1,64 @@
 /*
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that has become a de facto standard.             *
-     *                                                                       *
-     *    Help yourself get started quickly and support the FreeRTOS         *
-     *    project by purchasing a FreeRTOS tutorial book, reference          *
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *
-     *                                                                       *
-     *    Thank you!                                                         *
-     *                                                                       *
-    ***************************************************************************
-
     This file is part of the FreeRTOS distribution.
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
     link: http://www.freertos.org/a00114.html
 
-    1 tab == 4 spaces!
-
     ***************************************************************************
      *                                                                       *
-     *    Having a problem?  Start by reading the FAQ "My application does   *
-     *    not run, what could be wrong?"                                     *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
      *                                                                       *
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
      *                                                                       *
     ***************************************************************************
 
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,
-    license and Real Time Engineers Ltd. contact details.
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
     compatible FAT file system, and our tiny thread aware UDP/IP stack.
 
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and middleware.
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
 
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety
     engineered and independently SIL3 certified version for use in safety and
@@ -103,8 +108,8 @@
 exclude. */
 #define mainCREATE_UDP_CLI_TASKS					1
 #define mainCREATE_SIMPLE_UDP_CLIENT_SERVER_TASKS	0
-#define mainCREATE_SELECT_UDP_SERVER_TASKS			1
-#define mainCREATE_UDP_ECHO_TASKS					0
+#define mainCREATE_SELECT_UDP_SERVER_TASKS			0
+#define mainCREATE_UDP_ECHO_TASKS					1
 
 /*-----------------------------------------------------------*/
 
@@ -224,7 +229,7 @@ void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent )
 {
 uint32_t ulIPAddress, ulNetMask, ulGatewayAddress, ulDNSServerAddress;
 int8_t cBuffer[ 16 ];
-static portBASE_TYPE xTasksAlreadyCreated = pdFALSE;
+static BaseType_t xTasksAlreadyCreated = pdFALSE;
 
 	if( eNetworkEvent == eNetworkUp )
 	{

FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOSConfig.h

@@ -0,0 +1,139 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+
+/*-----------------------------------------------------------
+ * Application specific definitions.
+ *
+ * These definitions should be adjusted for your particular hardware and
+ * application requirements.
+ *
+ * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
+ * http://www.freertos.org/a00110.html
+ *----------------------------------------------------------*/
+
+#define configUSE_PREEMPTION			1
+#define configUSE_IDLE_HOOK				1
+#define configUSE_TICK_HOOK				0
+#define configTICK_RATE_HZ				( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
+#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 60 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the Win32 thread. */
+#define configTOTAL_HEAP_SIZE			( ( size_t ) 0 ) /* This parameter has no effect when heap_3.c is included in the project. */
+#define configMAX_TASK_NAME_LEN			( 7 )
+#define configUSE_TRACE_FACILITY		1
+#define configUSE_16_BIT_TICKS			0
+#define configIDLE_SHOULD_YIELD			1
+#define configUSE_CO_ROUTINES 			0
+#define configUSE_MUTEXES				1
+#define configCHECK_FOR_STACK_OVERFLOW	0 /* Not applicable to the Win32 port. */
+#define configUSE_RECURSIVE_MUTEXES		1
+#define configQUEUE_REGISTRY_SIZE		0
+#define configUSE_MALLOC_FAILED_HOOK	0
+#define configUSE_APPLICATION_TASK_TAG	0
+#define configUSE_COUNTING_SEMAPHORES	1
+#define configUSE_ALTERNATIVE_API		0
+
+#define configUSE_TIMERS				1
+#define configTIMER_TASK_PRIORITY		2
+#define configTIMER_QUEUE_LENGTH		20
+#define configTIMER_TASK_STACK_DEPTH	( configMINIMAL_STACK_SIZE * 2 )
+
+#define configMAX_PRIORITIES			( 7 )
+#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
+
+
+/* Co-routine definitions. */
+#define configUSE_CO_ROUTINES 			0
+#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
+
+/* Set the following definitions to 1 to include the API function, or zero
+to exclude the API function. */
+
+#define INCLUDE_vTaskPrioritySet			1
+#define INCLUDE_uxTaskPriorityGet			1
+#define INCLUDE_vTaskDelete					1
+#define INCLUDE_vTaskCleanUpResources		0
+#define INCLUDE_vTaskSuspend				1
+#define INCLUDE_vTaskDelayUntil				1
+#define INCLUDE_vTaskDelay					1
+#define INCLUDE_uxTaskGetStackHighWaterMark	1
+#define INCLUDE_xTaskGetSchedulerState		1
+
+/* Run time stats gathering definitions. */
+#define configGENERATE_RUN_TIME_STATS	0
+
+extern void vAssertCalled( void );
+#define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled()
+
+/* The TCP port used by both the secure client and the secure server. */
+#define configTCP_PORT_NUMBER	5001
+
+#endif /* FREERTOS_CONFIG_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WIN32", "WIN32.vcxproj", "{C686325E-3261-42F7-AEB1-DDE5280E1CEB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug|Win32.Build.0 = Debug|Win32
+		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Release|Win32.ActiveCfg = Release|Win32
+		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/READ_ME.url

@@ -0,0 +1,5 @@
+[InternetShortcut]
+URL=http://www.freertos.org/FreeRTOS-Plus/WolfSSL/FreeRTOS_WolfSSL_Example.shtml
+IDList=
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2

FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/SecureTCPClientTask.c

@@ -0,0 +1,178 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+#pragma comment( lib, "ws2_32.lib" )
+
+/* Win32 includes. */
+#include <WinSock2.h>
+
+/* wolfSSL includes. */
+#include "wolfssl/ssl.h"
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/*-----------------------------------------------------------*/
+
+/* The wolfSSL context for the client. */
+static WOLFSSL_CTX* xWolfSSL_ClientContext = NULL;
+
+/*-----------------------------------------------------------*/
+
+/* See the comments at the top of main.c. */
+void vSecureTCPClientTask( void *pvParameters )
+{
+SOCKET xClientSocket;
+struct sockaddr_in xConnection;
+WOLFSSL* xWolfSSL_Object;
+WORD wVersionRequested;
+WSADATA xWSAData;
+char cString[ 50 ];
+BaseType_t lReturned;
+uint32_t ulCount = 0UL;
+
+	/* Remove compiler warning about unused parameters. */
+	( void ) pvParameters;
+
+	/* Prepare to use WinSock. */
+	wVersionRequested = MAKEWORD( 2, 2 );
+	configASSERT( WSAStartup( wVersionRequested, &xWSAData ) == 0 );
+
+	/* Set family and port for client socket. */
+	memset( ( void * ) &xConnection, 0x00, sizeof( struct sockaddr_in ) );
+	xConnection.sin_family = AF_INET;
+	xConnection.sin_addr.s_addr = inet_addr("127.0.0.1");
+	xConnection.sin_port = htons( configTCP_PORT_NUMBER );
+
+    /* Attempt to create a context that uses the TLS 1.2 server protocol. */
+    xWolfSSL_ClientContext = wolfSSL_CTX_new( wolfTLSv1_2_client_method() );
+	configASSERT( xWolfSSL_ClientContext );
+
+    /* Load the CA certificate. */
+    lReturned = wolfSSL_CTX_load_verify_locations( xWolfSSL_ClientContext, "ca-cert.pem", 0 );
+	configASSERT( lReturned == SSL_SUCCESS );
+
+	for( ;; )
+	{
+		/* Create the socket. */
+		xClientSocket = socket( AF_INET, SOCK_STREAM, 0 );
+		configASSERT( xClientSocket != INVALID_SOCKET );
+
+		/* Connect to the secure server. */
+		if( connect( xClientSocket, ( SOCKADDR * ) &xConnection, sizeof( xConnection ) ) == 0 )
+		{
+			/* The connect was successful.  Create a wolfSSL object to associate
+			with this connection. */
+			xWolfSSL_Object = wolfSSL_new( xWolfSSL_ClientContext );
+
+			if( xWolfSSL_Object != NULL )
+			{
+				/* Associate the created wolfSSL object with the connected
+				socket. */
+				lReturned = wolfSSL_set_fd( xWolfSSL_Object, xClientSocket );
+				configASSERT( lReturned == SSL_SUCCESS );
+
+				/* The count is used to differentiate between messages sent to
+				the server, and to break out of the do while loop below. */
+				ulCount = 0UL;
+
+				do
+				{
+					/* Create the string that is sent to the secure server. */
+					sprintf( cString, "Message number %lu\r\n", ulCount );
+
+					/* The next line is the secure equivalent of the standard
+					sockets call:
+					lReturned = send( xClientSocket, cString, strlen( cString ) + 1, 0 ); */
+					lReturned = wolfSSL_write( xWolfSSL_Object, cString, strlen( cString ) + 1 );
+
+
+					/* Short delay to prevent the messages streaming up the
+					console too quickly. */
+					vTaskDelay( 50 );
+					ulCount++;
+
+				} while( ( lReturned != SOCKET_ERROR ) && ( ulCount < 10UL ) );
+			}
+
+			wolfSSL_free( xWolfSSL_Object );
+			closesocket( xClientSocket );
+
+			/* Delay for a short time before starting over. */
+			vTaskDelay( 250 );
+		}
+	}
+}
+/*-----------------------------------------------------------*/
+

FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/SecureTCPServerTask.c

@@ -0,0 +1,287 @@
+/*
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
+    All rights reserved
+
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+    This file is part of the FreeRTOS distribution.
+
+    FreeRTOS is free software; you can redistribute it and/or modify it under
+    the terms of the GNU General Public License (version 2) as published by the
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
+
+    ***************************************************************************
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
+    ***************************************************************************
+
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+    link: http://www.freertos.org/a00114.html
+
+    ***************************************************************************
+     *                                                                       *
+     *    FreeRTOS provides completely free yet professionally developed,    *
+     *    robust, strictly quality controlled, supported, and cross          *
+     *    platform software that is more than just the market leader, it     *
+     *    is the industry's de facto standard.                               *
+     *                                                                       *
+     *    Help yourself get started quickly while simultaneously helping     *
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+     *    tutorial book, reference manual, or both:                          *
+     *    http://www.FreeRTOS.org/Documentation                              *
+     *                                                                       *
+    ***************************************************************************
+
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
+
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
+
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
+
+    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+    licenses offer ticketed support, indemnification and commercial middleware.
+
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+    engineered and independently SIL3 certified version for use in safety and
+    mission critical applications that require provable dependability.
+
+    1 tab == 4 spaces!
+*/
+
+#pragma comment( lib, "ws2_32.lib" )
+
+/* Win32 includes. */
+#include <WinSock2.h>
+
+/* wolfSSL includes. */
+#include "wolfssl/ssl.h"
+
+/* Standard includes. */
+#include <stdint.h>
+#include <stdio.h>
+
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* This application is using the FreeRTOS Windows simulator, which uses the
+FreeRTOS scheduler to schedule FreeRTOS task within the Windows environment.
+The Windows envrionment must not be allowed to block any Windows threads that
+are running FreeRTOS tasks, unless the FreeRTOS task is running at the FreeRTOS
+idle priority.  For simplicity, this demo uses the Windows TCP/IP stack, the
+API for which can cause Windows threads to block.  Therefore, any FreeRTOS task
+that makes calls to the Windows TCP/IP stack must be assigned the idle prioity.
+Note this is only a restriction of the simulated Windows environment - real
+FreeRTOS ports do not have this restriction. */
+#define sstSECURE_CLIENT_TASK_PRIORITY		( tskIDLE_PRIORITY )
+
+/*-----------------------------------------------------------*/
+
+/*
+ * Open, configures and binds the server's TCP socket.
+ */
+static SOCKET prvOpenServerSocket( void );
+
+/*
+ * Prepare the wolfSSL library for use.
+ */
+static void prvInitialiseWolfSSL( void );
+
+/*
+ * The task that implements the client side of the connection.
+ */
+extern void vSecureTCPClientTask( void *pvParameters );
+
+/*-----------------------------------------------------------*/
+
+/* The wolfSSL context for the server. */
+static WOLFSSL_CTX* xWolfSSL_ServerContext = NULL;
+
+/*-----------------------------------------------------------*/
+
+/* See the comments at the top of main.c. */
+void vSecureTCPServerTask( void *pvParameters )
+{
+BaseType_t xReturned;
+long lBytes;
+uint8_t cReceivedString[ 60 ];
+struct sockaddr_in xClient;
+int xClientAddressLength = sizeof( struct sockaddr_in );
+SOCKET xListeningSocket, xConnectedSocket;
+WOLFSSL* xWolfSSL_Object; /* Only one connection is accepted at a time, so only one object is needed at a time. */
+
+	/* Just to prevent compiler warnings. */
+	( void ) pvParameters;
+
+	/* Perform the initialisation necessary before wolfSSL can be used. */
+	prvInitialiseWolfSSL();
+	configASSERT( xWolfSSL_ServerContext );
+
+	/* Attempt to open the socket. */
+	xListeningSocket = prvOpenServerSocket();
+
+	/* Now the server socket has been created and the wolfSSL library has been
+	initialised, the task that implements the client side can be created. */
+	xTaskCreate( vSecureTCPClientTask, "Client", configMINIMAL_STACK_SIZE, NULL, sstSECURE_CLIENT_TASK_PRIORITY, NULL );
+
+	if( xListeningSocket != INVALID_SOCKET )
+	{
+		for( ;; )
+		{
+			/* Wait until the client connects. */
+			printf( "Waiting for new connection\r\n" );
+			xConnectedSocket = accept( xListeningSocket, ( struct sockaddr * ) &xClient, &xClientAddressLength );
+
+			if( xConnectedSocket != INVALID_SOCKET )
+			{
+				printf( "Connection established\r\n" );
+
+				/* A connection has been accepted by the server.  Create a
+				wolfSSL object for use with the newly connected socket. */
+				xWolfSSL_Object = NULL;
+				xWolfSSL_Object = wolfSSL_new( xWolfSSL_ServerContext );
+
+				if( xWolfSSL_Object != NULL )
+				{
+					/* Associate the created wolfSSL object with the connected
+					socket. */
+					xReturned = wolfSSL_set_fd( xWolfSSL_Object, xConnectedSocket );
+					configASSERT( xReturned == SSL_SUCCESS );
+
+					do
+					{
+						/* The next line is the secure equivalent to the
+						standard sockets call:
+						lBytes = recv( xConnectedSocket, cReceivedString, 50, 0 ); */
+						lBytes = wolfSSL_read( xWolfSSL_Object, cReceivedString, sizeof( cReceivedString ) );
+
+						/* Print the received characters. */
+						if( lBytes > 0 )
+						{
+							printf( "Received by the secure server: %s\r\n", cReceivedString );
+						}
+
+					} while ( lBytes > 0 );
+
+					/* The connection was closed, close the socket and free the
+					wolfSSL object. */
+					closesocket( xConnectedSocket );
+					wolfSSL_free( xWolfSSL_Object );
+					printf( "Connection closed, back to start\r\n\r\n" );
+				}
+			}
+		}
+	}
+	else
+	{
+		/* The socket could not be opened. */
+		vTaskDelete( NULL );
+	}
+}
+/*-----------------------------------------------------------*/
+
+static SOCKET prvOpenServerSocket( void )
+{
+WSADATA xWSAData;
+WORD wVersionRequested;
+struct sockaddr_in xConnection;
+SOCKET xSocket = INVALID_SOCKET;
+
+	wVersionRequested = MAKEWORD( 2, 2 );
+
+	/* Prepare to use WinSock. */
+	if( WSAStartup( wVersionRequested, &xWSAData ) != 0 )
+	{
+		fprintf( stderr, "Could not open Windows connection.\n" );
+	}
+	else
+	{
+		xSocket = socket( AF_INET, SOCK_STREAM, 0 );
+		if( xSocket == INVALID_SOCKET)
+		{
+			fprintf( stderr, "Could not create socket.\n" );
+			WSACleanup();
+		}
+		else
+		{
+			/* Zero out the server structure. */
+			memset( ( void * ) &xConnection, 0x00, sizeof( struct sockaddr_in ) );
+
+			xConnection.sin_family = AF_INET;
+			xConnection.sin_addr.s_addr = inet_addr("127.0.0.1");
+			xConnection.sin_port = htons( configTCP_PORT_NUMBER );
+
+			/* Bind the address to the socket. */
+			if( bind( xSocket, ( struct sockaddr * ) &xConnection, sizeof( struct sockaddr_in ) ) == -1 )
+			{
+				fprintf( stderr, "Could not socket to port %d.\n", configTCP_PORT_NUMBER );
+				closesocket( xSocket );
+				xSocket = INVALID_SOCKET;
+				WSACleanup();
+			}
+
+			if( listen( xSocket, 20 ) != 0 )
+			{
+				closesocket( xSocket );
+				xSocket = INVALID_SOCKET;
+				WSACleanup();
+			}
+		}
+	}
+
+	return xSocket;
+}
+/*-----------------------------------------------------------*/
+
+static void prvInitialiseWolfSSL( void )
+{
+int32_t iReturn;
+
+	#ifdef DEBUG_WOLFSSL
+	{
+		wolfSSL_Debugging_ON();
+	}
+	#endif
+
+    /* Initialise wolfSSL.  This must be done before any other wolfSSL functions
+    are called. */
+    wolfSSL_Init();
+
+    /* Attempt to create a context that uses the TLS 1.2 server protocol. */
+    xWolfSSL_ServerContext = wolfSSL_CTX_new( wolfTLSv1_2_server_method() );
+
+    if( xWolfSSL_ServerContext != NULL )
+    {
+        /* Load the CA certificate.  Real applications should ensure that
+        wolfSSL_CTX_load_verify_locations() returns SSL_SUCCESS before
+		proceeding. */
+        iReturn = wolfSSL_CTX_load_verify_locations( xWolfSSL_ServerContext, "ca-cert.pem", 0 );
+		configASSERT( iReturn == SSL_SUCCESS );
+
+		iReturn = wolfSSL_CTX_use_certificate_file( xWolfSSL_ServerContext, "server-cert.pem", SSL_FILETYPE_PEM );
+		configASSERT( iReturn == SSL_SUCCESS );
+
+		iReturn = wolfSSL_CTX_use_PrivateKey_file( xWolfSSL_ServerContext, "server-key.pem", SSL_FILETYPE_PEM );
+		configASSERT( iReturn == SSL_SUCCESS );
+    }
+}
+