X-Git-Url: https://git.sur5r.net/?p=freertos;a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCORTEX_LM3S102_GCC%2Fmain.c;h=fbcc02509c09ee872bebb14acc5143a49cd26be0;hp=ab50844e7e7c912eefdbe33d0c3d60f14b48a1c1;hb=4441dfe80ba8985120b03011669248c16341c033;hpb=b64f63efd1feb40e0ee2d41e041dacc305a7ad82 diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c index ab50844e7..fbcc02509 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c @@ -119,10 +119,10 @@ #include "DriverLib.h" /* The time to delay between writing each character to the LCD. */ -#define mainCHAR_WRITE_DELAY ( 2 / portTICK_RATE_MS ) +#define mainCHAR_WRITE_DELAY ( 2 / portTICK_PERIOD_MS ) /* The time to delay between writing each string to the LCD. */ -#define mainSTRING_WRITE_DELAY ( 400 / portTICK_RATE_MS ) +#define mainSTRING_WRITE_DELAY ( 400 / portTICK_PERIOD_MS ) /* The number of flash co-routines to create. */ #define mainNUM_FLASH_CO_ROUTINES ( 5 ) @@ -140,9 +140,9 @@ string on UART 0. */ /* The time between transmissions of the string on UART 0. This is pseudo random in order to generate a bit or randomness to when the interrupts occur.*/ -#define mainMIN_TX_DELAY ( 40 / portTICK_RATE_MS ) -#define mainMAX_TX_DELAY ( ( portTickType ) 0x7f ) -#define mainOFFSET_TIME ( ( portTickType ) 3 ) +#define mainMIN_TX_DELAY ( 40 / portTICK_PERIOD_MS ) +#define mainMAX_TX_DELAY ( ( TickType_t ) 0x7f ) +#define mainOFFSET_TIME ( ( TickType_t ) 3 ) /* The time the Comms Rx task should wait to receive a character. This should be slightly longer than the time between transmissions. If we do not receive @@ -244,7 +244,7 @@ static char cNextChar; /* The queue used to transmit characters from the interrupt to the Comms Rx task. */ -static xQueueHandle xCommsQueue; +static QueueHandle_t xCommsQueue; /*-----------------------------------------------------------*/ @@ -430,7 +430,7 @@ static char cRxedChar, cExpectedChar; static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { -portTickType xDelayPeriod; +TickType_t xDelayPeriod; static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES; /* Co-routine MUST start with a call to crSTART. */