Skip to content

Commit

Permalink
Various small formatting and wording changes in Linux demo
Browse files Browse the repository at this point in the history
  • Loading branch information
cobusve committed Sep 9, 2020
1 parent 8ada815 commit c0df730
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 26 deletions.
34 changes: 16 additions & 18 deletions FreeRTOS/Demo/Posix_GCC/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 ) */

Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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 */
}

Expand Down Expand Up @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions FreeRTOS/Demo/Posix_GCC/main_blinky.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions FreeRTOS/Demo/Posix_GCC/main_full.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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 )
{
Expand Down
2 changes: 1 addition & 1 deletion FreeRTOS/Demo/Posix_GCC/main_networking.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down

0 comments on commit c0df730

Please sign in to comment.