len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-19 17:48:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update the demo directory to use the version 8 type naming conventions.

Browse source
This commit is contained in:
Richard Barry 2014-02-11 12:04:59 +00:00
parent c6d8892b0d
commit 5a2a8fc319
639 changed files with 3127 additions and 3470 deletions
Download patch file Download diff file Expand all files Collapse all files

8
FreeRTOS/Demo/PIC18_WizC/Demo1/main.c
View file

@ -96,7 +96,7 @@ Changes from V3.0.1
#include <FreeRTOS.h>
#include <task.h>
#define mainBLINK_LED_INTERVAL ( ( portTickType ) 100 / ( portTICK_RATE_MS ) )
#define mainBLINK_LED_INTERVAL ( ( TickType_t ) 100 / ( portTICK_PERIOD_MS ) )
/* The LED that is flashed by the B0 task. */
#define mainBLINK_LED0_PORT LATD
@ -150,7 +150,7 @@ typedef struct {
unsigned char *port;
unsigned char *tris;
unsigned char pin;
portTickType interval;
TickType_t interval;
} SBLINK;
const SBLINK sled0 = {&mainBLINK_LED0_PORT, &mainBLINK_LED0_TRIS, mainBLINK_LED0_PIN, mainBLINK_LED0_INTERVAL};
@ -202,9 +202,9 @@ static portTASK_FUNCTION(vBlink, pvParameters)
unsigned char *Port = ((SBLINK *)pvParameters)->port;
unsigned char *Tris = ((SBLINK *)pvParameters)->tris;
unsigned char Pin = ((SBLINK *)pvParameters)->pin;
portTickType Interval = ((SBLINK *)pvParameters)->interval;
TickType_t Interval = ((SBLINK *)pvParameters)->interval;
portTickType xLastWakeTime;
TickType_t xLastWakeTime;
/*
* Initialize the hardware

10
FreeRTOS/Demo/PIC18_WizC/Demo2/main.c
View file

@ -113,8 +113,8 @@ Changes from V3.0.1
/* The period between executions of the check task before and after an error
has been discovered. If an error has been discovered the check task runs
more frequently - increasing the LED flash rate. */
#define mainNO_ERROR_CHECK_PERIOD ( ( portTickType ) 10000 / portTICK_RATE_MS )
#define mainERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS )
#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 10000 / portTICK_PERIOD_MS )
#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS )
#define mainCHECK_TASK_LED ( ( unsigned char ) 3 )
/* Priority definitions for some of the tasks. Other tasks just use the idle
@ -128,7 +128,7 @@ priority. */
/* Constants required for the communications. Only one character is ever
transmitted. */
#define mainCOMMS_QUEUE_LENGTH ( ( unsigned char ) 5 )
#define mainNO_BLOCK ( ( portTickType ) 0 )
#define mainNO_BLOCK ( ( TickType_t ) 0 )
#define mainBAUD_RATE ( ( unsigned long ) 57600 )
/*
@ -174,8 +174,8 @@ void main( void )
static portTASK_FUNCTION( vErrorChecks, pvParameters )
{
portTickType xLastCheckTime;
portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD;
TickType_t xLastCheckTime;
TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD;
char cErrorOccurred;
/* We need to initialise xLastCheckTime prior to the first call to

10
FreeRTOS/Demo/PIC18_WizC/Demo3/main.c
View file

@ -111,8 +111,8 @@ Changes from V3.0.1
/* The period between executions of the check task before and after an error
has been discovered. If an error has been discovered the check task runs
more frequently - increasing the LED flash rate. */
#define mainNO_ERROR_CHECK_PERIOD ( ( portTickType ) 10000 / portTICK_RATE_MS )
#define mainERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS )
#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 10000 / portTICK_PERIOD_MS )
#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS )
#define mainCHECK_TASK_LED ( ( unsigned char ) 3 )
/* Priority definitions for some of the tasks. Other tasks just use the idle
@ -125,7 +125,7 @@ priority. */
/* Constants required for the communications. Only one character is ever
transmitted. */
#define mainCOMMS_QUEUE_LENGTH ( ( unsigned char ) 5 )
#define mainNO_BLOCK ( ( portTickType ) 0 )
#define mainNO_BLOCK ( ( TickType_t ) 0 )
#define mainBAUD_RATE ( ( unsigned long ) 57600 )
/*
@ -170,8 +170,8 @@ void main( void )
static portTASK_FUNCTION( vErrorChecks, pvParameters )
{
portTickType xLastCheckTime;
portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD;
TickType_t xLastCheckTime;
TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD;
char cErrorOccurred;
/* We need to initialise xLastCheckTime prior to the first call to

10
FreeRTOS/Demo/PIC18_WizC/Demo4/main.c
View file

@ -111,8 +111,8 @@ Changes from V3.0.1
/* The period between executions of the check task before and after an error
has been discovered. If an error has been discovered the check task runs
more frequently - increasing the LED flash rate. */
#define mainNO_ERROR_CHECK_PERIOD ( ( portTickType ) 10000 / portTICK_RATE_MS )
#define mainERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS )
#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 10000 / portTICK_PERIOD_MS )
#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS )
#define mainCHECK_TASK_LED ( ( unsigned char ) 3 )
/* Priority definitions for some of the tasks. Other tasks just use the idle
@ -124,7 +124,7 @@ priority. */
/* Constants required for the communications. Only one character is ever
transmitted. */
#define mainCOMMS_QUEUE_LENGTH ( ( unsigned char ) 5 )
#define mainNO_BLOCK ( ( portTickType ) 0 )
#define mainNO_BLOCK ( ( TickType_t ) 0 )
#define mainBAUD_RATE ( ( unsigned long ) 57600 )
/*
@ -169,8 +169,8 @@ void main( void )
static portTASK_FUNCTION( vErrorChecks, pvParameters )
{
portTickType xLastCheckTime;
portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD;
TickType_t xLastCheckTime;
TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD;
char cErrorOccurred;
/* We need to initialise xLastCheckTime prior to the first call to

10
FreeRTOS/Demo/PIC18_WizC/Demo5/main.c
View file

@ -109,8 +109,8 @@ Changes from V3.0.1
/* The period between executions of the check task before and after an error
has been discovered. If an error has been discovered the check task runs
more frequently - increasing the LED flash rate. */
#define mainNO_ERROR_CHECK_PERIOD ( ( portTickType ) 10000 / portTICK_RATE_MS )
#define mainERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS )
#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 10000 / portTICK_PERIOD_MS )
#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS )
#define mainCHECK_TASK_LED ( ( unsigned char ) 3 )
/* Priority definitions for some of the tasks. Other tasks just use the idle
@ -121,7 +121,7 @@ priority. */
/* Constants required for the communications. Only one character is ever
transmitted. */
#define mainCOMMS_QUEUE_LENGTH ( ( unsigned char ) 5 )
#define mainNO_BLOCK ( ( portTickType ) 0 )
#define mainNO_BLOCK ( ( TickType_t ) 0 )
#define mainBAUD_RATE ( ( unsigned long ) 57600 )
/*
@ -165,8 +165,8 @@ void main( void )
static portTASK_FUNCTION( vErrorChecks, pvParameters )
{
portTickType xLastCheckTime;
portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD;
TickType_t xLastCheckTime;
TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD;
char cErrorOccurred;
/* We need to initialise xLastCheckTime prior to the first call to

8
FreeRTOS/Demo/PIC18_WizC/Demo6/main.c
View file

@ -104,8 +104,8 @@ Changes from V3.0.1
/* The period between executions of the check task before and after an error
has been discovered. If an error has been discovered the check task runs
more frequently - increasing the LED flash rate. */
#define mainNO_ERROR_CHECK_PERIOD ( ( portTickType ) 10000 / portTICK_RATE_MS )
#define mainERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS )
#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 10000 / portTICK_PERIOD_MS )
#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS )
#define mainCHECK_TASK_LED ( ( unsigned char ) 3 )
/* Priority definitions for some of the tasks. Other tasks just use the idle
@ -156,8 +156,8 @@ void main( void )
static portTASK_FUNCTION( vErrorChecks, pvParameters )
{
portTickType xLastCheckTime;
portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD;
TickType_t xLastCheckTime;
TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD;
char cErrorOccurred;
/* We need to initialise xLastCheckTime prior to the first call to

10
FreeRTOS/Demo/PIC18_WizC/Demo7/main.c
View file

@ -110,8 +110,8 @@ Changes from V3.0.1
/* The period between executions of the check task before and after an error
has been discovered. If an error has been discovered the check task runs
more frequently - increasing the LED flash rate. */
#define mainNO_ERROR_CHECK_PERIOD ( ( portTickType ) 10000 / portTICK_RATE_MS )
#define mainERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS )
#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 10000 / portTICK_PERIOD_MS )
#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS )
#define mainCHECK_TASK_LED ( ( unsigned char ) 3 )
/* Priority definitions for some of the tasks. Other tasks just use the idle
@ -123,7 +123,7 @@ priority. */
/* Constants required for the communications. Only one character is ever
transmitted. */
#define mainCOMMS_QUEUE_LENGTH ( ( unsigned char ) 5 )
#define mainNO_BLOCK ( ( portTickType ) 0 )
#define mainNO_BLOCK ( ( TickType_t ) 0 )
#define mainBAUD_RATE ( ( unsigned long ) 57600 )
/*
@ -170,8 +170,8 @@ void main( void )
static portTASK_FUNCTION( vErrorChecks, pvParameters )
{
portTickType xLastCheckTime;
portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD;
TickType_t xLastCheckTime;
TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD;
char cErrorOccurred;
/* We need to initialise xLastCheckTime prior to the first call to

2
FreeRTOS/Demo/PIC18_WizC/serial/isrSerialRx.c
View file

@ -91,7 +91,7 @@ Changes from V3.0.1
/*
* Queue to interface between comms API and interrupt routine.
*/
extern xQueueHandle xRxedChars;
extern QueueHandle_t xRxedChars;
/*
* Because we are not allowed to use local variables here,

2
FreeRTOS/Demo/PIC18_WizC/serial/isrSerialTx.c
View file

@ -91,7 +91,7 @@ Changes from V3.0.1
/*
* Queue to interface between comms API and interrupt routine.
*/
extern xQueueHandle xCharsForTx;
extern QueueHandle_t xCharsForTx;
/*
* Because we are not allowed to use local variables here,

8
FreeRTOS/Demo/PIC18_WizC/serial/serial.c
View file

@ -94,8 +94,8 @@ Changes from V3.0.1
/*-----------------------------------------------------------*/
/* Queues to interface between comms API and interrupt routines. */
xQueueHandle xRxedChars;
xQueueHandle xCharsForTx;
QueueHandle_t xRxedChars;
QueueHandle_t xCharsForTx;
portBASE_TYPE xHigherPriorityTaskWoken;
/*-----------------------------------------------------------*/
@ -174,7 +174,7 @@ xComPortHandle xSerialPortInit( eCOMPort ePort, eBaud eWantedBaud, eParity eWant
}
/*-----------------------------------------------------------*/
portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickType xBlockTime )
portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, TickType_t xBlockTime )
{
/* Get the next character from the buffer. Return false if no characters
are available, or arrive before xBlockTime expires. */
@ -187,7 +187,7 @@ portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickT
}
/*-----------------------------------------------------------*/
portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType xBlockTime )
portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, TickType_t xBlockTime )
{
/* Return false if after the block time there is no room on the Tx queue. */
if( xQueueSend( xCharsForTx, ( const void * ) &cOutChar, xBlockTime ) != ( char ) pdPASS )