summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCobus van Eeden <35851496+cobusve@users.noreply.github.com>2020-09-08 20:51:54 -0700
committerCobus van Eeden <35851496+cobusve@users.noreply.github.com>2020-09-08 20:51:54 -0700
commitc0df730de73474b72d2e085d57c0b2ed01c3178a (patch)
tree18b7b610ba5f743c8095521a1f1877749eb39806
parent8ada8156e0d98c2fe48f21e3fdea121380b72012 (diff)
downloadfreertos-git-c0df730de73474b72d2e085d57c0b2ed01c3178a.tar.gz
Various small formatting and wording changes in Linux demo
-rw-r--r--FreeRTOS/Demo/Posix_GCC/main.c34
-rw-r--r--FreeRTOS/Demo/Posix_GCC/main_blinky.c8
-rw-r--r--FreeRTOS/Demo/Posix_GCC/main_full.c6
-rw-r--r--FreeRTOS/Demo/Posix_GCC/main_networking.c2
4 files changed, 24 insertions, 26 deletions
diff --git a/FreeRTOS/Demo/Posix_GCC/main.c b/FreeRTOS/Demo/Posix_GCC/main.c
index 23d2a2137..11a5290e1 100644
--- a/FreeRTOS/Demo/Posix_GCC/main.c
+++ b/FreeRTOS/Demo/Posix_GCC/main.c
@@ -27,19 +27,18 @@
/******************************************************************************
* This project provides three demo applications. A simple blinky style project,
- * a more comprehensive test and demo application, and a TCP echo application.
+ * a more comprehensive test and demo application, and a TCP echo demo.
* The mainSELECTED_APPLICATION setting is used to select between
* the three
*
- * if mainSELECTED_APPLICATION is BLINKY_DEMO.
+ * If mainSELECTED_APPLICATION = BLINKY_DEMO the simple blinky demo will be built.
* The simply blinky demo is implemented and described in main_blinky.c.
*
- * The more comprehensive test and demo application is implemented
- * and described in main_full.c and activated by
- * setting mainSELECTED_APPLICATION FULL_DEMO.
+ * If mainSELECTED_APPLICATION = FULL_DEMO the more comprehensive test and demo
+ * application built. This is implemented and described in main_full.c.
*
- * The ECHO_CLIENT_DEMO setting is used to select the tcp echo
- * application implemeted in main_networking.c
+ * If mainSELECTED_APPLICATION = ECHO_CLIENT_DEMO the tcp echo demo will be built.
+ * This is implemented and described in main_networking.c
*
* This file implements the code that is not demo specific, including the
* hardware setup and FreeRTOS hook functions.
@@ -156,10 +155,10 @@ int main( void )
console_print("Starting full demo\n");
main_full();
}
- #else
- {
- #error "The selected demo is not valid"
- }
+ #else
+ {
+ #error "The selected demo is not valid"
+ }
#endif /* if ( mainSELECTED_APPLICATION ) */
@@ -195,15 +194,14 @@ void vApplicationIdleHook( void )
vTaskDelete() API function to delete themselves then it is also important
that vApplicationIdleHook() is permitted to return to its calling function,
because it is the responsibility of the idle task to clean up memory
- allocated by the kernel to any task that has since deleted itself. */
+ allocated by the kernel to any task that has since deleted itself. */
- sleep( 1 );
#if ( mainSELECTED_APPLICATION == FULL_DEMO )
{
/* Call the idle task processing used by the full demo. The simple
blinky demo does not use the idle task hook. */
- /* vFullDemoIdleFunction(); */
+ vFullDemoIdleFunction();
}
#endif
}
@@ -233,9 +231,9 @@ void vApplicationTickHook( void )
functions can be used (those that end in FromISR()). */
#if (mainSELECTED_APPLICATION == FULL_DEMO )
- {
+ {
vFullDemoTickHookFunction();
- }
+ }
#endif /* mainSELECTED_APPLICATION */
}
@@ -291,8 +289,8 @@ volatile uint32_t ulSetToNonZeroInDebuggerToContinue = 0;
value. */
while( ulSetToNonZeroInDebuggerToContinue == 0 )
{
- __asm volatile ( "NOP" );
- __asm volatile ( "NOP" );
+ __asm volatile ( "NOP" );
+ __asm volatile ( "NOP" );
}
}
taskEXIT_CRITICAL();
diff --git a/FreeRTOS/Demo/Posix_GCC/main_blinky.c b/FreeRTOS/Demo/Posix_GCC/main_blinky.c
index 5e5c31f0a..168dc3d76 100644
--- a/FreeRTOS/Demo/Posix_GCC/main_blinky.c
+++ b/FreeRTOS/Demo/Posix_GCC/main_blinky.c
@@ -30,7 +30,7 @@
* this demo application. Also, the timing information in the FreeRTOS+Trace
* logs have no meaningful units. See the documentation page for the Linux
* port for further information:
- * https://freertos-wordpress.corp.amazon.com/FreeRTOS-simulator-for-Linux.html
+ * https://freertos.org/FreeRTOS-simulator-for-Linux.html
*
* NOTE 2: This project provides two demo applications. A simple blinky style
* project, and a more comprehensive test and demo application. The
@@ -75,9 +75,9 @@
* data was received on the queue from the queue send software timer.
*
* NOTE: Console input and output relies on Linux system calls, which can
- * interfere with the execution of the FreeRTOS Linux port. This demo only
- * uses Linux system call occasionally. Heavier use of Linux system calls
- * can crash the port.
+ * interfere with the execution of the FreeRTOS Linux port. This demo only
+ * uses Linux system call occasionally. Heavier use of Linux system calls
+ * may crash the port.
*/
#include <stdio.h>
diff --git a/FreeRTOS/Demo/Posix_GCC/main_full.c b/FreeRTOS/Demo/Posix_GCC/main_full.c
index db3049222..9a38f121d 100644
--- a/FreeRTOS/Demo/Posix_GCC/main_full.c
+++ b/FreeRTOS/Demo/Posix_GCC/main_full.c
@@ -27,8 +27,8 @@
/*
*******************************************************************************
- * NOTE 1: The Win32 port is a simulation (or is that emulation?) only! Do not
- * expect to get real time behaviour from the Win32 port or this demo
+ * NOTE 1: The Linux port is a simulation (or is that emulation?) only! Do not
+ * expect to get real time behaviour from the Linux port or this demo
* application. It is provided as a convenient development and demonstration
* test bed only.
*
@@ -224,7 +224,7 @@ int main_full( void )
vStartMessageBufferTasks( configMINIMAL_STACK_SIZE );
/* vStartStreamBufferTasks(); */
/* vStartStreamBufferInterruptDemo(); */
- vStartMessageBufferAMPTasks( configMINIMAL_STACK_SIZE );
+ /* vStartMessageBufferAMPTasks( configMINIMAL_STACK_SIZE ); */
#if( configSUPPORT_STATIC_ALLOCATION == 1 )
{
diff --git a/FreeRTOS/Demo/Posix_GCC/main_networking.c b/FreeRTOS/Demo/Posix_GCC/main_networking.c
index edb589720..373e96e56 100644
--- a/FreeRTOS/Demo/Posix_GCC/main_networking.c
+++ b/FreeRTOS/Demo/Posix_GCC/main_networking.c
@@ -158,7 +158,7 @@ const uint32_t ulLongTime_ms = pdMS_TO_TICKS( 1000UL );
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). */
+ really applicable to the Linux simulator port). */
for( ; ; )
{
usleep( ulLongTime_ms * 1000 );