From 4c4a171cb817e52f4e9c57c314f039df5b65efa3 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Fri, 16 Aug 2013 13:31:54 +0000 Subject: [PATCH] Fix a few typos and remove the "register" keyword. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2004 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- FreeRTOS/Demo/CORTEX_EFMG890F128_IAR/main.c | 2 +- .../RTOSDemo/RunTimeStatsTimer.c | 6 +++--- FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c | 2 +- FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c | 2 +- FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c | 2 +- FreeRTOS/Source/tasks.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_EFMG890F128_IAR/main.c b/FreeRTOS/Demo/CORTEX_EFMG890F128_IAR/main.c index decaa812f..be0295333 100644 --- a/FreeRTOS/Demo/CORTEX_EFMG890F128_IAR/main.c +++ b/FreeRTOS/Demo/CORTEX_EFMG890F128_IAR/main.c @@ -161,7 +161,7 @@ int main( void ) xTaskCreate( vLCDTask, "LCD", configMINIMAL_STACK_SIZE, NULL, mainLCD_TASK_PRIORITY, NULL ); /* Create a task that writes to LEDs 8 to 15. */ - xTaskCreate( vLEDTask, "LCDTask", configMINIMAL_STACK_SIZE, NULL, mainLED_TASK_PRIORITY, NULL ); + xTaskCreate( vLEDTask, "LEDTask", configMINIMAL_STACK_SIZE, NULL, mainLED_TASK_PRIORITY, NULL ); /* Create some of the standard demo tasks. These just test the port and demonstrate how the FreeRTOS API can be used. They do not provide any diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/RunTimeStatsTimer.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/RunTimeStatsTimer.c index 49f8cf889..faa3d4347 100644 --- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/RunTimeStatsTimer.c +++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/RunTimeStatsTimer.c @@ -71,9 +71,9 @@ more information on run time stats: http://www.freertos.org/rtos-run-time-stats.html */ /* Addresses of registers in the Cortex-M debug hardware. */ -#define rtsDWT_CYCCNT ( *( ( unsigned long * ) 0xE0001004 ) ) -#define rtsDWT_CONTROL ( *( ( unsigned long * ) 0xE0001000 ) ) -#define rtsSCB_DEMCR ( *( ( unsigned long * ) 0xE000EDFC ) ) +#define rtsDWT_CYCCNT ( *( ( volatile unsigned long * ) 0xE0001004 ) ) +#define rtsDWT_CONTROL ( *( ( volatile unsigned long * ) 0xE0001000 ) ) +#define rtsSCB_DEMCR ( *( ( volatile unsigned long * ) 0xE000EDFC ) ) #define rtsTRCENA_BIT ( 0x01000000UL ) #define rtsCOUNTER_ENABLE_BIT ( 0x01UL ) diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c index 7cf1e00d1..3cdd25b30 100644 --- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c +++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c @@ -101,7 +101,7 @@ #define portNVIC_PENDSV_PRI ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 16UL ) #define portNVIC_SYSTICK_PRI ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 24UL ) -/* Constants required to check the validity of an interrupt prority. */ +/* Constants required to check the validity of an interrupt priority. */ #define portFIRST_USER_INTERRUPT_NUMBER ( 16 ) #define portNVIC_IP_REGISTERS_OFFSET_16 ( 0xE000E3F0 ) #define portAIRCR_REG ( * ( ( volatile unsigned long * ) 0xE000ED0C ) ) diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c index 7877cd928..e37830a55 100644 --- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c +++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c @@ -107,7 +107,7 @@ is defined. */ #define portNVIC_PENDSV_PRI ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 16UL ) #define portNVIC_SYSTICK_PRI ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 24UL ) -/* Constants required to check the validity of an interrupt prority. */ +/* Constants required to check the validity of an interrupt priority. */ #define portFIRST_USER_INTERRUPT_NUMBER ( 16 ) #define portNVIC_IP_REGISTERS_OFFSET_16 ( 0xE000E3F0 ) #define portAIRCR_REG ( * ( ( volatile unsigned long * ) 0xE000ED0C ) ) diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c index 8abc48baf..eb536a209 100644 --- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c +++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c @@ -107,7 +107,7 @@ is defined. */ #define portNVIC_PENDSV_PRI ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 16UL ) #define portNVIC_SYSTICK_PRI ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 24UL ) -/* Constants required to check the validity of an interrupt prority. */ +/* Constants required to check the validity of an interrupt priority. */ #define portFIRST_USER_INTERRUPT_NUMBER ( 16 ) #define portNVIC_IP_REGISTERS_OFFSET_16 ( 0xE000E3F0 ) #define portAIRCR_REG ( * ( ( volatile unsigned long * ) 0xE000ED0C ) ) diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c index 7406d673c..417ccd42a 100644 --- a/FreeRTOS/Source/tasks.c +++ b/FreeRTOS/Source/tasks.c @@ -2529,7 +2529,7 @@ tskTCB *pxNewTCB; static unsigned short prvTaskCheckFreeStackSpace( const unsigned char * pucStackByte ) { - register unsigned short usCount = 0U; + unsigned short usCount = 0U; while( *pucStackByte == tskSTACK_FILL_BYTE ) { -- 2.39.5