diff options
Diffstat (limited to 'FreeRTOS/Demo/CORTEX_LM3S102_GCC')
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h | 2 | ||||
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c | 14 | ||||
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h | 2 | ||||
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c | 14 | ||||
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h | 2 | ||||
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c | 14 |
6 files changed, 24 insertions, 24 deletions
diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h index 04e93be5b..4599461c2 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h @@ -82,7 +82,7 @@ #define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ( unsigned long ) 20000000 )
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
+#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 59 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 1468 ) )
#define configMAX_TASK_NAME_LEN ( 3 )
diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c index ab50844e7..fbcc02509 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/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. */
diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h index b58c698f7..76f328af4 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h @@ -82,7 +82,7 @@ #define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ( unsigned long ) 20000000 )
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
+#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 59 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 1240 ) )
#define configMAX_TASK_NAME_LEN ( 3 )
diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c index 79f462333..84307e1cd 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/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 )
@@ -144,9 +144,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
@@ -248,7 +248,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;
/*-----------------------------------------------------------*/
@@ -438,7 +438,7 @@ portBASE_TYPE xResult; 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. */
diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h index cbe69990f..beec118f5 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h @@ -82,7 +82,7 @@ #define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ( unsigned long ) 20000000 )
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
+#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 59 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 1468 ) )
#define configMAX_TASK_NAME_LEN ( 3 )
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. */
|