From 138156046589085d022b309a15ce5e35ae3269fd Mon Sep 17 00:00:00 2001 From: rtel Date: Sun, 29 Dec 2013 14:49:03 +0000 Subject: [PATCH] Replace use of legacy portTYPE macros from old demos and standard demo files. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2148 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c | 16 +++--- .../RTOSDemo/ParTest/ParTest.c | 16 +++--- .../Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c | 30 +++++----- .../RTOSDemo/webserver/uIP_Task.c | 6 +- .../ARM7_LPC2368_Rowley/webserver/uIP_Task.c | 6 +- FreeRTOS/Demo/AVR32_UC3/ParTest/ParTest.c | 16 +++--- FreeRTOS/Demo/AVR32_UC3/main.c | 14 ++--- FreeRTOS/Demo/AVR32_UC3/serial/serial.c | 22 ++++---- .../Source/Full-Demo/serial.c | 4 +- .../FreeRTOS_Demo.cydsn/TimerTest.c | 4 +- .../FreeRTOS_Demo.cydsn/main.c | 4 +- .../FreeRTOS_Demo.cydsn/TimerTest.c | 4 +- .../FreeRTOS_Demo.cydsn/main.c | 4 +- .../FreeRTOS_Demo.cydsn/TimerTest.c | 4 +- .../FreeRTOS_Demo.cydsn/main.c | 4 +- .../webserver/EMAC.c | 4 +- FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c | 4 +- FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c | 8 +-- FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c | 4 +- .../Demo/CORTEX_LM3S102_Rowley/Demo1/main.c | 4 +- .../Demo/CORTEX_LM3S102_Rowley/Demo2/main.c | 8 +-- .../Demo/CORTEX_LM3S102_Rowley/Demo3/main.c | 8 +-- FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.c | 2 +- FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.h | 2 +- FreeRTOS/Demo/CORTEX_LM3S316_IAR/main.c | 4 +- FreeRTOS/Demo/CORTEX_LM3S811_GCC/main.c | 16 +++--- FreeRTOS/Demo/CORTEX_LM3S811_IAR/main.c | 16 +++--- .../CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c | 24 ++++---- .../RTOSDemo/timertest.c | 10 ++-- .../RTOSDemo/webserver/emac.c | 28 +++++----- .../RTOSDemo/webserver/uIP_Task.c | 6 +- FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c | 24 ++++---- .../Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c | 10 ++-- .../CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c | 30 +++++----- .../webserver/uIP_Task.c | 8 +-- .../FreeRTOSConfig.h | 4 +- .../Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c | 2 +- .../ParTest/ParTest_ST_Eval.c | 8 +-- .../CORTEX_STM32F103_IAR/ParTest/ParTest.c | 8 +-- FreeRTOS/Demo/CORTEX_STM32F103_IAR/main.c | 20 +++---- .../Demo/CORTEX_STM32F103_IAR/serial/serial.c | 18 +++--- .../Demo/CORTEX_STM32F103_IAR/timertest.c | 12 ++-- .../CORTEX_STM32F103_Keil/ParTest/ParTest.c | 8 +-- FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c | 20 +++---- .../CORTEX_STM32F103_Keil/serial/serial.c | 18 +++--- .../Demo/CORTEX_STM32F103_Keil/timertest.c | 12 ++-- .../ParTest/ParTest.c | 8 +-- .../Demo/CORTEX_STM32F103_Primer_GCC/main.c | 18 +++--- .../CORTEX_STM32F103_Primer_GCC/timertest.c | 12 ++-- FreeRTOS/Demo/CORTEX_STM32L152_IAR/serial.c | 18 +++--- .../sources/FreeRTOS_Tick_Setup.c | 4 +- .../sources/main.c | 8 +-- .../sources/serial/serial.c | 34 +++++------ .../RTOSDemo/FreeRTOS_Tick_Setup.c | 4 +- .../RTOSDemo/ParTest/ParTest.c | 2 +- .../ColdFire_MCF52233_Eclipse/RTOSDemo/main.c | 8 +-- .../RTOSDemo/webserver/FEC.c | 56 +++++++++---------- .../FreeRTOS_Tick_Setup.c | 4 +- .../ColdFire_MCF52259_CodeWarrior/HTTPDemo.c | 8 +-- .../Demo/ColdFire_MCF52259_CodeWarrior/main.c | 6 +- .../RTOSDemo/FreeRTOS_Tick_Setup.c | 4 +- .../RTOSDemo/IntQueueTimer.c | 4 +- .../RTOSDemo/ParTest/ParTest.c | 6 +- .../ColdFire_MCF5282_Eclipse/RTOSDemo/main.c | 8 +-- .../RTOSDemo/serial/serial.c | 38 ++++++------- FreeRTOS/Demo/Common/Minimal/AltBlckQ.c | 32 +++++------ FreeRTOS/Demo/Common/Minimal/AltBlock.c | 8 +-- FreeRTOS/Demo/Common/Minimal/AltPollQ.c | 16 +++--- FreeRTOS/Demo/Common/Minimal/AltQTest.c | 20 +++---- .../Demo/Common/Minimal/EventGroupsDemo.c | 16 +++--- FreeRTOS/Demo/Common/Minimal/GenQTest.c | 20 +++---- FreeRTOS/Demo/Common/Minimal/IntQueue.c | 4 +- FreeRTOS/Demo/Common/Minimal/QPeek.c | 18 +++--- FreeRTOS/Demo/Common/Minimal/countsem.c | 4 +- FreeRTOS/Demo/Common/Minimal/crflash.c | 8 +-- FreeRTOS/Demo/Common/Minimal/crhook.c | 4 +- .../lwIP_130/src/netif/stf91x_ethernetif.c | 2 +- .../MB91460_Softune/SRC/crflash_modified.c | 8 +-- FreeRTOS/Demo/MB91460_Softune/SRC/main.c | 12 ++-- .../MB91460_Softune/SRC/partest/partest.c | 4 +- .../Demo/MB91460_Softune/SRC/serial/serial.c | 16 +++--- .../MB91460_Softune/SRC/utility/taskutility.c | 16 +++--- .../MB91460_Softune/SRC/watchdog/watchdog.c | 2 +- .../Src/crflash_sk16fx100mpc.c | 8 +-- .../Src/partest/partest.c | 4 +- .../Src/serial/serial.c | 18 +++--- .../Src/utility/taskutility.c | 18 +++--- .../ParTest/ParTest.c | 2 +- .../SegmentToggleTasks.c | 4 +- .../Demo_Source/serial.c | 12 ++-- .../Demo/MSP430X_MSP430F5438_IAR/serial.c | 16 +++--- FreeRTOS/Demo/NEC_78K0R_IAR/main.c | 8 +-- .../LowLevelInit/LowLevelInit.c | 8 +-- .../LowLevelInit/LowLevelInit_Fx3.c | 8 +-- .../LowLevelInit/LowLevelInit_Hx2.c | 6 +- FreeRTOS/Demo/NEC_V850ES_IAR/main.c | 2 +- FreeRTOS/Demo/NEC_V850ES_IAR/serial/serial.c | 20 +++---- FreeRTOS/Demo/PIC24_MPLAB/lcd.c | 10 ++-- FreeRTOS/Demo/PIC24_MPLAB/timertest.c | 12 ++-- .../RTOSDemo/flop/flop-reg-test.c | 6 +- .../RTOSDemo/flop/flop.c | 30 +++++----- .../RTOSDemo/main.c | 10 ++-- .../RTOSDemo/serial/serial.c | 16 +++--- .../RTOSDemo/flop/flop-reg-test.c | 6 +- .../RTOSDemo/flop/flop.c | 30 +++++----- .../PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c | 10 ++-- .../RTOSDemo/serial/serial.c | 16 +++--- .../src/FreeRTOS_Source/include/croutine.h | 36 ++++++------ .../portable/GCC/RL78/portmacro.h | 2 +- .../Demo/RL78_RL78G13_Promo_Board_IAR/main.c | 2 +- FreeRTOS/Demo/dsPIC_MPLAB/lcd.c | 18 +++--- FreeRTOS/Demo/dsPIC_MPLAB/timertest.c | 12 ++-- .../NETWORK/BasicSMTP/BasicSMTP.c | 8 +-- .../NETWORK/BasicTFTP/BasicTFTP.c | 8 +-- .../NETWORK/BasicWEB/BasicWEB.c | 10 ++-- .../Demo/lwIP_AVR32_UC3/NETWORK/ethernet.c | 2 +- .../NETWORK/lwip-port/AT32UC3A/sys_arch.c | 2 +- .../Demo/lwIP_AVR32_UC3/PARTEST/ParTest.c | 14 ++--- FreeRTOS/Demo/lwIP_AVR32_UC3/SERIAL/serial.c | 22 ++++---- FreeRTOS/Demo/lwIP_AVR32_UC3/main.c | 4 +- FreeRTOS/Demo/msp430_IAR/ParTest/ParTest.c | 36 ++++++------ FreeRTOS/Demo/msp430_IAR/main.c | 26 ++++----- FreeRTOS/Demo/msp430_IAR/serial/serial.c | 28 +++++----- 123 files changed, 737 insertions(+), 737 deletions(-) diff --git a/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c index 3dc303a44..87eaf3041 100644 --- a/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c +++ b/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/main.c @@ -110,13 +110,13 @@ /*-----------------------------------------------------------*/ /* Constants to setup I/O and processor. */ -#define mainTX_ENABLE ( ( unsigned portLONG ) 0x00010000 ) /* UART1. */ -#define mainRX_ENABLE ( ( unsigned portLONG ) 0x00040000 ) /* UART1. */ -#define mainBUS_CLK_FULL ( ( unsigned portCHAR ) 0x01 ) -#define mainLED_TO_OUTPUT ( ( unsigned portLONG ) 0xff0000 ) +#define mainTX_ENABLE ( ( unsigned long ) 0x00010000 ) /* UART1. */ +#define mainRX_ENABLE ( ( unsigned long ) 0x00040000 ) /* UART1. */ +#define mainBUS_CLK_FULL ( ( unsigned char ) 0x01 ) +#define mainLED_TO_OUTPUT ( ( unsigned long ) 0xff0000 ) /* Constants for the ComTest demo application tasks. */ -#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 115200 ) +#define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 115200 ) #define mainCOM_TEST_LED ( 3 ) /* Priorities for the demo application tasks. */ @@ -142,7 +142,7 @@ then an error has been detected in at least one of the demo application tasks. * * Checks that all the demo application tasks are still executing without error * - as described at the top of the file. */ -static portLONG prvCheckOtherTasksAreStillRunning( void ); +static long prvCheckOtherTasksAreStillRunning( void ); /* * The task that executes at the highest priority and calls @@ -249,9 +249,9 @@ static void prvSetupHardware( void ) } /*-----------------------------------------------------------*/ -static portLONG prvCheckOtherTasksAreStillRunning( void ) +static long prvCheckOtherTasksAreStillRunning( void ) { -portLONG lReturn = pdPASS; +long lReturn = pdPASS; /* Check all the demo tasks (other than the flash tasks) to ensure that they are all still running, and that none of them have detected diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c index 1b37e6324..7baaef6d2 100644 --- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c +++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c @@ -69,9 +69,9 @@ /* Demo application includes. */ #include "partest.h" -#define partstFIRST_IO ( ( unsigned portLONG ) 0x01 ) +#define partstFIRST_IO ( ( unsigned long ) 0x01 ) #define partstNUM_LEDS ( 8 ) -#define partstALL_OUTPUTS_OFF ( ( unsigned portLONG ) 0xff ) +#define partstALL_OUTPUTS_OFF ( ( unsigned long ) 0xff ) /*----------------------------------------------------------- * Simple parallel port IO routines. @@ -91,12 +91,12 @@ void vParTestInitialise( void ) void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue ) { -unsigned portLONG ulLED = partstFIRST_IO; +unsigned long ulLED = partstFIRST_IO; if( uxLED < partstNUM_LEDS ) { /* Rotate to the wanted bit of port */ - ulLED <<= ( unsigned portLONG ) uxLED; + ulLED <<= ( unsigned long ) uxLED; /* Set of clear the output. */ if( xValue ) @@ -113,13 +113,13 @@ unsigned portLONG ulLED = partstFIRST_IO; void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { -unsigned portLONG ulLED = partstFIRST_IO, ulCurrentState; +unsigned long ulLED = partstFIRST_IO, ulCurrentState; if( uxLED < partstNUM_LEDS ) { /* Rotate to the wanted bit of port 0. Only P10 to P13 have an LED attached. */ - ulLED <<= ( unsigned portLONG ) uxLED; + ulLED <<= ( unsigned long ) uxLED; /* If this bit is already set, clear it, and vice versa. */ ulCurrentState = FIO2PIN; @@ -137,9 +137,9 @@ unsigned portLONG ulLED = partstFIRST_IO, ulCurrentState; /*-----------------------------------------------------------*/ unsigned portBASE_TYPE uxParTextGetLED( unsigned portBASE_TYPE uxLED ) { -unsigned portLONG ulLED = partstFIRST_IO; +unsigned long ulLED = partstFIRST_IO; - ulLED <<= ( unsigned portLONG ) uxLED; + ulLED <<= ( unsigned long ) uxLED; return ( FIO2PIN & ulLED ); } diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c index e6357c411..9983fae18 100644 --- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c +++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c @@ -117,22 +117,22 @@ #define mainGEN_QUEUE_TASK_PRIORITY ( tskIDLE_PRIORITY ) /* Constants to setup the PLL. */ -#define mainPLL_MUL ( ( unsigned portLONG ) ( 8 - 1 ) ) -#define mainPLL_DIV ( ( unsigned portLONG ) 0x0000 ) -#define mainCPU_CLK_DIV ( ( unsigned portLONG ) 0x0003 ) -#define mainPLL_ENABLE ( ( unsigned portLONG ) 0x0001 ) -#define mainPLL_CONNECT ( ( ( unsigned portLONG ) 0x0002 ) | mainPLL_ENABLE ) -#define mainPLL_FEED_BYTE1 ( ( unsigned portLONG ) 0xaa ) -#define mainPLL_FEED_BYTE2 ( ( unsigned portLONG ) 0x55 ) -#define mainPLL_LOCK ( ( unsigned portLONG ) 0x4000000 ) -#define mainPLL_CONNECTED ( ( unsigned portLONG ) 0x2000000 ) -#define mainOSC_ENABLE ( ( unsigned portLONG ) 0x20 ) -#define mainOSC_STAT ( ( unsigned portLONG ) 0x40 ) -#define mainOSC_SELECT ( ( unsigned portLONG ) 0x01 ) +#define mainPLL_MUL ( ( unsigned long ) ( 8 - 1 ) ) +#define mainPLL_DIV ( ( unsigned long ) 0x0000 ) +#define mainCPU_CLK_DIV ( ( unsigned long ) 0x0003 ) +#define mainPLL_ENABLE ( ( unsigned long ) 0x0001 ) +#define mainPLL_CONNECT ( ( ( unsigned long ) 0x0002 ) | mainPLL_ENABLE ) +#define mainPLL_FEED_BYTE1 ( ( unsigned long ) 0xaa ) +#define mainPLL_FEED_BYTE2 ( ( unsigned long ) 0x55 ) +#define mainPLL_LOCK ( ( unsigned long ) 0x4000000 ) +#define mainPLL_CONNECTED ( ( unsigned long ) 0x2000000 ) +#define mainOSC_ENABLE ( ( unsigned long ) 0x20 ) +#define mainOSC_STAT ( ( unsigned long ) 0x40 ) +#define mainOSC_SELECT ( ( unsigned long ) 0x01 ) /* Constants to setup the MAM. */ -#define mainMAM_TIM_3 ( ( unsigned portCHAR ) 0x03 ) -#define mainMAM_MODE_FULL ( ( unsigned portCHAR ) 0x02 ) +#define mainMAM_TIM_3 ( ( unsigned char ) 0x03 ) +#define mainMAM_MODE_FULL ( ( unsigned char ) 0x02 ) /* * The task that handles the uIP stack. All TCP/IP processing is performed in @@ -191,7 +191,7 @@ void vApplicationTickHook( void ) { unsigned portBASE_TYPE uxColumn = 0; static xLCDMessage xMessage = { 0, "PASS" }; -static unsigned portLONG ulTicksSinceLastDisplay = 0; +static unsigned long ulTicksSinceLastDisplay = 0; static portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Called from every tick interrupt. Have enough ticks passed to make it diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c index e13f4de02..1ec9ce5bb 100644 --- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c +++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c @@ -171,7 +171,7 @@ extern void ( vEMAC_ISR_Wrapper )( void ); { MAC_INTENABLE = INT_RX_DONE; VICIntEnable |= 0x00200000; - VICVectAddr21 = ( portLONG ) vEMAC_ISR_Wrapper; + VICVectAddr21 = ( long ) vEMAC_ISR_Wrapper; prvSetMACAddress(); } portEXIT_CRITICAL(); @@ -281,10 +281,10 @@ struct uip_eth_addr xAddr; } /*-----------------------------------------------------------*/ -void vApplicationProcessFormInput( portCHAR *pcInputString, portBASE_TYPE xInputLength ) +void vApplicationProcessFormInput( char *pcInputString, portBASE_TYPE xInputLength ) { char *c, *pcText; -static portCHAR cMessageForDisplay[ 32 ]; +static char cMessageForDisplay[ 32 ]; extern xQueueHandle xLCDQueue; xLCDMessage xLCDMessage; diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c index 59a04826f..895a855f6 100644 --- a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c +++ b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c @@ -171,7 +171,7 @@ extern void ( vEMAC_ISR_Wrapper )( void ); { IntEnable = INT_RX_DONE; VICIntEnable |= 0x00200000; - VICVectAddr21 = ( portLONG ) vEMAC_ISR_Wrapper; + VICVectAddr21 = ( long ) vEMAC_ISR_Wrapper; prvSetMACAddress(); } portEXIT_CRITICAL(); @@ -292,10 +292,10 @@ struct uip_eth_addr xAddr; } /*-----------------------------------------------------------*/ -void vApplicationProcessFormInput( portCHAR *pcInputString, portBASE_TYPE xInputLength ) +void vApplicationProcessFormInput( char *pcInputString, portBASE_TYPE xInputLength ) { char *c, *pcText; -static portCHAR cMessageForDisplay[ 32 ]; +static char cMessageForDisplay[ 32 ]; extern xQueueHandle xLCDQueue; xLCDMessage xLCDMessage; diff --git a/FreeRTOS/Demo/AVR32_UC3/ParTest/ParTest.c b/FreeRTOS/Demo/AVR32_UC3/ParTest/ParTest.c index fd91e87eb..8c9782753 100644 --- a/FreeRTOS/Demo/AVR32_UC3/ParTest/ParTest.c +++ b/FreeRTOS/Demo/AVR32_UC3/ParTest/ParTest.c @@ -51,15 +51,15 @@ * Simple parallel port IO routines. *-----------------------------------------------------------*/ -#define partstALL_OUTPUTS_OFF ( ( unsigned portCHAR ) 0x00 ) +#define partstALL_OUTPUTS_OFF ( ( unsigned char ) 0x00 ) #if( BOARD==EVK1100 ) -# define partstMAX_OUTPUT_LED ( ( unsigned portCHAR ) 8 ) +# define partstMAX_OUTPUT_LED ( ( unsigned char ) 8 ) #elif( BOARD==EVK1101 ) -# define partstMAX_OUTPUT_LED ( ( unsigned portCHAR ) 4 ) +# define partstMAX_OUTPUT_LED ( ( unsigned char ) 4 ) #endif -static volatile unsigned portCHAR ucCurrentOutputValue = partstALL_OUTPUTS_OFF; /*lint !e956 File scope parameters okay here. */ +static volatile unsigned char ucCurrentOutputValue = partstALL_OUTPUTS_OFF; /*lint !e956 File scope parameters okay here. */ /*-----------------------------------------------------------*/ @@ -71,14 +71,14 @@ void vParTestInitialise( void ) void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue ) { -unsigned portCHAR ucBit; +unsigned char ucBit; if( uxLED >= partstMAX_OUTPUT_LED ) { return; } - ucBit = ( ( unsigned portCHAR ) 1 ) << uxLED; + ucBit = ( ( unsigned char ) 1 ) << uxLED; vTaskSuspendAll(); { @@ -99,14 +99,14 @@ unsigned portCHAR ucBit; void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { -unsigned portCHAR ucBit; +unsigned char ucBit; if( uxLED >= partstMAX_OUTPUT_LED ) { return; } - ucBit = ( ( unsigned portCHAR ) 1 ) << uxLED; + ucBit = ( ( unsigned char ) 1 ) << uxLED; vTaskSuspendAll(); { diff --git a/FreeRTOS/Demo/AVR32_UC3/main.c b/FreeRTOS/Demo/AVR32_UC3/main.c index fefab0cf6..27ba61096 100644 --- a/FreeRTOS/Demo/AVR32_UC3/main.c +++ b/FreeRTOS/Demo/AVR32_UC3/main.c @@ -133,7 +133,7 @@ //! @} //! Baud rate used by the serial port tasks. -#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 57600 ) +#define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 57600 ) //! LED used by the serial port tasks. This is toggled on each character Tx, //! and mainCOM_TEST_LED + 1 is toggled on each character Rx. @@ -157,7 +157,7 @@ /*! \name Constants used by the vMemCheckTask() task. */ //! @{ -#define mainCOUNT_INITIAL_VALUE ( ( unsigned portLONG ) 0 ) +#define mainCOUNT_INITIAL_VALUE ( ( unsigned long ) 0 ) #define mainNO_TASK ( 0 ) //! @} @@ -244,8 +244,8 @@ int main( void ) */ static void vErrorChecks( void *pvParameters ) { -static volatile unsigned portLONG ulDummyVariable = 3UL; -unsigned portLONG ulMemCheckTaskRunningCount; +static volatile unsigned long ulDummyVariable = 3UL; +unsigned long ulMemCheckTaskRunningCount; xTaskHandle xCreatedTask; portBASE_TYPE bSuicidalTask = 0; @@ -394,9 +394,9 @@ static portBASE_TYPE xErrorHasOccurred = pdFALSE; */ static void vMemCheckTask( void *pvParameters ) { -unsigned portLONG *pulMemCheckTaskRunningCounter; +unsigned long *pulMemCheckTaskRunningCounter; void *pvMem1, *pvMem2, *pvMem3; -static portLONG lErrorOccurred = pdFALSE; +static long lErrorOccurred = pdFALSE; /* This task is dynamically created then deleted during each cycle of the vErrorChecks task to check the operation of the memory allocator. Each time @@ -409,7 +409,7 @@ static portLONG lErrorOccurred = pdFALSE; pulMemCheckTaskRunningCounter is incremented each cycle to indicate to the vErrorChecks() task that this task is still executing without error. */ - pulMemCheckTaskRunningCounter = ( unsigned portLONG * ) pvParameters; + pulMemCheckTaskRunningCounter = ( unsigned long * ) pvParameters; for( ;; ) { diff --git a/FreeRTOS/Demo/AVR32_UC3/serial/serial.c b/FreeRTOS/Demo/AVR32_UC3/serial/serial.c index 83eb4023f..77c89180b 100644 --- a/FreeRTOS/Demo/AVR32_UC3/serial/serial.c +++ b/FreeRTOS/Demo/AVR32_UC3/serial/serial.c @@ -88,9 +88,9 @@ static void vprvSerialCreateQueues( unsigned portBASE_TYPE uxQueueLength, static portBASE_TYPE prvUSART_ISR_NonNakedBehaviour( void ) { /* Now we can declare the local variables. */ - signed portCHAR cChar; + signed char cChar; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; - unsigned portLONG ulStatus; + unsigned long ulStatus; volatile avr32_usart_t *usart = serialPORT_USART; portBASE_TYPE retstatus; @@ -166,7 +166,7 @@ static void vUSART_ISR( void ) /* * Init the serial port for the Minimal implementation. */ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { static const gpio_map_t USART_GPIO_MAP = { @@ -184,7 +184,7 @@ int cd; /* USART Clock Divider. */ /* Configure USART. */ if( ( xRxedChars != serINVALID_QUEUE ) && ( xCharsForTx != serINVALID_QUEUE ) && - ( ulWantedBaud != ( unsigned portLONG ) 0 ) ) + ( ulWantedBaud != ( unsigned long ) 0 ) ) { portENTER_CRITICAL(); { @@ -290,7 +290,7 @@ int cd; /* USART Clock Divider. */ } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* The port handle is not required as this driver only supports UART0. */ ( void ) pxPort; @@ -308,9 +308,9 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { -signed portCHAR *pxNext; +signed char *pxNext; /* NOTE: This implementation does not handle the queue being full as no block time is used! */ @@ -319,7 +319,7 @@ signed portCHAR *pxNext; ( void ) pxPort; /* Send each character in the string, one at a time. */ - pxNext = ( signed portCHAR * ) pcString; + pxNext = ( signed char * ) pcString; while( *pxNext ) { xSerialPutChar( pxPort, *pxNext, serNO_BLOCK ); @@ -328,7 +328,7 @@ signed portCHAR *pxNext; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { volatile avr32_usart_t *usart = serialPORT_USART; @@ -362,8 +362,8 @@ void vSerialClose( xComPortHandle xPort ) static void vprvSerialCreateQueues( unsigned portBASE_TYPE uxQueueLength, xQueueHandle *pxRxedChars, xQueueHandle *pxCharsForTx ) { /* Create the queues used to hold Rx and Tx characters. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* Pass back a reference to the queues so the serial API file can post/receive characters. */ diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/serial.c b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/serial.c index 8f266ce19..b9257c814 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/serial.c +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/serial.c @@ -115,7 +115,7 @@ static xQueueHandle xCharsForTx; /* * See the serial2.h header file. */ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { /* Baud is set in IoInitScif2(), called in prvSetupHardware() in main.c. */ ( void ) ulWantedBaud; @@ -175,7 +175,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedC } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned portSHORT usStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { signed char *pxNext; diff --git a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/TimerTest.c b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/TimerTest.c index 9347ebe6f..f71339ec3 100644 --- a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/TimerTest.c +++ b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/TimerTest.c @@ -71,7 +71,7 @@ /* The set frequency of the interrupt. Deviations from this are measured as the jitter. */ -#define timerINTERRUPT_FREQUENCY ( ( unsigned portSHORT ) 20000 ) +#define timerINTERRUPT_FREQUENCY ( ( unsigned short ) 20000 ) /* The expected time between each of the timer interrupts - if the jitter was zero. */ @@ -90,7 +90,7 @@ void vSetupTimerTest( void ); CY_ISR_PROTO(vTimer20KHzISR); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portSHORT usMaxJitter = 0; +volatile unsigned short usMaxJitter = 0; /*---------------------------------------------------------------------------*/ void vSetupTimerTest( void ) diff --git a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/main.c b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/main.c index 14572c8aa..52d84ece5 100644 --- a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/main.c +++ b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_GCC/FreeRTOS_Demo.cydsn/main.c @@ -98,7 +98,7 @@ tick hook. */ #define mainCOM_LED ( 3 ) /* The number of nano seconds between each processor clock. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* Task priorities. */ #define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 ) @@ -224,7 +224,7 @@ unsigned long ulRow = 0; portTickType xDelay = 0; unsigned short usErrorCode = 0; unsigned long ulIteration = 0; -extern unsigned portSHORT usMaxJitter; +extern unsigned short usMaxJitter; /* Intialise the sleeper. */ xDelay = xTaskGetTickCount(); diff --git a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/TimerTest.c b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/TimerTest.c index 9347ebe6f..f71339ec3 100644 --- a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/TimerTest.c +++ b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/TimerTest.c @@ -71,7 +71,7 @@ /* The set frequency of the interrupt. Deviations from this are measured as the jitter. */ -#define timerINTERRUPT_FREQUENCY ( ( unsigned portSHORT ) 20000 ) +#define timerINTERRUPT_FREQUENCY ( ( unsigned short ) 20000 ) /* The expected time between each of the timer interrupts - if the jitter was zero. */ @@ -90,7 +90,7 @@ void vSetupTimerTest( void ); CY_ISR_PROTO(vTimer20KHzISR); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portSHORT usMaxJitter = 0; +volatile unsigned short usMaxJitter = 0; /*---------------------------------------------------------------------------*/ void vSetupTimerTest( void ) diff --git a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/main.c b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/main.c index 14572c8aa..52d84ece5 100644 --- a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/main.c +++ b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_Keil/FreeRTOS_Demo.cydsn/main.c @@ -98,7 +98,7 @@ tick hook. */ #define mainCOM_LED ( 3 ) /* The number of nano seconds between each processor clock. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* Task priorities. */ #define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 ) @@ -224,7 +224,7 @@ unsigned long ulRow = 0; portTickType xDelay = 0; unsigned short usErrorCode = 0; unsigned long ulIteration = 0; -extern unsigned portSHORT usMaxJitter; +extern unsigned short usMaxJitter; /* Intialise the sleeper. */ xDelay = xTaskGetTickCount(); diff --git a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/TimerTest.c b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/TimerTest.c index 9347ebe6f..f71339ec3 100644 --- a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/TimerTest.c +++ b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/TimerTest.c @@ -71,7 +71,7 @@ /* The set frequency of the interrupt. Deviations from this are measured as the jitter. */ -#define timerINTERRUPT_FREQUENCY ( ( unsigned portSHORT ) 20000 ) +#define timerINTERRUPT_FREQUENCY ( ( unsigned short ) 20000 ) /* The expected time between each of the timer interrupts - if the jitter was zero. */ @@ -90,7 +90,7 @@ void vSetupTimerTest( void ); CY_ISR_PROTO(vTimer20KHzISR); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portSHORT usMaxJitter = 0; +volatile unsigned short usMaxJitter = 0; /*---------------------------------------------------------------------------*/ void vSetupTimerTest( void ) diff --git a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/main.c b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/main.c index 14572c8aa..52d84ece5 100644 --- a/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/main.c +++ b/FreeRTOS/Demo/CORTEX_CY8C5588_PSoC_Creator_RVDS/FreeRTOS_Demo.cydsn/main.c @@ -98,7 +98,7 @@ tick hook. */ #define mainCOM_LED ( 3 ) /* The number of nano seconds between each processor clock. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* Task priorities. */ #define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 ) @@ -224,7 +224,7 @@ unsigned long ulRow = 0; portTickType xDelay = 0; unsigned short usErrorCode = 0; unsigned long ulIteration = 0; -extern unsigned portSHORT usMaxJitter; +extern unsigned short usMaxJitter; /* Intialise the sleeper. */ xDelay = xTaskGetTickCount(); diff --git a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c index 87460a4d7..d625a345c 100644 --- a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c +++ b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c @@ -172,7 +172,7 @@ void vEMACInit( void ) { int iData; extern int periph_clk_khz; -const unsigned portCHAR ucMACAddress[] = +const unsigned char ucMACAddress[] = { configMAC_ADDR0, configMAC_ADDR1, configMAC_ADDR2, configMAC_ADDR3, configMAC_ADDR4, configMAC_ADDR5 }; @@ -264,7 +264,7 @@ const unsigned portCHAR ucMACAddress[] = { /* Half duplex */ ENET_RCR |= ENET_RCR_DRT_MASK; - ENET_TCR &= (unsigned portLONG)~ENET_TCR_FDEN_MASK; + ENET_TCR &= (unsigned long)~ENET_TCR_FDEN_MASK; } if( iData & emacPHY_SPEED_STATUS ) diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c index 36a2ea6b0..d5004a3e8 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo1/main.c @@ -199,7 +199,7 @@ static void vCommsRxTask( void * pvParameters ); * The co-routine that periodically initiates the transmission of the string on * the UART. */ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * Writes a string the the LCD. @@ -428,7 +428,7 @@ static char cRxedChar, cExpectedChar; } /*-----------------------------------------------------------*/ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portTickType xDelayPeriod; static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES; diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c index e94462fcf..addac91e8 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c @@ -197,13 +197,13 @@ static void vLCDTask( void * pvParameters ); /* * The task that receives the characters from UART 0. */ -static void vCommsRxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vCommsRxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * The co-routine that periodically initiates the transmission of the string on * the UART. */ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * Writes a string the the LCD. @@ -383,7 +383,7 @@ const char *pcStringsToDisplay[] = { } /*-----------------------------------------------------------*/ -static void vCommsRxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vCommsRxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { static char cRxedChar, cExpectedChar = mainFIRST_TX_CHAR; portBASE_TYPE xResult; @@ -436,7 +436,7 @@ portBASE_TYPE xResult; } /*-----------------------------------------------------------*/ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portTickType xDelayPeriod; static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES; diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c index 36a2ea6b0..d5004a3e8 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c @@ -199,7 +199,7 @@ static void vCommsRxTask( void * pvParameters ); * The co-routine that periodically initiates the transmission of the string on * the UART. */ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * Writes a string the the LCD. @@ -428,7 +428,7 @@ static char cRxedChar, cExpectedChar; } /*-----------------------------------------------------------*/ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portTickType xDelayPeriod; static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES; diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c index 7548d2d0c..42124ac03 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c @@ -199,7 +199,7 @@ static void vCommsRxTask( void * pvParameters ); * The co-routine that periodically initiates the transmission of the string on * the UART. */ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * Writes a string the the LCD. @@ -429,7 +429,7 @@ static char cRxedChar, cExpectedChar; } /*-----------------------------------------------------------*/ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portTickType xDelayPeriod; static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES; diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c index ccc787681..20d136552 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c @@ -197,13 +197,13 @@ static void vLCDTask( void * pvParameters ); /* * The task that receives the characters from UART 0. */ -static void vCommsRxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vCommsRxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * The co-routine that periodically initiates the transmission of the string on * the UART. */ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * Writes a string the the LCD. @@ -384,7 +384,7 @@ const char *pcStringsToDisplay[] = { } /*-----------------------------------------------------------*/ -static void vCommsRxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vCommsRxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { static char cRxedChar, cExpectedChar = mainFIRST_TX_CHAR; portBASE_TYPE xResult; @@ -437,7 +437,7 @@ portBASE_TYPE xResult; } /*-----------------------------------------------------------*/ -static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portTickType xDelayPeriod; static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES; diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c index db9bc0860..7bce90afe 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c @@ -142,8 +142,8 @@ static xQueueHandle xDelayQueue; static void prvSetupHardware( void ); /* The co-routines as described at the top of the file. */ -static void vI2CCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); -static void vFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vI2CCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); +static void vFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /*-----------------------------------------------------------*/ @@ -205,7 +205,7 @@ static void prvSetupHardware( void ) } /*-----------------------------------------------------------*/ -static void vI2CCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vI2CCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portTickType xADCResult; static portBASE_TYPE xResult = 0, xMilliSecs, xLED; @@ -247,7 +247,7 @@ static portBASE_TYPE xResult = 0, xMilliSecs, xLED; } /*-----------------------------------------------------------*/ -static void vFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portBASE_TYPE xResult, xNothing; diff --git a/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.c b/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.c index 59ac65093..50d0ad03c 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.c +++ b/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.c @@ -156,7 +156,7 @@ void vSerialInit( void ) } /*-----------------------------------------------------------*/ -void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portTickType xDelayPeriod; static unsigned long *pulRandomBytes = commsFIRST_PROGRAM_BYTES; diff --git a/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.h b/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.h index 6fbc6f49e..164288f4f 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.h +++ b/FreeRTOS/Demo/CORTEX_LM3S316_IAR/commstest.h @@ -80,7 +80,7 @@ void vCommsRxTask( void * pvParameters ); * The co-routine that periodically initiates the transmission of the string on * the UART. */ -void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); unsigned portBASE_TYPE uxGetCommsStatus( void ); diff --git a/FreeRTOS/Demo/CORTEX_LM3S316_IAR/main.c b/FreeRTOS/Demo/CORTEX_LM3S316_IAR/main.c index 8d6fc815b..fb432731a 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S316_IAR/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S316_IAR/main.c @@ -188,7 +188,7 @@ static void prvLCDMessageTask( void * pvParameters ); * The co-routine that reads the ADC and sends messages for display on the * bottom row of the LCD. */ -static void prvADCCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvADCCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * Function to simply set a known value into the general purpose registers @@ -378,7 +378,7 @@ const unsigned char ucCFGData[] = { } /*-----------------------------------------------------------*/ -static void prvADCCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvADCCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { static unsigned long ulADCValue; static char cMessageBuffer[ mainMAX_ADC_STRING_LEN ]; diff --git a/FreeRTOS/Demo/CORTEX_LM3S811_GCC/main.c b/FreeRTOS/Demo/CORTEX_LM3S811_GCC/main.c index 08ef3dae9..e1b10aac8 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S811_GCC/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S811_GCC/main.c @@ -161,8 +161,8 @@ static void vButtonHandlerTask( void *pvParameters ); static void vPrintTask( void *pvParameter ); /* String that is transmitted on the UART. */ -static portCHAR *cMessage = "Task woken by button interrupt! --- "; -static volatile portCHAR *pcNextChar; +static char *cMessage = "Task woken by button interrupt! --- "; +static volatile char *pcNextChar; /* The semaphore used to wake the button handler task from within the GPIO interrupt handler. */ @@ -184,7 +184,7 @@ int main( void ) xSemaphoreTake( xButtonSemaphore, 0 ); /* Create the queue used to pass message to vPrintTask. */ - xPrintQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( portCHAR * ) ); + xPrintQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( char * ) ); /* Start the standard demo tasks. */ vStartIntegerMathTasks( tskIDLE_PRIORITY ); @@ -211,8 +211,8 @@ static void vCheckTask( void *pvParameters ) { portBASE_TYPE xErrorOccurred = pdFALSE; portTickType xLastExecutionTime; -const portCHAR *pcPassMessage = "PASS"; -const portCHAR *pcFailMessage = "FAIL"; +const char *pcPassMessage = "PASS"; +const char *pcFailMessage = "FAIL"; /* Initialise xLastExecutionTime so the first call to vTaskDelayUntil() works correctly. */ @@ -305,7 +305,7 @@ static void prvSetupHardware( void ) static void vButtonHandlerTask( void *pvParameters ) { -const portCHAR *pcInterruptMessage = "Int"; +const char *pcInterruptMessage = "Int"; for( ;; ) { @@ -340,7 +340,7 @@ const portCHAR *pcInterruptMessage = "Int"; void vUART_ISR(void) { -unsigned portLONG ulStatus; +unsigned long ulStatus; /* What caused the interrupt. */ ulStatus = UARTIntStatus( UART0_BASE, pdTRUE ); @@ -380,7 +380,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; static void vPrintTask( void *pvParameters ) { -portCHAR *pcMessage; +char *pcMessage; unsigned portBASE_TYPE uxLine = 0, uxRow = 0; for( ;; ) diff --git a/FreeRTOS/Demo/CORTEX_LM3S811_IAR/main.c b/FreeRTOS/Demo/CORTEX_LM3S811_IAR/main.c index 721c40493..ec52b1a15 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S811_IAR/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S811_IAR/main.c @@ -161,8 +161,8 @@ static void vButtonHandlerTask( void *pvParameters ); static void vPrintTask( void *pvParameter ); /* String that is transmitted on the UART. */ -static portCHAR *cMessage = "Task woken by button interrupt! --- "; -static volatile portCHAR *pcNextChar; +static char *cMessage = "Task woken by button interrupt! --- "; +static volatile char *pcNextChar; /* The semaphore used to wake the button handler task from within the GPIO interrupt handler. */ @@ -184,7 +184,7 @@ int main( void ) xSemaphoreTake( xButtonSemaphore, 0 ); /* Create the queue used to pass message to vPrintTask. */ - xPrintQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( portCHAR * ) ); + xPrintQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( char * ) ); /* Start the standard demo tasks. */ vStartIntegerMathTasks( tskIDLE_PRIORITY ); @@ -211,8 +211,8 @@ static void vCheckTask( void *pvParameters ) { portBASE_TYPE xErrorOccurred = pdFALSE; portTickType xLastExecutionTime; -const portCHAR *pcPassMessage = "PASS"; -const portCHAR *pcFailMessage = "FAIL"; +const char *pcPassMessage = "PASS"; +const char *pcFailMessage = "FAIL"; /* Initialise xLastExecutionTime so the first call to vTaskDelayUntil() works correctly. */ @@ -305,7 +305,7 @@ static void prvSetupHardware( void ) static void vButtonHandlerTask( void *pvParameters ) { -const portCHAR *pcInterruptMessage = "Int"; +const char *pcInterruptMessage = "Int"; for( ;; ) { @@ -340,7 +340,7 @@ const portCHAR *pcInterruptMessage = "Int"; void vUART_ISR(void) { -unsigned portLONG ulStatus; +unsigned long ulStatus; /* What caused the interrupt. */ ulStatus = UARTIntStatus( UART0_BASE, pdTRUE ); @@ -379,7 +379,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; static void vPrintTask( void *pvParameters ) { -portCHAR *pcMessage; +char *pcMessage; unsigned portBASE_TYPE uxLine = 0, uxRow = 0; for( ;; ) diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c index 8a05d4ca1..ba05abcfb 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c @@ -174,7 +174,7 @@ time. */ /* The period of the system clock in nano seconds. This is used to calculate the jitter time in nano seconds. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* Constants used when writing strings to the display. */ #define mainCHARACTER_HEIGHT ( 9 ) @@ -222,10 +222,10 @@ void vApplicationIdleHook( void ) __attribute__((naked)); xQueueHandle xOLEDQueue; /* The welcome text. */ -const portCHAR * const pcWelcomeMessage = " www.FreeRTOS.org"; +const char * const pcWelcomeMessage = " www.FreeRTOS.org"; /* Variables used to detect the test in the idle hook failing. */ -unsigned portLONG ulIdleError = pdFALSE; +unsigned long ulIdleError = pdFALSE; /*-----------------------------------------------------------*/ @@ -308,7 +308,7 @@ void prvSetupHardware( void ) void vApplicationTickHook( void ) { static xOLEDMessage xMessage = { "PASS" }; -static unsigned portLONG ulTicksSinceLastDisplay = 0; +static unsigned long ulTicksSinceLastDisplay = 0; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Called from every tick interrupt. Have enough ticks passed to make it @@ -375,17 +375,17 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; void vOLEDTask( void *pvParameters ) { xOLEDMessage xMessage; -unsigned portLONG ulY, ulMaxY; -static portCHAR cMessage[ mainMAX_MSG_LEN ]; -extern volatile unsigned portLONG ulMaxJitter; +unsigned long ulY, ulMaxY; +static char cMessage[ mainMAX_MSG_LEN ]; +extern volatile unsigned long ulMaxJitter; unsigned portBASE_TYPE uxUnusedStackOnEntry, uxUnusedStackNow; -const unsigned portCHAR *pucImage; +const unsigned char *pucImage; /* Functions to access the OLED. The one used depends on the dev kit being used. */ -void ( *vOLEDInit )( unsigned portLONG ) = NULL; -void ( *vOLEDStringDraw )( const portCHAR *, unsigned portLONG, unsigned portLONG, unsigned portCHAR ) = NULL; -void ( *vOLEDImageDraw )( const unsigned portCHAR *, unsigned portLONG, unsigned portLONG, unsigned portLONG, unsigned portLONG ) = NULL; +void ( *vOLEDInit )( unsigned long ) = NULL; +void ( *vOLEDStringDraw )( const char *, unsigned long, unsigned long, unsigned char ) = NULL; +void ( *vOLEDImageDraw )( const unsigned char *, unsigned long, unsigned long, unsigned long, unsigned long ) = NULL; void ( *vOLEDClear )( void ) = NULL; /* Just for demo purposes. */ @@ -451,7 +451,7 @@ void ( *vOLEDClear )( void ) = NULL; } /*-----------------------------------------------------------*/ -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName ) { for( ;; ); } diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c index 7ee6d5ecb..7fcc85ec0 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c @@ -97,12 +97,12 @@ zero. */ void Timer0IntHandler( void ); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portLONG ulMaxJitter = 0UL; +volatile unsigned long ulMaxJitter = 0UL; /* Counts the total number of times that the high frequency timer has 'ticked'. This value is used by the run time stats function to work out what percentage of CPU time each task is taking. */ -volatile unsigned portLONG ulHighFrequencyTimerTicks = 0UL; +volatile unsigned long ulHighFrequencyTimerTicks = 0UL; /*-----------------------------------------------------------*/ void vSetupHighFrequencyTimer( void ) @@ -139,9 +139,9 @@ unsigned long ulFrequency; void Timer0IntHandler( void ) { -unsigned portLONG ulDifference; -volatile unsigned portLONG ulCurrentCount; -static unsigned portLONG ulMaxDifference = 0, ulLastCount = 0; +unsigned long ulDifference; +volatile unsigned long ulCurrentCount; +static unsigned long ulMaxDifference = 0, ulLastCount = 0; /* We use the timer 1 counter value to measure the clock cycles between the timer 0 interrupts. */ diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c index 36b2798de..aea31188e 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c @@ -105,16 +105,16 @@ xSemaphoreHandle xMACInterruptSemaphore = NULL; /* The buffer used by the uIP stack. In this case the pointer is used to point to one of the Rx buffers. */ -unsigned portCHAR *uip_buf; +unsigned char *uip_buf; /* Buffers into which Rx data is placed. */ -static unsigned portCHAR ucRxBuffers[ emacNUM_RX_BUFFERS ][ UIP_BUFSIZE + ( 4 * emacFRAM_SIZE_BYTES ) ]; +static unsigned char ucRxBuffers[ emacNUM_RX_BUFFERS ][ UIP_BUFSIZE + ( 4 * emacFRAM_SIZE_BYTES ) ]; /* The length of the data within each of the Rx buffers. */ -static unsigned portLONG ulRxLength[ emacNUM_RX_BUFFERS ]; +static unsigned long ulRxLength[ emacNUM_RX_BUFFERS ]; /* Used to keep a track of the number of bytes to transmit. */ -static unsigned portLONG ulNextTxSpace; +static unsigned long ulNextTxSpace; /*-----------------------------------------------------------*/ @@ -190,7 +190,7 @@ void vInitialiseSend( void ) } /*-----------------------------------------------------------*/ -void vIncrementTxLength( unsigned portLONG ulLength ) +void vIncrementTxLength( unsigned long ulLength ) { ulNextTxSpace += ulLength; } @@ -199,11 +199,11 @@ void vIncrementTxLength( unsigned portLONG ulLength ) void vSendBufferToMAC( void ) { unsigned long *pulSource; -unsigned portSHORT * pus; -unsigned portLONG ulNextWord; +unsigned short * pus; +unsigned long ulNextWord; /* Locate the data to be send. */ - pus = ( unsigned portSHORT * ) uip_buf; + pus = ( unsigned short * ) uip_buf; /* Add in the size of the data. */ pus--; @@ -215,9 +215,9 @@ unsigned portLONG ulNextWord; vTaskDelay( macWAIT_SEND_TIME ); } - pulSource = ( unsigned portLONG * ) pus; + pulSource = ( unsigned long * ) pus; - for( ulNextWord = 0; ulNextWord < ulNextTxSpace; ulNextWord += sizeof( unsigned portLONG ) ) + for( ulNextWord = 0; ulNextWord < ulNextTxSpace; ulNextWord += sizeof( unsigned long ) ) { HWREG(ETH_BASE + MAC_O_DATA) = *pulSource; pulSource++; @@ -231,7 +231,7 @@ unsigned portLONG ulNextWord; void vEMAC_ISR( void ) { portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; -unsigned portLONG ulTemp; +unsigned long ulTemp; /* Clear the interrupt. */ ulTemp = EthernetIntStatus( ETH_BASE, pdFALSE ); @@ -252,9 +252,9 @@ unsigned portLONG ulTemp; void vMACHandleTask( void *pvParameters ) { unsigned long ulLen = 0, i; -unsigned portLONG ulLength, ulInt; +unsigned long ulLength, ulInt; unsigned long *pulBuffer; -static unsigned portLONG ulNextRxBuffer = 0; +static unsigned long ulNextRxBuffer = 0; portBASE_TYPE xSwitchRequired = pdFALSE; for( ;; ) @@ -286,7 +286,7 @@ portBASE_TYPE xSwitchRequired = pdFALSE; } /* Read out the data into our buffer. */ - for( i = 0; i < ulLength; i += sizeof( unsigned portLONG ) ) + for( i = 0; i < ulLength; i += sizeof( unsigned long ) ) { *pulBuffer = HWREG( ETH_BASE + MAC_O_DATA ); pulBuffer++; diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c index 6315c9cfe..0e336c8ff 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c @@ -258,7 +258,7 @@ static void prvENET_Send(void) static void prvSetMACAddress( void ) { -unsigned portLONG ulUser0, ulUser1; +unsigned long ulUser0, ulUser1; unsigned char pucMACArray[8]; struct uip_eth_addr xAddr; @@ -286,10 +286,10 @@ struct uip_eth_addr xAddr; } /*-----------------------------------------------------------*/ -void vApplicationProcessFormInput( portCHAR *pcInputString, portBASE_TYPE xInputLength ) +void vApplicationProcessFormInput( char *pcInputString, portBASE_TYPE xInputLength ) { char *c, *pcText; -static portCHAR cMessageForDisplay[ 32 ]; +static char cMessageForDisplay[ 32 ]; extern xQueueHandle xOLEDQueue; xOLEDMessage xOLEDMessage; diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c index a97cda902..cabc1763e 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c @@ -181,7 +181,7 @@ time. */ /* The period of the system clock in nano seconds. This is used to calculate the jitter time in nano seconds. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* Constants used when writing strings to the display. */ #define mainCHARACTER_HEIGHT ( 9 ) @@ -221,7 +221,7 @@ extern void vSetupHighFrequencyTimer( void ); /* * Hook functions that can get called by the kernel. */ -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ); +void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName ); void vApplicationTickHook( void ); @@ -231,7 +231,7 @@ void vApplicationTickHook( void ); xQueueHandle xOLEDQueue; /* The welcome text. */ -const portCHAR * const pcWelcomeMessage = " www.FreeRTOS.org"; +const char * const pcWelcomeMessage = " www.FreeRTOS.org"; /*-----------------------------------------------------------*/ @@ -323,7 +323,7 @@ void prvSetupHardware( void ) void vApplicationTickHook( void ) { static xOLEDMessage xMessage = { "PASS" }; -static unsigned portLONG ulTicksSinceLastDisplay = 0; +static unsigned long ulTicksSinceLastDisplay = 0; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Called from every tick interrupt. Have enough ticks passed to make it @@ -395,16 +395,16 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; void vOLEDTask( void *pvParameters ) { xOLEDMessage xMessage; -unsigned portLONG ulY, ulMaxY; -static portCHAR cMessage[ mainMAX_MSG_LEN ]; -extern volatile unsigned portLONG ulMaxJitter; -const unsigned portCHAR *pucImage; +unsigned long ulY, ulMaxY; +static char cMessage[ mainMAX_MSG_LEN ]; +extern volatile unsigned long ulMaxJitter; +const unsigned char *pucImage; /* Functions to access the OLED. The one used depends on the dev kit being used. */ -void ( *vOLEDInit )( unsigned portLONG ) = NULL; -void ( *vOLEDStringDraw )( const portCHAR *, unsigned portLONG, unsigned portLONG, unsigned portCHAR ) = NULL; -void ( *vOLEDImageDraw )( const unsigned portCHAR *, unsigned portLONG, unsigned portLONG, unsigned portLONG, unsigned portLONG ) = NULL; +void ( *vOLEDInit )( unsigned long ) = NULL; +void ( *vOLEDStringDraw )( const char *, unsigned long, unsigned long, unsigned char ) = NULL; +void ( *vOLEDImageDraw )( const unsigned char *, unsigned long, unsigned long, unsigned long, unsigned long ) = NULL; void ( *vOLEDClear )( void ) = NULL; /* Map the OLED access functions to the driver functions that are appropriate @@ -468,7 +468,7 @@ void ( *vOLEDClear )( void ) = NULL; } /*-----------------------------------------------------------*/ -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName ) { ( void ) pxTask; ( void ) pcTaskName; diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c index 9c65f3835..57d775667 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c @@ -90,7 +90,7 @@ zero. */ /* Misc defines. */ #define timerMAX_32BIT_VALUE ( 0xffffffffUL ) -#define timerTIMER_1_COUNT_VALUE ( * ( ( volatile unsigned long * ) ( ( unsigned portLONG ) TIMER1_BASE + 0x48UL ) ) ) +#define timerTIMER_1_COUNT_VALUE ( * ( ( volatile unsigned long * ) ( ( unsigned long ) TIMER1_BASE + 0x48UL ) ) ) /*-----------------------------------------------------------*/ @@ -98,7 +98,7 @@ zero. */ void Timer0IntHandler( void ); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portLONG ulMaxJitter = 0; +volatile unsigned long ulMaxJitter = 0; /*-----------------------------------------------------------*/ @@ -136,9 +136,9 @@ unsigned long ulFrequency; void Timer0IntHandler( void ) { -unsigned portLONG ulDifference; -volatile unsigned portLONG ulCurrentCount; -static unsigned portLONG ulMaxDifference = 0, ulLastCount = 0; +unsigned long ulDifference; +volatile unsigned long ulCurrentCount; +static unsigned long ulMaxDifference = 0, ulLastCount = 0; /* We use the timer 1 counter value to measure the clock cycles between the timer 0 interrupts. */ diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c index b91e9aca8..83b21947b 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c @@ -105,20 +105,20 @@ xSemaphoreHandle xMACInterruptSemaphore = NULL; /* The buffer used by the uIP stack. In this case the pointer is used to point to one of the Rx buffers. */ -unsigned portCHAR *uip_buf; +unsigned char *uip_buf; /* Buffers into which Rx data is placed. */ static union { - unsigned portLONG ulJustForAlignment; - unsigned portCHAR ucRxBuffers[ emacNUM_RX_BUFFERS ][ UIP_BUFSIZE + ( 4 * emacFRAM_SIZE_BYTES ) ]; + unsigned long ulJustForAlignment; + unsigned char ucRxBuffers[ emacNUM_RX_BUFFERS ][ UIP_BUFSIZE + ( 4 * emacFRAM_SIZE_BYTES ) ]; } uxRxBuffers; /* The length of the data within each of the Rx buffers. */ -static unsigned portLONG ulRxLength[ emacNUM_RX_BUFFERS ]; +static unsigned long ulRxLength[ emacNUM_RX_BUFFERS ]; /* Used to keep a track of the number of bytes to transmit. */ -static unsigned portLONG ulNextTxSpace; +static unsigned long ulNextTxSpace; /*-----------------------------------------------------------*/ @@ -194,7 +194,7 @@ void vInitialiseSend( void ) } /*-----------------------------------------------------------*/ -void vIncrementTxLength( unsigned portLONG ulLength ) +void vIncrementTxLength( unsigned long ulLength ) { ulNextTxSpace += ulLength; } @@ -203,11 +203,11 @@ void vIncrementTxLength( unsigned portLONG ulLength ) void vSendBufferToMAC( void ) { unsigned long *pulSource; -unsigned portSHORT * pus; -unsigned portLONG ulNextWord; +unsigned short * pus; +unsigned long ulNextWord; /* Locate the data to be send. */ - pus = ( unsigned portSHORT * ) uip_buf; + pus = ( unsigned short * ) uip_buf; /* Add in the size of the data. */ pus--; @@ -219,9 +219,9 @@ unsigned portLONG ulNextWord; vTaskDelay( macWAIT_SEND_TIME ); } - pulSource = ( unsigned portLONG * ) pus; + pulSource = ( unsigned long * ) pus; - for( ulNextWord = 0; ulNextWord < ulNextTxSpace; ulNextWord += sizeof( unsigned portLONG ) ) + for( ulNextWord = 0; ulNextWord < ulNextTxSpace; ulNextWord += sizeof( unsigned long ) ) { HWREG(ETH_BASE + MAC_O_DATA) = *pulSource; pulSource++; @@ -235,7 +235,7 @@ unsigned portLONG ulNextWord; void vEMAC_ISR( void ) { portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; -unsigned portLONG ulTemp; +unsigned long ulTemp; /* Clear the interrupt. */ ulTemp = EthernetIntStatus( ETH_BASE, pdFALSE ); @@ -256,9 +256,9 @@ unsigned portLONG ulTemp; void vMACHandleTask( void *pvParameters ) { unsigned long i, ulInt; -unsigned portLONG ulLength; +unsigned long ulLength; unsigned long *pulBuffer; -static unsigned portLONG ulNextRxBuffer = 0; +static unsigned long ulNextRxBuffer = 0; for( ;; ) { @@ -289,7 +289,7 @@ static unsigned portLONG ulNextRxBuffer = 0; } /* Read out the data into our buffer. */ - for( i = 0; i < ulLength; i += sizeof( unsigned portLONG ) ) + for( i = 0; i < ulLength; i += sizeof( unsigned long ) ) { *pulBuffer = HWREG( ETH_BASE + MAC_O_DATA ); pulBuffer++; diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c index 685904946..0b93df25e 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c @@ -269,7 +269,7 @@ static void prvENET_Send(void) static void prvSetMACAddress( void ) { -unsigned portLONG ulUser0, ulUser1; +unsigned long ulUser0, ulUser1; unsigned char pucMACArray[8]; struct uip_eth_addr xAddr; @@ -297,10 +297,10 @@ struct uip_eth_addr xAddr; } /*-----------------------------------------------------------*/ -void vApplicationProcessFormInput( portCHAR *pcInputString, portBASE_TYPE xInputLength ) +void vApplicationProcessFormInput( char *pcInputString, portBASE_TYPE xInputLength ) { char *c, *pcText; -static portCHAR cMessageForDisplay[ 32 ]; +static char cMessageForDisplay[ 32 ]; extern xQueueHandle xOLEDQueue; xOLEDMessage xOLEDMessage; @@ -342,7 +342,7 @@ xOLEDMessage xOLEDMessage; /* Write the message to the LCD. */ strcpy( cMessageForDisplay, pcText ); - xOLEDMessage.pcMessage = ( signed portCHAR * ) cMessageForDisplay; + xOLEDMessage.pcMessage = ( signed char * ) cMessageForDisplay; xQueueSend( xOLEDQueue, &xOLEDMessage, portMAX_DELAY ); } } diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h index 17b993388..4b6499f77 100644 --- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h @@ -92,10 +92,10 @@ #define configUSE_TICK_HOOK 1 #define configUSE_TRACE_FACILITY 0 #define configUSE_16_BIT_TICKS 0 -#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 50000000 ) /* Timer clock. */ +#define configCPU_CLOCK_HZ ( ( unsigned long ) 50000000 ) /* Timer clock. */ #define configTICK_RATE_HZ ( ( portTickType ) 1000 ) #define configMAX_PRIORITIES ( 8 ) -#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 128 ) +#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 128 ) #define configTOTAL_HEAP_SIZE ( ( size_t ) 32768 ) #define configMAX_TASK_NAME_LEN ( 16 ) #define configIDLE_SHOULD_YIELD 1 diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c index d71d0e5bc..d98a8010e 100644 --- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c +++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c @@ -213,7 +213,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedC } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned portSHORT usStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { signed char *pxNext; diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_GCC_Rowley/ParTest/ParTest_ST_Eval.c b/FreeRTOS/Demo/CORTEX_STM32F103_GCC_Rowley/ParTest/ParTest_ST_Eval.c index 682f82fbc..2668ccaab 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_GCC_Rowley/ParTest/ParTest_ST_Eval.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_GCC_Rowley/ParTest/ParTest_ST_Eval.c @@ -78,7 +78,7 @@ #define partstMAX_OUTPUT_LED ( 4 ) #define partstFIRST_LED GPIO_Pin_6 -static unsigned portSHORT usOutputValue = 0; +static unsigned short usOutputValue = 0; /*-----------------------------------------------------------*/ @@ -96,7 +96,7 @@ GPIO_InitTypeDef GPIO_InitStructure; void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { @@ -106,7 +106,7 @@ unsigned portSHORT usBit; if( xValue == pdFALSE ) { - usBit ^= ( unsigned portSHORT ) 0xffff; + usBit ^= ( unsigned short ) 0xffff; usOutputValue &= usBit; } else @@ -123,7 +123,7 @@ unsigned portSHORT usBit; void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c index 682f82fbc..2668ccaab 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c @@ -78,7 +78,7 @@ #define partstMAX_OUTPUT_LED ( 4 ) #define partstFIRST_LED GPIO_Pin_6 -static unsigned portSHORT usOutputValue = 0; +static unsigned short usOutputValue = 0; /*-----------------------------------------------------------*/ @@ -96,7 +96,7 @@ GPIO_InitTypeDef GPIO_InitStructure; void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { @@ -106,7 +106,7 @@ unsigned portSHORT usBit; if( xValue == pdFALSE ) { - usBit ^= ( unsigned portSHORT ) 0xffff; + usBit ^= ( unsigned short ) 0xffff; usOutputValue &= usBit; } else @@ -123,7 +123,7 @@ unsigned portSHORT usBit; void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/main.c b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/main.c index dfc2175a2..f98eeb94f 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/main.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/main.c @@ -150,7 +150,7 @@ time. */ #define mainCHECK_DELAY ( ( portTickType ) 5000 / portTICK_RATE_MS ) /* The number of nano seconds between each processor clock. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* Baud rate used by the comtest tasks. */ #define mainCOM_TEST_BAUD_RATE ( 115200 ) @@ -257,7 +257,7 @@ xLCDMessage xMessage; /* Initialise the LCD and display a startup message. */ prvConfigureLCD(); - LCD_DrawMonoPict( ( unsigned portLONG * ) pcBitmap ); + LCD_DrawMonoPict( ( unsigned long * ) pcBitmap ); for( ;; ) { @@ -265,7 +265,7 @@ xLCDMessage xMessage; while( xQueueReceive( xLCDQueue, &xMessage, portMAX_DELAY ) != pdPASS ); /* Display the message. Print each message to a different position. */ - printf( ( portCHAR const * ) xMessage.pcMessage ); + printf( ( char const * ) xMessage.pcMessage ); } } /*-----------------------------------------------------------*/ @@ -274,8 +274,8 @@ static void vCheckTask( void *pvParameters ) { portTickType xLastExecutionTime; xLCDMessage xMessage; -static signed portCHAR cPassMessage[ mainMAX_MSG_LEN ]; -extern unsigned portSHORT usMaxJitter; +static signed char cPassMessage[ mainMAX_MSG_LEN ]; +extern unsigned short usMaxJitter; xLastExecutionTime = xTaskGetTickCount(); xMessage.pcMessage = cPassMessage; @@ -317,7 +317,7 @@ extern unsigned portSHORT usMaxJitter; } else { - sprintf( ( portCHAR * ) cPassMessage, "PASS [%uns]\n", ( ( unsigned portLONG ) usMaxJitter ) * mainNS_PER_CLOCK ); + sprintf( ( char * ) cPassMessage, "PASS [%uns]\n", ( ( unsigned long ) usMaxJitter ) * mainNS_PER_CLOCK ); } /* Send the message to the LCD gatekeeper for display. */ @@ -340,7 +340,7 @@ static void prvSetupHardware( void ) } /* 2 wait states required on the flash. */ - *( ( unsigned portLONG * ) 0x40022000 ) = 0x02; + *( ( unsigned long * ) 0x40022000 ) = 0x02; /* HCLK = SYSCLK */ RCC_HCLKConfig( RCC_SYSCLK_Div1 ); @@ -418,8 +418,8 @@ GPIO_InitTypeDef GPIO_InitStructure; int fputc( int ch, FILE *f ) { -static unsigned portSHORT usColumn = 0, usRefColumn = mainCOLUMN_START; -static unsigned portCHAR ucLine = 0; +static unsigned short usColumn = 0, usRefColumn = mainCOLUMN_START; +static unsigned char ucLine = 0; if( ( usColumn == 0 ) && ( ucLine == 0 ) ) { @@ -463,7 +463,7 @@ static unsigned portCHAR ucLine = 0; #ifdef DEBUG /* Keep the linker happy. */ -void assert_failed( unsigned portCHAR* pcFile, unsigned portLONG ulLine ) +void assert_failed( unsigned char* pcFile, unsigned long ulLine ) { for( ;; ) { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/serial/serial.c b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/serial/serial.c index 59a8cd0da..ecf12fdf1 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/serial/serial.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/serial/serial.c @@ -100,7 +100,7 @@ void vUARTInterruptHandler( void ); /* * See the serial2.h header file. */ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { xComPortHandle xReturn; USART_InitTypeDef USART_InitStructure; @@ -108,8 +108,8 @@ NVIC_InitTypeDef NVIC_InitStructure; GPIO_InitTypeDef GPIO_InitStructure; /* Create the queues used to hold Rx/Tx characters. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* If the queue/semaphore was created correctly then setup the serial port hardware. */ @@ -163,7 +163,7 @@ GPIO_InitTypeDef GPIO_InitStructure; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* The port handle is not required as this driver only supports one port. */ ( void ) pxPort; @@ -181,9 +181,9 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { -signed portCHAR *pxNext; +signed char *pxNext; /* A couple of parameters that this port does not use. */ ( void ) usStringLength; @@ -196,7 +196,7 @@ signed portCHAR *pxNext; ( void ) pxPort; /* Send each character in the string, one at a time. */ - pxNext = ( signed portCHAR * ) pcString; + pxNext = ( signed char * ) pcString; while( *pxNext ) { xSerialPutChar( pxPort, *pxNext, serNO_BLOCK ); @@ -205,7 +205,7 @@ signed portCHAR *pxNext; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { signed portBASE_TYPE xReturn; @@ -232,7 +232,7 @@ void vSerialClose( xComPortHandle xPort ) void vUARTInterruptHandler( void ) { portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; -portCHAR cChar; +char cChar; if( USART_GetITStatus( USART1, USART_IT_TXE ) == SET ) { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c index 44985a777..96bafd28b 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c @@ -75,7 +75,7 @@ /* The set frequency of the interrupt. Deviations from this are measured as the jitter. */ -#define timerINTERRUPT_FREQUENCY ( ( unsigned portSHORT ) 20000 ) +#define timerINTERRUPT_FREQUENCY ( ( unsigned short ) 20000 ) /* The expected time between each of the timer interrupts - if the jitter was zero. */ @@ -102,7 +102,7 @@ void vSetupTimerTest( void ); void vTimer2IntHandler( void ); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portSHORT usMaxJitter = 0; +volatile unsigned short usMaxJitter = 0; /*-----------------------------------------------------------*/ @@ -124,7 +124,7 @@ NVIC_InitTypeDef NVIC_InitStructure; /* Time base configuration for timer 2 - which generates the interrupts. */ ulFrequency = configCPU_CLOCK_HZ / timerINTERRUPT_FREQUENCY; - TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) ( ulFrequency & 0xffffUL ); + TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) ( ulFrequency & 0xffffUL ); TIM_TimeBaseStructure.TIM_Prescaler = 0x0; TIM_TimeBaseStructure.TIM_ClockDivision = 0x0; TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up; @@ -134,7 +134,7 @@ NVIC_InitTypeDef NVIC_InitStructure; /* Configuration for timer 3 which is used as a high resolution time measurement. */ - TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) 0xffff; + TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) 0xffff; TIM_TimeBaseInit( TIM3, &TIM_TimeBaseStructure ); TIM_ARRPreloadConfig( TIM3, ENABLE ); @@ -154,8 +154,8 @@ NVIC_InitTypeDef NVIC_InitStructure; void vTimer2IntHandler( void ) { -static unsigned portSHORT usLastCount = 0, usSettleCount = 0, usMaxDifference = 0; -unsigned portSHORT usThisCount, usDifference; +static unsigned short usLastCount = 0, usSettleCount = 0, usMaxDifference = 0; +unsigned short usThisCount, usDifference; /* Capture the free running timer 3 value as we enter the interrupt. */ usThisCount = TIM3->CNT; diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c index 682f82fbc..2668ccaab 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c @@ -78,7 +78,7 @@ #define partstMAX_OUTPUT_LED ( 4 ) #define partstFIRST_LED GPIO_Pin_6 -static unsigned portSHORT usOutputValue = 0; +static unsigned short usOutputValue = 0; /*-----------------------------------------------------------*/ @@ -96,7 +96,7 @@ GPIO_InitTypeDef GPIO_InitStructure; void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { @@ -106,7 +106,7 @@ unsigned portSHORT usBit; if( xValue == pdFALSE ) { - usBit ^= ( unsigned portSHORT ) 0xffff; + usBit ^= ( unsigned short ) 0xffff; usOutputValue &= usBit; } else @@ -123,7 +123,7 @@ unsigned portSHORT usBit; void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c index dfc2175a2..f98eeb94f 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/main.c @@ -150,7 +150,7 @@ time. */ #define mainCHECK_DELAY ( ( portTickType ) 5000 / portTICK_RATE_MS ) /* The number of nano seconds between each processor clock. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* Baud rate used by the comtest tasks. */ #define mainCOM_TEST_BAUD_RATE ( 115200 ) @@ -257,7 +257,7 @@ xLCDMessage xMessage; /* Initialise the LCD and display a startup message. */ prvConfigureLCD(); - LCD_DrawMonoPict( ( unsigned portLONG * ) pcBitmap ); + LCD_DrawMonoPict( ( unsigned long * ) pcBitmap ); for( ;; ) { @@ -265,7 +265,7 @@ xLCDMessage xMessage; while( xQueueReceive( xLCDQueue, &xMessage, portMAX_DELAY ) != pdPASS ); /* Display the message. Print each message to a different position. */ - printf( ( portCHAR const * ) xMessage.pcMessage ); + printf( ( char const * ) xMessage.pcMessage ); } } /*-----------------------------------------------------------*/ @@ -274,8 +274,8 @@ static void vCheckTask( void *pvParameters ) { portTickType xLastExecutionTime; xLCDMessage xMessage; -static signed portCHAR cPassMessage[ mainMAX_MSG_LEN ]; -extern unsigned portSHORT usMaxJitter; +static signed char cPassMessage[ mainMAX_MSG_LEN ]; +extern unsigned short usMaxJitter; xLastExecutionTime = xTaskGetTickCount(); xMessage.pcMessage = cPassMessage; @@ -317,7 +317,7 @@ extern unsigned portSHORT usMaxJitter; } else { - sprintf( ( portCHAR * ) cPassMessage, "PASS [%uns]\n", ( ( unsigned portLONG ) usMaxJitter ) * mainNS_PER_CLOCK ); + sprintf( ( char * ) cPassMessage, "PASS [%uns]\n", ( ( unsigned long ) usMaxJitter ) * mainNS_PER_CLOCK ); } /* Send the message to the LCD gatekeeper for display. */ @@ -340,7 +340,7 @@ static void prvSetupHardware( void ) } /* 2 wait states required on the flash. */ - *( ( unsigned portLONG * ) 0x40022000 ) = 0x02; + *( ( unsigned long * ) 0x40022000 ) = 0x02; /* HCLK = SYSCLK */ RCC_HCLKConfig( RCC_SYSCLK_Div1 ); @@ -418,8 +418,8 @@ GPIO_InitTypeDef GPIO_InitStructure; int fputc( int ch, FILE *f ) { -static unsigned portSHORT usColumn = 0, usRefColumn = mainCOLUMN_START; -static unsigned portCHAR ucLine = 0; +static unsigned short usColumn = 0, usRefColumn = mainCOLUMN_START; +static unsigned char ucLine = 0; if( ( usColumn == 0 ) && ( ucLine == 0 ) ) { @@ -463,7 +463,7 @@ static unsigned portCHAR ucLine = 0; #ifdef DEBUG /* Keep the linker happy. */ -void assert_failed( unsigned portCHAR* pcFile, unsigned portLONG ulLine ) +void assert_failed( unsigned char* pcFile, unsigned long ulLine ) { for( ;; ) { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c index 59a8cd0da..ecf12fdf1 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c @@ -100,7 +100,7 @@ void vUARTInterruptHandler( void ); /* * See the serial2.h header file. */ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { xComPortHandle xReturn; USART_InitTypeDef USART_InitStructure; @@ -108,8 +108,8 @@ NVIC_InitTypeDef NVIC_InitStructure; GPIO_InitTypeDef GPIO_InitStructure; /* Create the queues used to hold Rx/Tx characters. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* If the queue/semaphore was created correctly then setup the serial port hardware. */ @@ -163,7 +163,7 @@ GPIO_InitTypeDef GPIO_InitStructure; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* The port handle is not required as this driver only supports one port. */ ( void ) pxPort; @@ -181,9 +181,9 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { -signed portCHAR *pxNext; +signed char *pxNext; /* A couple of parameters that this port does not use. */ ( void ) usStringLength; @@ -196,7 +196,7 @@ signed portCHAR *pxNext; ( void ) pxPort; /* Send each character in the string, one at a time. */ - pxNext = ( signed portCHAR * ) pcString; + pxNext = ( signed char * ) pcString; while( *pxNext ) { xSerialPutChar( pxPort, *pxNext, serNO_BLOCK ); @@ -205,7 +205,7 @@ signed portCHAR *pxNext; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { signed portBASE_TYPE xReturn; @@ -232,7 +232,7 @@ void vSerialClose( xComPortHandle xPort ) void vUARTInterruptHandler( void ) { portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; -portCHAR cChar; +char cChar; if( USART_GetITStatus( USART1, USART_IT_TXE ) == SET ) { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/timertest.c b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/timertest.c index 44985a777..96bafd28b 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/timertest.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/timertest.c @@ -75,7 +75,7 @@ /* The set frequency of the interrupt. Deviations from this are measured as the jitter. */ -#define timerINTERRUPT_FREQUENCY ( ( unsigned portSHORT ) 20000 ) +#define timerINTERRUPT_FREQUENCY ( ( unsigned short ) 20000 ) /* The expected time between each of the timer interrupts - if the jitter was zero. */ @@ -102,7 +102,7 @@ void vSetupTimerTest( void ); void vTimer2IntHandler( void ); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portSHORT usMaxJitter = 0; +volatile unsigned short usMaxJitter = 0; /*-----------------------------------------------------------*/ @@ -124,7 +124,7 @@ NVIC_InitTypeDef NVIC_InitStructure; /* Time base configuration for timer 2 - which generates the interrupts. */ ulFrequency = configCPU_CLOCK_HZ / timerINTERRUPT_FREQUENCY; - TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) ( ulFrequency & 0xffffUL ); + TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) ( ulFrequency & 0xffffUL ); TIM_TimeBaseStructure.TIM_Prescaler = 0x0; TIM_TimeBaseStructure.TIM_ClockDivision = 0x0; TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up; @@ -134,7 +134,7 @@ NVIC_InitTypeDef NVIC_InitStructure; /* Configuration for timer 3 which is used as a high resolution time measurement. */ - TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) 0xffff; + TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) 0xffff; TIM_TimeBaseInit( TIM3, &TIM_TimeBaseStructure ); TIM_ARRPreloadConfig( TIM3, ENABLE ); @@ -154,8 +154,8 @@ NVIC_InitTypeDef NVIC_InitStructure; void vTimer2IntHandler( void ) { -static unsigned portSHORT usLastCount = 0, usSettleCount = 0, usMaxDifference = 0; -unsigned portSHORT usThisCount, usDifference; +static unsigned short usLastCount = 0, usSettleCount = 0, usMaxDifference = 0; +unsigned short usThisCount, usDifference; /* Capture the free running timer 3 value as we enter the interrupt. */ usThisCount = TIM3->CNT; diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c index 7a3aaf93b..87fe0b565 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c @@ -75,7 +75,7 @@ #define partstMAX_OUTPUT_LED ( 2 ) #define partstFIRST_LED GPIO_Pin_8 -static unsigned portSHORT usOutputValue = 0; +static unsigned short usOutputValue = 0; /*-----------------------------------------------------------*/ @@ -97,7 +97,7 @@ GPIO_InitTypeDef GPIO_InitStructure; void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { @@ -107,7 +107,7 @@ unsigned portSHORT usBit; if( xValue == pdFALSE ) { - usBit ^= ( unsigned portSHORT ) 0xffff; + usBit ^= ( unsigned short ) 0xffff; usOutputValue &= usBit; } else @@ -124,7 +124,7 @@ unsigned portSHORT usBit; void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { -unsigned portSHORT usBit; +unsigned short usBit; vTaskSuspendAll(); { diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/main.c b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/main.c index 0ae9fa57b..dfd949d9e 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/main.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/main.c @@ -173,7 +173,7 @@ these can require a larger stack. */ #define mainFLASH_DELAY ( ( portTickType ) 1000 / portTICK_RATE_MS ) /* The number of nano seconds between each processor clock. */ -#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) ) /* The two types of message that can be sent to the LCD task. */ #define mainUPDATE_BALL_MESSAGE ( 0 ) @@ -279,9 +279,9 @@ int main( void ) void prvLCDTask( void *pvParameters ) { xLCDMessage xMessage; -portCHAR cY = mainLCD_CHAR_HEIGHT; -const portCHAR * const pcString = "www.FreeRTOS.org"; -const portCHAR * const pcBlankLine = " "; +char cY = mainLCD_CHAR_HEIGHT; +const char * const pcString = "www.FreeRTOS.org"; +const char * const pcBlankLine = " "; DRAW_Init(); @@ -330,8 +330,8 @@ static void prvCheckTask( void *pvParameters ) { portTickType xLastExecutionTime; xLCDMessage xMessage; -static signed portCHAR cPassMessage[ mainMAX_MSG_LEN ]; -extern unsigned portSHORT usMaxJitter; +static signed char cPassMessage[ mainMAX_MSG_LEN ]; +extern unsigned short usMaxJitter; /* Initialise the xLastExecutionTime variable on task entry. */ xLastExecutionTime = xTaskGetTickCount(); @@ -374,7 +374,7 @@ extern unsigned portSHORT usMaxJitter; with the max measured jitter time also included (as per the fast interrupt test described at the top of this file and on the online documentation page for this demo application). */ - sprintf( ( portCHAR * ) cPassMessage, "PASS [%uns]", ( ( unsigned portLONG ) usMaxJitter ) * mainNS_PER_CLOCK ); + sprintf( ( char * ) cPassMessage, "PASS [%uns]", ( ( unsigned long ) usMaxJitter ) * mainNS_PER_CLOCK ); } /* Send the message to the LCD gatekeeper for display. */ @@ -385,7 +385,7 @@ extern unsigned portSHORT usMaxJitter; void vApplicationTickHook( void ) { -static unsigned portLONG ulCallCount; +static unsigned long ulCallCount; static const xLCDMessage xMemsMessage = { mainUPDATE_BALL_MESSAGE, NULL }; static portBASE_TYPE xHigherPriorityTaskWoken; @@ -415,7 +415,7 @@ static void prvSetupHardware( void ) } /* 2 wait states required on the flash. */ - *( ( unsigned portLONG * ) 0x40022000 ) = 0x02; + *( ( unsigned long * ) 0x40022000 ) = 0x02; /* HCLK = SYSCLK */ RCC_HCLKConfig( RCC_SYSCLK_Div1 ); diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c index 44985a777..96bafd28b 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c +++ b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c @@ -75,7 +75,7 @@ /* The set frequency of the interrupt. Deviations from this are measured as the jitter. */ -#define timerINTERRUPT_FREQUENCY ( ( unsigned portSHORT ) 20000 ) +#define timerINTERRUPT_FREQUENCY ( ( unsigned short ) 20000 ) /* The expected time between each of the timer interrupts - if the jitter was zero. */ @@ -102,7 +102,7 @@ void vSetupTimerTest( void ); void vTimer2IntHandler( void ); /* Stores the value of the maximum recorded jitter between interrupts. */ -volatile unsigned portSHORT usMaxJitter = 0; +volatile unsigned short usMaxJitter = 0; /*-----------------------------------------------------------*/ @@ -124,7 +124,7 @@ NVIC_InitTypeDef NVIC_InitStructure; /* Time base configuration for timer 2 - which generates the interrupts. */ ulFrequency = configCPU_CLOCK_HZ / timerINTERRUPT_FREQUENCY; - TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) ( ulFrequency & 0xffffUL ); + TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) ( ulFrequency & 0xffffUL ); TIM_TimeBaseStructure.TIM_Prescaler = 0x0; TIM_TimeBaseStructure.TIM_ClockDivision = 0x0; TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up; @@ -134,7 +134,7 @@ NVIC_InitTypeDef NVIC_InitStructure; /* Configuration for timer 3 which is used as a high resolution time measurement. */ - TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) 0xffff; + TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) 0xffff; TIM_TimeBaseInit( TIM3, &TIM_TimeBaseStructure ); TIM_ARRPreloadConfig( TIM3, ENABLE ); @@ -154,8 +154,8 @@ NVIC_InitTypeDef NVIC_InitStructure; void vTimer2IntHandler( void ) { -static unsigned portSHORT usLastCount = 0, usSettleCount = 0, usMaxDifference = 0; -unsigned portSHORT usThisCount, usDifference; +static unsigned short usLastCount = 0, usSettleCount = 0, usMaxDifference = 0; +unsigned short usThisCount, usDifference; /* Capture the free running timer 3 value as we enter the interrupt. */ usThisCount = TIM3->CNT; diff --git a/FreeRTOS/Demo/CORTEX_STM32L152_IAR/serial.c b/FreeRTOS/Demo/CORTEX_STM32L152_IAR/serial.c index 74b0fc7b8..f14137061 100644 --- a/FreeRTOS/Demo/CORTEX_STM32L152_IAR/serial.c +++ b/FreeRTOS/Demo/CORTEX_STM32L152_IAR/serial.c @@ -104,15 +104,15 @@ static xQueueHandle xCharsForTx; /* * See the serial2.h header file. */ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { USART_InitTypeDef USART_InitStructure; xComPortHandle xReturn; NVIC_InitTypeDef NVIC_InitStructure; /* Create the queues used to hold Rx/Tx characters. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* If the queues were created correctly then setup the serial port hardware. */ @@ -147,7 +147,7 @@ NVIC_InitTypeDef NVIC_InitStructure; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* The port handle is not required as this driver only supports one port. */ ( void ) pxPort; @@ -165,9 +165,9 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { -signed portCHAR *pxNext; +signed char *pxNext; /* A couple of parameters that this port does not use. */ ( void ) usStringLength; @@ -180,7 +180,7 @@ signed portCHAR *pxNext; ( void ) pxPort; /* Send each character in the string, one at a time. */ - pxNext = ( signed portCHAR * ) pcString; + pxNext = ( signed char * ) pcString; while( *pxNext ) { xSerialPutChar( pxPort, *pxNext, serNO_BLOCK ); @@ -189,7 +189,7 @@ signed portCHAR *pxNext; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { signed portBASE_TYPE xReturn; @@ -216,7 +216,7 @@ void vSerialClose( xComPortHandle xPort ) void USART3_IRQHandler( void ) { portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; -portCHAR cChar; +char cChar; if( USART_GetITStatus( USART3, USART_IT_TXE ) == SET ) { diff --git a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c index 7d921b4f0..796d0e0b7 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c +++ b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c @@ -111,7 +111,7 @@ __declspec(interrupt:0) void vPIT0InterruptHandler( void ); */ void vApplicationSetupInterrupts( void ) { -const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); +const unsigned short usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); /* Configure interrupt priority and level and unmask interrupt for PIT0. */ MCF_INTC0_ICR55 = ( 1 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) ); @@ -132,7 +132,7 @@ const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRES __declspec(interrupt:0) void vPIT0InterruptHandler( void ) { -unsigned portLONG ulSavedInterruptMask; +unsigned long ulSavedInterruptMask; /* Clear the PIT0 interrupt. */ MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF; diff --git a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c index 3478acf24..cf0172a30 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c +++ b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c @@ -117,7 +117,7 @@ error have been detected. */ #define mainCHECK_LED ( 3 ) /* ComTest constants - there is no free LED for the comtest tasks. */ -#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 19200 ) +#define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 19200 ) #define mainCOM_TEST_LED ( 5 ) /* Task priorities. */ @@ -157,7 +157,7 @@ static void vRegTest2Task( void *pvParameters ); /*-----------------------------------------------------------*/ /* Counters used to detect errors within the reg test tasks. */ -static volatile unsigned portLONG ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; +static volatile unsigned long ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; /*-----------------------------------------------------------*/ @@ -197,7 +197,7 @@ int main( void ) static void prvCheckTask( void *pvParameters ) { -unsigned portLONG ulTicksToWait = mainNO_ERROR_PERIOD, ulError = 0, ulLastRegTest1Count = 0, ulLastRegTest2Count = 0; +unsigned long ulTicksToWait = mainNO_ERROR_PERIOD, ulError = 0, ulLastRegTest1Count = 0, ulLastRegTest2Count = 0; portTickType xLastExecutionTime; volatile unsigned portBASE_TYPE uxUnusedStack; @@ -276,7 +276,7 @@ void prvSetupHardware( void ) } /*-----------------------------------------------------------*/ -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName ) { /* This will get called if a stack overflow is detected during the context switch. Set configCHECK_FOR_STACK_OVERFLOWS to 2 to also check for stack diff --git a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c index 75ef1895c..a7824c121 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c +++ b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c @@ -82,14 +82,14 @@ an example of an efficient driver. */ #include "serial.h" /* Hardware definitions. */ -#define serNO_PARITY ( ( unsigned portCHAR ) 0x02 << 3 ) -#define ser8DATA_BITS ( ( unsigned portCHAR ) 0x03 ) -#define ser1STOP_BIT ( ( unsigned portCHAR ) 0x07 ) -#define serSYSTEM_CLOCK ( ( unsigned portCHAR ) 0xdd ) -#define serTX_ENABLE ( ( unsigned portCHAR ) 0x04 ) -#define serRX_ENABLE ( ( unsigned portCHAR ) 0x01 ) -#define serTX_INT ( ( unsigned portCHAR ) 0x01 ) -#define serRX_INT ( ( unsigned portCHAR ) 0x02 ) +#define serNO_PARITY ( ( unsigned char ) 0x02 << 3 ) +#define ser8DATA_BITS ( ( unsigned char ) 0x03 ) +#define ser1STOP_BIT ( ( unsigned char ) 0x07 ) +#define serSYSTEM_CLOCK ( ( unsigned char ) 0xdd ) +#define serTX_ENABLE ( ( unsigned char ) 0x04 ) +#define serRX_ENABLE ( ( unsigned char ) 0x01 ) +#define serTX_INT ( ( unsigned char ) 0x01 ) +#define serRX_INT ( ( unsigned char ) 0x02 ) /* The queues used to communicate between tasks and ISR's. */ @@ -101,13 +101,13 @@ static portBASE_TYPE xTxHasEnded = pdTRUE; /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { -const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) ); +const unsigned long ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) ); /* Create the queues used by the com test task. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); xTxHasEnded = pdTRUE; @@ -127,8 +127,8 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa MCF_UART0_UMR2 = ser1STOP_BIT; MCF_UART0_UCSR = serSYSTEM_CLOCK; - MCF_UART0_UBG1 = ( unsigned portCHAR ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL ); - MCF_UART0_UBG2 = ( unsigned portCHAR ) ( ulBaudRateDivisor & 0xffUL ); + MCF_UART0_UBG1 = ( unsigned char ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL ); + MCF_UART0_UBG2 = ( unsigned char ) ( ulBaudRateDivisor & 0xffUL ); /* Turn it on. */ MCF_UART0_UCR = serTX_ENABLE | serRX_ENABLE; @@ -146,7 +146,7 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* Only one port is supported. */ ( void ) pxPort; @@ -164,7 +164,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { /* Only one port is supported. */ ( void ) pxPort; @@ -195,7 +195,7 @@ void vSerialClose( xComPortHandle xPort ) __declspec(interrupt:0) void vUART0InterruptHandler( void ) { -unsigned portCHAR ucChar; +unsigned char ucChar; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE, xDoneSomething = pdTRUE; while( xDoneSomething != pdFALSE ) diff --git a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c index 43d74dee2..8ed97bb67 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c +++ b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c @@ -110,7 +110,7 @@ */ void vApplicationSetupInterrupts( void ) { -const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); +const unsigned short usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); /* Configure interrupt priority and level and unmask interrupt for PIT0. */ MCF_INTC0_ICR55 = ( 1 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) ); @@ -131,7 +131,7 @@ const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRES void __attribute__ ((interrupt)) __cs3_isr_interrupt_119( void ) { -unsigned portLONG ulSavedInterruptMask; +unsigned long ulSavedInterruptMask; /* Clear the PIT0 interrupt. */ MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF; diff --git a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c index 977bf9797..9a64b8324 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c +++ b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c @@ -112,7 +112,7 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { taskENTER_CRITICAL(); { - if( ( MCF_GPIO_PORTTC & ( 1 << uxLED ) ) == ( unsigned portCHAR ) 0 ) + if( ( MCF_GPIO_PORTTC & ( 1 << uxLED ) ) == ( unsigned char ) 0 ) { MCF_GPIO_PORTTC |= ( 1 << uxLED ); } diff --git a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c index bb914c0bf..50871121a 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c +++ b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c @@ -153,11 +153,11 @@ static void vRegTest2Task( void *pvParameters ); /*-----------------------------------------------------------*/ /* Counters used to detect errors within the reg test tasks. */ -static volatile unsigned portLONG ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; +static volatile unsigned long ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; /* Any errors that the check task finds in any tasks are latched into ulErrorCode, and then displayed via the WEB server. */ -static unsigned portLONG ulErrorCode = 0UL; +static unsigned long ulErrorCode = 0UL; /*-----------------------------------------------------------*/ @@ -266,7 +266,7 @@ portTickType xLastExecutionTime; } /*-----------------------------------------------------------*/ -unsigned portLONG ulGetErrorCode( void ) +unsigned long ulGetErrorCode( void ) { /* Returns the error code for display via the WEB server. */ return ulErrorCode; @@ -323,7 +323,7 @@ static const unsigned long _cfm[6] = { } /*-----------------------------------------------------------*/ -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName ) { /* This will get called if a stack overflow is detected during the context switch. Set configCHECK_FOR_STACK_OVERFLOWS to 2 to also check for stack diff --git a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c index fd8829f63..6b1ccd0e3 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c +++ b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c @@ -100,16 +100,16 @@ xSemaphoreHandle xFECSemaphore = NULL, xTxSemaphore = NULL; /* The buffer used by the uIP stack. In this case the pointer is used to point to one of the Rx buffers to effect a zero copy policy. */ -unsigned portCHAR *uip_buf; +unsigned char *uip_buf; /* The DMA descriptors. This is a char array to allow us to align it correctly. */ -static unsigned portCHAR xFECTxDescriptors_unaligned[ ( fecNUM_FEC_TX_BUFFERS * sizeof( FECBD ) ) + 16 ]; -static unsigned portCHAR xFECRxDescriptors_unaligned[ ( configNUM_FEC_RX_BUFFERS * sizeof( FECBD ) ) + 16 ]; +static unsigned char xFECTxDescriptors_unaligned[ ( fecNUM_FEC_TX_BUFFERS * sizeof( FECBD ) ) + 16 ]; +static unsigned char xFECRxDescriptors_unaligned[ ( configNUM_FEC_RX_BUFFERS * sizeof( FECBD ) ) + 16 ]; static FECBD *xFECTxDescriptors; static FECBD *xFECRxDescriptors; /* The DMA buffers. These are char arrays to allow them to be aligned correctly. */ -static unsigned portCHAR ucFECRxBuffers[ ( configNUM_FEC_RX_BUFFERS * configFEC_BUFFER_SIZE ) + 16 ]; +static unsigned char ucFECRxBuffers[ ( configNUM_FEC_RX_BUFFERS * configFEC_BUFFER_SIZE ) + 16 ]; static unsigned portBASE_TYPE uxNextRxBuffer = 0, uxIndexToBufferOwner = 0; /*-----------------------------------------------------------*/ @@ -214,7 +214,7 @@ uint32 eimr; * If after a suitable amount of time the event isn't triggered, a * value of 0 is returned. */ -static int fec_mii_read( int phy_addr, int reg_addr, unsigned portSHORT* data ) +static int fec_mii_read( int phy_addr, int reg_addr, unsigned short* data ) { int timeout, iReturn; uint32 eimr; @@ -274,10 +274,10 @@ uint32 eimr; * Return Value: * The 6 most significant bits of the 32-bit CRC result */ -static unsigned portCHAR fec_hash_address( const unsigned portCHAR* addr ) +static unsigned char fec_hash_address( const unsigned char* addr ) { -unsigned portLONG crc; -unsigned portCHAR byte; +unsigned long crc; +unsigned char byte; int i, j; crc = 0xFFFFFFFF; @@ -300,7 +300,7 @@ int i, j; } } - return (unsigned portCHAR)(crc >> 26); + return (unsigned char)(crc >> 26); } /********************************************************************/ @@ -314,9 +314,9 @@ int i, j; * ch FEC channel * pa Physical (Hardware) Address for the selected FEC */ -static void fec_set_address( const unsigned portCHAR *pa ) +static void fec_set_address( const unsigned char *pa ) { - unsigned portCHAR crc; + unsigned char crc; /* * Set the Physical Address @@ -332,11 +332,11 @@ static void fec_set_address( const unsigned portCHAR *pa ) crc = fec_hash_address( pa ); if( crc >= 32 ) { - MCF_FEC_IAUR |= (unsigned portLONG)(1 << (crc - 32)); + MCF_FEC_IAUR |= (unsigned long)(1 << (crc - 32)); } else { - MCF_FEC_IALR |= (unsigned portLONG)(1 << crc); + MCF_FEC_IALR |= (unsigned long)(1 << crc); } } /*-----------------------------------------------------------*/ @@ -344,11 +344,11 @@ static void fec_set_address( const unsigned portCHAR *pa ) static void prvInitialiseFECBuffers( void ) { unsigned portBASE_TYPE ux; -unsigned portCHAR *pcBufPointer; +unsigned char *pcBufPointer; /* Correctly align the Tx descriptor pointer. */ pcBufPointer = &( xFECTxDescriptors_unaligned[ 0 ] ); - while( ( ( unsigned portLONG ) pcBufPointer & 0x0fUL ) != 0 ) + while( ( ( unsigned long ) pcBufPointer & 0x0fUL ) != 0 ) { pcBufPointer++; } @@ -357,7 +357,7 @@ unsigned portCHAR *pcBufPointer; /* Likewise the Rx descriptor pointer. */ pcBufPointer = &( xFECRxDescriptors_unaligned[ 0 ] ); - while( ( ( unsigned portLONG ) pcBufPointer & 0x0fUL ) != 0 ) + while( ( ( unsigned long ) pcBufPointer & 0x0fUL ) != 0 ) { pcBufPointer++; } @@ -378,7 +378,7 @@ unsigned portCHAR *pcBufPointer; /* Setup the Rx buffers and descriptors, having first ensured correct alignment. */ pcBufPointer = &( ucFECRxBuffers[ 0 ] ); - while( ( ( unsigned portLONG ) pcBufPointer & 0x0fUL ) != 0 ) + while( ( ( unsigned long ) pcBufPointer & 0x0fUL ) != 0 ) { pcBufPointer++; } @@ -401,12 +401,12 @@ unsigned portCHAR *pcBufPointer; void vFECInit( void ) { -unsigned portSHORT usData; +unsigned short usData; struct uip_eth_addr xAddr; unsigned portBASE_TYPE ux; /* The MAC address is set at the foot of FreeRTOSConfig.h. */ -const unsigned portCHAR ucMACAddress[6] = +const unsigned char ucMACAddress[6] = { configMAC_0, configMAC_1,configMAC_2, configMAC_3, configMAC_4, configMAC_5 }; @@ -518,13 +518,13 @@ const unsigned portCHAR ucMACAddress[6] = if( ( usData & PHY_ANLPAR_100BTX_FDX ) || ( usData & PHY_ANLPAR_10BTX_FDX ) ) { - MCF_FEC_RCR &= (unsigned portLONG)~MCF_FEC_RCR_DRT; + MCF_FEC_RCR &= (unsigned long)~MCF_FEC_RCR_DRT; MCF_FEC_TCR |= MCF_FEC_TCR_FDEN; } else { MCF_FEC_RCR |= MCF_FEC_RCR_DRT; - MCF_FEC_TCR &= (unsigned portLONG)~MCF_FEC_TCR_FDEN; + MCF_FEC_TCR &= (unsigned long)~MCF_FEC_TCR_FDEN; } /* Clear the Individual and Group Address Hash registers */ @@ -537,19 +537,19 @@ const unsigned portCHAR ucMACAddress[6] = fec_set_address( ucMACAddress ); /* Set Rx Buffer Size */ - MCF_FEC_EMRBR = (unsigned portSHORT)configFEC_BUFFER_SIZE; + MCF_FEC_EMRBR = (unsigned short)configFEC_BUFFER_SIZE; /* Point to the start of the circular Rx buffer descriptor queue */ - MCF_FEC_ERDSR = ( volatile unsigned portLONG ) &( xFECRxDescriptors[ 0 ] ); + MCF_FEC_ERDSR = ( volatile unsigned long ) &( xFECRxDescriptors[ 0 ] ); /* Point to the start of the circular Tx buffer descriptor queue */ - MCF_FEC_ETSDR = ( volatile unsigned portLONG ) &( xFECTxDescriptors[ 0 ] ); + MCF_FEC_ETSDR = ( volatile unsigned long ) &( xFECTxDescriptors[ 0 ] ); /* Mask all FEC interrupts */ - MCF_FEC_EIMR = ( unsigned portLONG ) -1; + MCF_FEC_EIMR = ( unsigned long ) -1; /* Clear all FEC interrupt events */ - MCF_FEC_EIR = ( unsigned portLONG ) -1; + MCF_FEC_EIR = ( unsigned long ) -1; /* Initialize the Receive Control Register */ MCF_FEC_RCR = MCF_FEC_RCR_MAX_FL(ETH_MAX_FRM) | MCF_FEC_RCR_FCE; @@ -638,7 +638,7 @@ portBASE_TYPE x; unsigned short usFECGetRxedData( void ) { -unsigned portSHORT usLen; +unsigned short usLen; /* Obtain the size of the packet and put it into the "len" variable. */ usLen = xFECRxDescriptors[ uxNextRxBuffer ].length; @@ -717,7 +717,7 @@ void vFECSendData( void ) void vFEC_ISR( void ) { -unsigned portLONG ulEvent; +unsigned long ulEvent; portBASE_TYPE xHighPriorityTaskWoken = pdFALSE; /* This handler is called in response to any of the many separate FEC diff --git a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c index 7258ef978..cbea1de93 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c +++ b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c @@ -111,7 +111,7 @@ __declspec(interrupt:0) void vPIT0InterruptHandler( void ); */ void vApplicationSetupInterrupts( void ) { -const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); +const unsigned short usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); /* Configure interrupt priority and level and unmask interrupt for PIT0. */ MCF_INTC0_ICR55 = ( 1 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) ); @@ -132,7 +132,7 @@ const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRES __declspec(interrupt:0) void vPIT0InterruptHandler( void ) { -unsigned portLONG ulSavedInterruptMask; +unsigned long ulSavedInterruptMask; /* Clear the PIT0 interrupt. */ MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF; diff --git a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c index a20ee5593..237b306a5 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c +++ b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c @@ -139,11 +139,11 @@ static void vProcessConnection( struct netconn *pxNetCon ); */ static void vProcessConnection( struct netconn *pxNetCon ) { - static portCHAR cDynamicPage[webMAX_PAGE_SIZE], cPageHits[11]; + static char cDynamicPage[webMAX_PAGE_SIZE], cPageHits[11]; struct netbuf *pxRxBuffer; - portCHAR *pcRxString; - unsigned portSHORT usLength; - static unsigned portLONG ulPageHits = 0; + char *pcRxString; + unsigned short usLength; + static unsigned long ulPageHits = 0; /* We expect to immediately get data. */ pxRxBuffer = netconn_recv( pxNetCon ); diff --git a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/main.c b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/main.c index f3221260f..9a1c7b911 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/main.c +++ b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/main.c @@ -126,7 +126,7 @@ error have been detected. */ #define mainCHECK_LED ( 3 ) /* ComTest constants - there is no free LED for the comtest tasks. */ -#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 19200 ) +#define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 19200 ) #define mainCOM_TEST_LED ( 5 ) /* Task priorities. */ @@ -160,7 +160,7 @@ static void vRegTest2Task( void *pvParameters ); /*-----------------------------------------------------------*/ /* Counters used to detect errors within the reg test tasks. */ -static volatile unsigned portLONG ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; +static volatile unsigned long ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; /*-----------------------------------------------------------*/ @@ -291,7 +291,7 @@ void prvSetupHardware( void ) } /*-----------------------------------------------------------*/ -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName ) { /* This will get called if a stack overflow is detected during the context switch. Set configCHECK_FOR_STACK_OVERFLOWS to 2 to also check for stack diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c index 43d74dee2..8ed97bb67 100644 --- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c +++ b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c @@ -110,7 +110,7 @@ */ void vApplicationSetupInterrupts( void ) { -const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); +const unsigned short usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ ); /* Configure interrupt priority and level and unmask interrupt for PIT0. */ MCF_INTC0_ICR55 = ( 1 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) ); @@ -131,7 +131,7 @@ const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRES void __attribute__ ((interrupt)) __cs3_isr_interrupt_119( void ) { -unsigned portLONG ulSavedInterruptMask; +unsigned long ulSavedInterruptMask; /* Clear the PIT0 interrupt. */ MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF; diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c index c01690426..957c39df8 100644 --- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c +++ b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c @@ -73,8 +73,8 @@ void vInitialiseTimerForIntQueueTest( void ) { -const unsigned portSHORT usCompareMatchValue1 = ( unsigned portSHORT ) ( ( configCPU_CLOCK_HZ / timerPRESCALE_VALUE ) / timerINTERRUPT1_FREQUENCY ); -const unsigned portSHORT usCompareMatchValue2 = ( unsigned portSHORT ) ( ( configCPU_CLOCK_HZ / timerPRESCALE_VALUE ) / timerINTERRUPT2_FREQUENCY ); +const unsigned short usCompareMatchValue1 = ( unsigned short ) ( ( configCPU_CLOCK_HZ / timerPRESCALE_VALUE ) / timerINTERRUPT1_FREQUENCY ); +const unsigned short usCompareMatchValue2 = ( unsigned short ) ( ( configCPU_CLOCK_HZ / timerPRESCALE_VALUE ) / timerINTERRUPT2_FREQUENCY ); /* Configure interrupt priority and level and unmask interrupt. */ MCF_INTC0_ICR56 = ( ( configMAX_SYSCALL_INTERRUPT_PRIORITY - 1 ) << 3 ); diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c index a3be8df1c..b3ee70d8b 100644 --- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c +++ b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c @@ -81,7 +81,7 @@ #define LED2_POS 0x01 #define LED3_POS 0x04 -static const unsigned portCHAR ucLEDDefinitions[ partstNUM_LEDs ] = { LED0_POS, LED1_POS, LED2_POS, LED3_POS }; +static const unsigned char ucLEDDefinitions[ partstNUM_LEDs ] = { LED0_POS, LED1_POS, LED2_POS, LED3_POS }; /*----------------------------------------------------------- * Simple parallel port IO routines. @@ -140,7 +140,7 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { taskENTER_CRITICAL(); { - if( ( MCF_GPIO_PORTTD & ucLEDDefinitions[ uxLED ] ) == ( unsigned portCHAR ) 0 ) + if( ( MCF_GPIO_PORTTD & ucLEDDefinitions[ uxLED ] ) == ( unsigned char ) 0 ) { MCF_GPIO_PORTTD |= ucLEDDefinitions[ uxLED ]; } @@ -155,7 +155,7 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) { taskENTER_CRITICAL(); { - if( ( MCF_GPIO_PORTTC & ucLEDDefinitions[ uxLED ] ) == ( unsigned portCHAR ) 0 ) + if( ( MCF_GPIO_PORTTC & ucLEDDefinitions[ uxLED ] ) == ( unsigned char ) 0 ) { MCF_GPIO_PORTTC |= ucLEDDefinitions[ uxLED ]; } diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c index f3819c950..b4a038f83 100644 --- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c +++ b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c @@ -122,7 +122,7 @@ error have been detected. */ #define mainCHECK_LED ( 3 ) /* ComTest constants - there is no free LED for the comtest tasks. */ -#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 19200 ) +#define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 19200 ) #define mainCOM_TEST_LED ( 5 ) /* Task priorities. */ @@ -155,7 +155,7 @@ static void vRegTest2Task( void *pvParameters ); /*-----------------------------------------------------------*/ /* Counters used to detect errors within the reg test tasks. */ -static volatile unsigned portLONG ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; +static volatile unsigned long ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222; /*-----------------------------------------------------------*/ @@ -292,7 +292,7 @@ portTickType xLastExecutionTime; void prvSetupHardware( void ) { -extern void mcf5xxx_wr_cacr( unsigned portLONG ); +extern void mcf5xxx_wr_cacr( unsigned long ); portDISABLE_INTERRUPTS(); @@ -314,7 +314,7 @@ extern void mcf5xxx_wr_cacr( unsigned portLONG ); } /*-----------------------------------------------------------*/ -void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName ) { /* This will get called if a stack overflow is detected during the context switch. Set configCHECK_FOR_STACK_OVERFLOWS to 2 to also check for stack diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c index 58f234630..756469a41 100644 --- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c +++ b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c @@ -82,16 +82,16 @@ an example of an efficient driver. */ #include "serial.h" /* Hardware definitions. */ -#define serNO_PARITY ( ( unsigned portCHAR ) 0x02 << 3 ) -#define ser8DATA_BITS ( ( unsigned portCHAR ) 0x03 ) -#define ser1STOP_BIT ( ( unsigned portCHAR ) 0x07 ) -#define serSYSTEM_CLOCK ( ( unsigned portCHAR ) 0xdd ) -#define serTX_OUTPUT ( ( unsigned portCHAR ) 0x04 ) -#define serRX_INPUT ( ( unsigned portCHAR ) 0x08 ) -#define serTX_ENABLE ( ( unsigned portCHAR ) 0x04 ) -#define serRX_ENABLE ( ( unsigned portCHAR ) 0x01 ) -#define serTX_INT ( ( unsigned portCHAR ) 0x01 ) -#define serRX_INT ( ( unsigned portCHAR ) 0x02 ) +#define serNO_PARITY ( ( unsigned char ) 0x02 << 3 ) +#define ser8DATA_BITS ( ( unsigned char ) 0x03 ) +#define ser1STOP_BIT ( ( unsigned char ) 0x07 ) +#define serSYSTEM_CLOCK ( ( unsigned char ) 0xdd ) +#define serTX_OUTPUT ( ( unsigned char ) 0x04 ) +#define serRX_INPUT ( ( unsigned char ) 0x08 ) +#define serTX_ENABLE ( ( unsigned char ) 0x04 ) +#define serRX_ENABLE ( ( unsigned char ) 0x01 ) +#define serTX_INT ( ( unsigned char ) 0x01 ) +#define serRX_INT ( ( unsigned char ) 0x02 ) /* The queues used to communicate between tasks and ISR's. */ @@ -108,13 +108,13 @@ void __attribute__( ( interrupt ) ) __cs3_isr_interrupt_78( void ); /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { -const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) ); +const unsigned long ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) ); /* Create the queues used by the com test task. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); xTxHasEnded = pdTRUE; @@ -133,8 +133,8 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa MCF_UART1_UMR2 = ser1STOP_BIT; MCF_UART1_UCSR = serSYSTEM_CLOCK; - MCF_UART1_UBG1 = ( unsigned portCHAR ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL ); - MCF_UART1_UBG2 = ( unsigned portCHAR ) ( ulBaudRateDivisor & 0xffUL ); + MCF_UART1_UBG1 = ( unsigned char ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL ); + MCF_UART1_UBG2 = ( unsigned char ) ( ulBaudRateDivisor & 0xffUL ); /* Turn it on. */ MCF_UART1_UCR = serTX_ENABLE | serRX_ENABLE; @@ -152,7 +152,7 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* Only one port is supported. */ ( void ) pxPort; @@ -170,7 +170,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { /* Only one port is supported. */ ( void ) pxPort; @@ -201,7 +201,7 @@ void vSerialClose( xComPortHandle xPort ) void __cs3_isr_interrupt_78( void ) { -unsigned portCHAR ucChar; +unsigned char ucChar; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE, xDoneSomething = pdTRUE; while( xDoneSomething != pdFALSE ) diff --git a/FreeRTOS/Demo/Common/Minimal/AltBlckQ.c b/FreeRTOS/Demo/Common/Minimal/AltBlckQ.c index 0e180a121..33824c6b9 100644 --- a/FreeRTOS/Demo/Common/Minimal/AltBlckQ.c +++ b/FreeRTOS/Demo/Common/Minimal/AltBlckQ.c @@ -108,7 +108,7 @@ typedef struct BLOCKING_QUEUE_PARAMETERS { xQueueHandle xQueue; /*< The queue to be used by the task. */ portTickType xBlockTime; /*< The block time to use on queue reads/writes. */ - volatile portSHORT *psCheckVariable; /*< Incremented on each successful cycle to check the task is still running. */ + volatile short *psCheckVariable; /*< Incremented on each successful cycle to check the task is still running. */ } xBlockingQueueParameters; /* Task function that creates an incrementing number and posts it on a queue. */ @@ -121,11 +121,11 @@ static portTASK_FUNCTION_PROTO( vBlockingQueueConsumer, pvParameters ); /* Variables which are incremented each time an item is removed from a queue, and found to be the expected value. These are used to check that the tasks are still running. */ -static volatile portSHORT sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 }; +static volatile short sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 }; /* Variable which are incremented each time an item is posted on a queue. These are used to check that the tasks are still running. */ -static volatile portSHORT sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 }; +static volatile short sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 }; /*-----------------------------------------------------------*/ @@ -145,7 +145,7 @@ const portTickType xDontBlock = ( portTickType ) 0; /* Create the queue used by the first two tasks to pass the incrementing number. Pass a pointer to the queue in the parameter structure. */ - pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) ); + pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) ); /* The consumer is created first so gets a block time as described above. */ pxQueueParameters1->xBlockTime = xBlockTime; @@ -180,7 +180,7 @@ const portTickType xDontBlock = ( portTickType ) 0; the same mechanism but reverses the task priorities. */ pxQueueParameters3 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) ); - pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) ); + pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) ); pxQueueParameters3->xBlockTime = xDontBlock; pxQueueParameters3->psCheckVariable = &( sBlockingProducerCount[ 1 ] ); @@ -197,7 +197,7 @@ const portTickType xDontBlock = ( portTickType ) 0; /* Create the last two tasks as described above. The mechanism is again just the same. This time both parameter structures are given a block time. */ pxQueueParameters5 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) ); - pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) ); + pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) ); pxQueueParameters5->xBlockTime = xBlockTime; pxQueueParameters5->psCheckVariable = &( sBlockingProducerCount[ 2 ] ); @@ -213,14 +213,14 @@ const portTickType xDontBlock = ( portTickType ) 0; static portTASK_FUNCTION( vBlockingQueueProducer, pvParameters ) { -unsigned portSHORT usValue = 0; +unsigned short usValue = 0; xBlockingQueueParameters *pxQueueParameters; -portSHORT sErrorEverOccurred = pdFALSE; +short sErrorEverOccurred = pdFALSE; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Alt blocking queue producer task started.\r\n"; + const char * const pcTaskStartMsg = "Alt blocking queue producer task started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -253,14 +253,14 @@ portSHORT sErrorEverOccurred = pdFALSE; static portTASK_FUNCTION( vBlockingQueueConsumer, pvParameters ) { -unsigned portSHORT usData, usExpectedValue = 0; +unsigned short usData, usExpectedValue = 0; xBlockingQueueParameters *pxQueueParameters; -portSHORT sErrorEverOccurred = pdFALSE; +short sErrorEverOccurred = pdFALSE; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Alt blocking queue consumer task started.\r\n"; + const char * const pcTaskStartMsg = "Alt blocking queue consumer task started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -300,8 +300,8 @@ portSHORT sErrorEverOccurred = pdFALSE; /* This is called to check that all the created tasks are still running. */ portBASE_TYPE xAreAltBlockingQueuesStillRunning( void ) { -static portSHORT sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 }; -static portSHORT sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 }; +static short sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 }; +static short sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 }; portBASE_TYPE xReturn = pdPASS, xTasks; /* Not too worried about mutual exclusion on these variables as they are 16 diff --git a/FreeRTOS/Demo/Common/Minimal/AltBlock.c b/FreeRTOS/Demo/Common/Minimal/AltBlock.c index 9cf4c982b..b9e00fd6a 100644 --- a/FreeRTOS/Demo/Common/Minimal/AltBlock.c +++ b/FreeRTOS/Demo/Common/Minimal/AltBlock.c @@ -140,9 +140,9 @@ portTickType xTimeWhenBlocking; portTickType xTimeToBlock, xBlockedTime; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Alt primary block time test started.\r\n"; + const char * const pcTaskStartMsg = "Alt primary block time test started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -419,9 +419,9 @@ portTickType xTimeWhenBlocking, xBlockedTime; portBASE_TYPE xData; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Alt secondary block time test started.\r\n"; + const char * const pcTaskStartMsg = "Alt secondary block time test started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); diff --git a/FreeRTOS/Demo/Common/Minimal/AltPollQ.c b/FreeRTOS/Demo/Common/Minimal/AltPollQ.c index f1af2a37c..f4edd7f01 100644 --- a/FreeRTOS/Demo/Common/Minimal/AltPollQ.c +++ b/FreeRTOS/Demo/Common/Minimal/AltPollQ.c @@ -88,7 +88,7 @@ Changes from V2.0.0 + Delay periods are now specified using variables and constants of - portTickType rather than unsigned portLONG. + portTickType rather than unsigned long. */ #include @@ -126,7 +126,7 @@ void vStartAltPolledQueueTasks( unsigned portBASE_TYPE uxPriority ) static xQueueHandle xPolledQueue; /* Create the queue used by the producer and consumer. */ - xPolledQueue = xQueueCreate( pollqQUEUE_SIZE, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) ); + xPolledQueue = xQueueCreate( pollqQUEUE_SIZE, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) ); /* vQueueAddToRegistry() adds the queue to the queue registry, if one is in use. The queue registry is provided as a means for kernel aware @@ -145,13 +145,13 @@ static xQueueHandle xPolledQueue; static portTASK_FUNCTION( vPolledQueueProducer, pvParameters ) { -unsigned portSHORT usValue = ( unsigned portSHORT ) 0; +unsigned short usValue = ( unsigned short ) 0; signed portBASE_TYPE xError = pdFALSE, xLoop; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Alt polling queue producer task started.\r\n"; + const char * const pcTaskStartMsg = "Alt polling queue producer task started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -193,13 +193,13 @@ signed portBASE_TYPE xError = pdFALSE, xLoop; static portTASK_FUNCTION( vPolledQueueConsumer, pvParameters ) { -unsigned portSHORT usData, usExpectedValue = ( unsigned portSHORT ) 0; +unsigned short usData, usExpectedValue = ( unsigned short ) 0; signed portBASE_TYPE xError = pdFALSE; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Alt blocking queue consumer task started.\r\n"; + const char * const pcTaskStartMsg = "Alt blocking queue consumer task started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); diff --git a/FreeRTOS/Demo/Common/Minimal/AltQTest.c b/FreeRTOS/Demo/Common/Minimal/AltQTest.c index 4e17a1497..4c6426675 100644 --- a/FreeRTOS/Demo/Common/Minimal/AltQTest.c +++ b/FreeRTOS/Demo/Common/Minimal/AltQTest.c @@ -127,11 +127,11 @@ static portBASE_TYPE xErrorDetected = pdFALSE; /* Counters that are incremented on each cycle of a test. This is used to detect a stalled task - a test that is no longer running. */ -static volatile unsigned portLONG ulLoopCounter = 0; -static volatile unsigned portLONG ulLoopCounter2 = 0; +static volatile unsigned long ulLoopCounter = 0; +static volatile unsigned long ulLoopCounter2 = 0; /* The variable that is guarded by the mutex in the mutex demo tasks. */ -static volatile unsigned portLONG ulGuardedVariable = 0; +static volatile unsigned long ulGuardedVariable = 0; /* Handles used in the mutext test to suspend and resume the high and medium priority mutex test tasks. */ @@ -146,7 +146,7 @@ xSemaphoreHandle xMutex; /* Create the queue that we are going to use for the prvSendFrontAndBackTest demo. */ - xQueue = xQueueCreate( genqQUEUE_LENGTH, sizeof( unsigned portLONG ) ); + xQueue = xQueueCreate( genqQUEUE_LENGTH, sizeof( unsigned long ) ); /* vQueueAddToRegistry() adds the queue to the queue registry, if one is in use. The queue registry is provided as a means for kernel aware @@ -183,13 +183,13 @@ xSemaphoreHandle xMutex; static void prvSendFrontAndBackTest( void *pvParameters ) { -unsigned portLONG ulData, ulData2; +unsigned long ulData, ulData2; xQueueHandle xQueue; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Alt queue SendToFront/SendToBack/Peek test started.\r\n"; + const char * const pcTaskStartMsg = "Alt queue SendToFront/SendToBack/Peek test started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -414,9 +414,9 @@ static void prvLowPriorityMutexTask( void *pvParameters ) xSemaphoreHandle xMutex = ( xSemaphoreHandle ) pvParameters; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Fast mutex with priority inheritance test started.\r\n"; + const char * const pcTaskStartMsg = "Fast mutex with priority inheritance test started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -561,7 +561,7 @@ xSemaphoreHandle xMutex = ( xSemaphoreHandle ) pvParameters; /* This is called to check that all the created tasks are still running. */ portBASE_TYPE xAreAltGenericQueueTasksStillRunning( void ) { -static unsigned portLONG ulLastLoopCounter = 0, ulLastLoopCounter2 = 0; +static unsigned long ulLastLoopCounter = 0, ulLastLoopCounter2 = 0; /* If the demo task is still running then we expect the loopcounters to have incremented since this function was last called. */ diff --git a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c index 90139c593..6b76a70ed 100644 --- a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c +++ b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c @@ -150,7 +150,7 @@ have been found. Used to detect an error or stall in the test cycling. */ static volatile unsigned long ulSetBitCycles = 0, ulWaitBitCycles = 0; /* The event group used by all the tests. */ -static xEventGroupHandle xEventBits = NULL; +static EventGroupHandle_t xEventBits = NULL; /* Handles to the tasks that only take part in the synchronisation calls. */ static xTaskHandle xSyncTask1 = NULL, xSyncTask2 = NULL; @@ -179,11 +179,11 @@ xTaskHandle xWaitBitsTaskHandle; static void prvSyncTask( void *pvParameters ) { -xEventBitsType uxSynchronisationBit, uxReturned; +EventBits_t uxSynchronisationBit, uxReturned; /* The bit to use to indicate this task is at the synchronisation point is passed in as the task parameter. */ - uxSynchronisationBit = ( xEventBitsType ) pvParameters; + uxSynchronisationBit = ( EventBits_t ) pvParameters; /* A few tests are performed before entering the main demo loop. */ prvPreSyncSelectiveWakeTest(); @@ -218,7 +218,7 @@ xEventBitsType uxSynchronisationBit, uxReturned; static void prvWaitBitsTask( void *pvParameters ) { -xEventBitsType uxReturned; +EventBits_t uxReturned; portBASE_TYPE xError = pdFALSE; /* Avoid compiler warnings. */ @@ -346,7 +346,7 @@ portBASE_TYPE xError = pdFALSE; static void prvSetBitsTask( void *pvParameters ) { -xEventBitsType uxBits; +EventBits_t uxBits; portBASE_TYPE xError; /* The handle to the other task is passed in as the task parameter. */ @@ -669,7 +669,7 @@ xTaskHandle xWaitBitsTaskHandle = ( xTaskHandle ) pvParameters; static void prvPreSyncSelectiveWakeTest( void ) { -xEventBitsType uxPendBits, uxReturned; +EventBits_t uxPendBits, uxReturned; if( xTaskGetCurrentTaskHandle() == xSyncTask1 ) { @@ -685,7 +685,7 @@ xEventBitsType uxPendBits, uxReturned; vTaskSuspend( NULL ); uxReturned = xEventGroupWaitBits( xEventBits, uxPendBits, pdTRUE, pdFALSE, portMAX_DELAY ); - if( uxReturned == ( xEventBitsType ) 0 ) + if( uxReturned == ( EventBits_t ) 0 ) { break; } @@ -696,7 +696,7 @@ xEventBitsType uxPendBits, uxReturned; static portBASE_TYPE prvTestSelectiveBits( void ) { portBASE_TYPE xError = pdFALSE; -xEventBitsType uxBit; +EventBits_t uxBit; /* Both tasks should start in the suspended state. */ if( eTaskGetState( xSyncTask1 ) != eSuspended ) diff --git a/FreeRTOS/Demo/Common/Minimal/GenQTest.c b/FreeRTOS/Demo/Common/Minimal/GenQTest.c index 232a90cd9..cb6487279 100644 --- a/FreeRTOS/Demo/Common/Minimal/GenQTest.c +++ b/FreeRTOS/Demo/Common/Minimal/GenQTest.c @@ -129,11 +129,11 @@ static volatile portBASE_TYPE xErrorDetected = pdFALSE; /* Counters that are incremented on each cycle of a test. This is used to detect a stalled task - a test that is no longer running. */ -static volatile unsigned portLONG ulLoopCounter = 0; -static volatile unsigned portLONG ulLoopCounter2 = 0; +static volatile unsigned long ulLoopCounter = 0; +static volatile unsigned long ulLoopCounter2 = 0; /* The variable that is guarded by the mutex in the mutex demo tasks. */ -static volatile unsigned portLONG ulGuardedVariable = 0; +static volatile unsigned long ulGuardedVariable = 0; /* Handles used in the mutext test to suspend and resume the high and medium priority mutex test tasks. */ @@ -148,7 +148,7 @@ xSemaphoreHandle xMutex; /* Create the queue that we are going to use for the prvSendFrontAndBackTest demo. */ - xQueue = xQueueCreate( genqQUEUE_LENGTH, sizeof( unsigned portLONG ) ); + xQueue = xQueueCreate( genqQUEUE_LENGTH, sizeof( unsigned long ) ); /* vQueueAddToRegistry() adds the queue to the queue registry, if one is in use. The queue registry is provided as a means for kernel aware @@ -185,13 +185,13 @@ xSemaphoreHandle xMutex; static void prvSendFrontAndBackTest( void *pvParameters ) { -unsigned portLONG ulData, ulData2; +unsigned long ulData, ulData2; xQueueHandle xQueue; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Queue SendToFront/SendToBack/Peek test started.\r\n"; + const char * const pcTaskStartMsg = "Queue SendToFront/SendToBack/Peek test started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -416,9 +416,9 @@ static void prvLowPriorityMutexTask( void *pvParameters ) xSemaphoreHandle xMutex = ( xSemaphoreHandle ) pvParameters; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Mutex with priority inheritance test started.\r\n"; + const char * const pcTaskStartMsg = "Mutex with priority inheritance test started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -574,7 +574,7 @@ xSemaphoreHandle xMutex = ( xSemaphoreHandle ) pvParameters; /* This is called to check that all the created tasks are still running. */ portBASE_TYPE xAreGenericQueueTasksStillRunning( void ) { -static unsigned portLONG ulLastLoopCounter = 0, ulLastLoopCounter2 = 0; +static unsigned long ulLastLoopCounter = 0, ulLastLoopCounter2 = 0; /* If the demo task is still running then we expect the loopcounters to have incremented since this function was last called. */ diff --git a/FreeRTOS/Demo/Common/Minimal/IntQueue.c b/FreeRTOS/Demo/Common/Minimal/IntQueue.c index e54c4c549..57d24e603 100644 --- a/FreeRTOS/Demo/Common/Minimal/IntQueue.c +++ b/FreeRTOS/Demo/Common/Minimal/IntQueue.c @@ -202,8 +202,8 @@ xTaskHandle xHighPriorityNormallyEmptyTask1, xHighPriorityNormallyEmptyTask2, xH the array position of the value is set to a the identifier of the task or interrupt that accessed the queue. This way missing or duplicate values can be detected. */ -static unsigned portCHAR ucNormallyEmptyReceivedValues[ intqNUM_VALUES_TO_LOG ] = { 0 }; -static unsigned portCHAR ucNormallyFullReceivedValues[ intqNUM_VALUES_TO_LOG ] = { 0 }; +static unsigned char ucNormallyEmptyReceivedValues[ intqNUM_VALUES_TO_LOG ] = { 0 }; +static unsigned char ucNormallyFullReceivedValues[ intqNUM_VALUES_TO_LOG ] = { 0 }; /* The test tasks themselves. */ static void prvLowerPriorityNormallyEmptyTask( void *pvParameters ); diff --git a/FreeRTOS/Demo/Common/Minimal/QPeek.c b/FreeRTOS/Demo/Common/Minimal/QPeek.c index 76cb7dfd3..ae9f968f9 100644 --- a/FreeRTOS/Demo/Common/Minimal/QPeek.c +++ b/FreeRTOS/Demo/Common/Minimal/QPeek.c @@ -110,7 +110,7 @@ static volatile portBASE_TYPE xErrorDetected = pdFALSE; /* Counter that is incremented on each cycle of a test. This is used to detect a stalled task - a test that is no longer running. */ -static volatile unsigned portLONG ulLoopCounter = 0; +static volatile unsigned long ulLoopCounter = 0; /* Handles to the test tasks. */ xTaskHandle xMediumPriorityTask, xHighPriorityTask, xHighestPriorityTask; @@ -121,7 +121,7 @@ void vStartQueuePeekTasks( void ) xQueueHandle xQueue; /* Create the queue that we are going to use for the test/demo. */ - xQueue = xQueueCreate( qpeekQUEUE_LENGTH, sizeof( unsigned portLONG ) ); + xQueue = xQueueCreate( qpeekQUEUE_LENGTH, sizeof( unsigned long ) ); /* vQueueAddToRegistry() adds the queue to the queue registry, if one is in use. The queue registry is provided as a means for kernel aware @@ -144,13 +144,13 @@ xQueueHandle xQueue; static void prvHighestPriorityPeekTask( void *pvParameters ) { xQueueHandle xQueue = ( xQueueHandle ) pvParameters; -unsigned portLONG ulValue; +unsigned long ulValue; #ifdef USE_STDIO { - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Queue peek test started.\r\n"; + const char * const pcTaskStartMsg = "Queue peek test started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); @@ -253,7 +253,7 @@ unsigned portLONG ulValue; static void prvHighPriorityPeekTask( void *pvParameters ) { xQueueHandle xQueue = ( xQueueHandle ) pvParameters; -unsigned portLONG ulValue; +unsigned long ulValue; for( ;; ) { @@ -308,7 +308,7 @@ unsigned portLONG ulValue; static void prvMediumPriorityPeekTask( void *pvParameters ) { xQueueHandle xQueue = ( xQueueHandle ) pvParameters; -unsigned portLONG ulValue; +unsigned long ulValue; for( ;; ) { @@ -349,7 +349,7 @@ unsigned portLONG ulValue; static void prvLowPriorityPeekTask( void *pvParameters ) { xQueueHandle xQueue = ( xQueueHandle ) pvParameters; -unsigned portLONG ulValue; +unsigned long ulValue; for( ;; ) { @@ -455,7 +455,7 @@ unsigned portLONG ulValue; /* This is called to check that all the created tasks are still running. */ portBASE_TYPE xAreQueuePeekTasksStillRunning( void ) { -static unsigned portLONG ulLastLoopCounter = 0; +static unsigned long ulLastLoopCounter = 0; /* If the demo task is still running then we expect the loopcounter to have incremented since this function was last called. */ diff --git a/FreeRTOS/Demo/Common/Minimal/countsem.c b/FreeRTOS/Demo/Common/Minimal/countsem.c index 4df90a601..65f195c68 100644 --- a/FreeRTOS/Demo/Common/Minimal/countsem.c +++ b/FreeRTOS/Demo/Common/Minimal/countsem.c @@ -252,9 +252,9 @@ static void prvCountingSemaphoreTask( void *pvParameters ) xCountSemStruct *pxParameter; #ifdef USE_STDIO - void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend ); + void vPrintDisplayMessage( const char * const * ppcMessageToSend ); - const portCHAR * const pcTaskStartMsg = "Counting semaphore demo started.\r\n"; + const char * const pcTaskStartMsg = "Counting semaphore demo started.\r\n"; /* Queue a message for printing to say the task has started. */ vPrintDisplayMessage( &pcTaskStartMsg ); diff --git a/FreeRTOS/Demo/Common/Minimal/crflash.c b/FreeRTOS/Demo/Common/Minimal/crflash.c index 9f0a1a89b..69f22dd88 100644 --- a/FreeRTOS/Demo/Common/Minimal/crflash.c +++ b/FreeRTOS/Demo/Common/Minimal/crflash.c @@ -118,12 +118,12 @@ created. */ /* * The 'fixed delay' co-routine as described at the top of the file. */ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * The 'flash' co-routine as described at the top of the file. */ -static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* The queue used to pass data between the 'fixed delay' co-routines and the 'flash' co-routine. */ @@ -163,7 +163,7 @@ unsigned portBASE_TYPE uxIndex; } /*-----------------------------------------------------------*/ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { /* Even though this is a co-routine the xResult variable does not need to be static as we do not need it to maintain its state between blocks. */ @@ -204,7 +204,7 @@ static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_R } /*-----------------------------------------------------------*/ -static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { /* Even though this is a co-routine the variable do not need to be static as we do not need it to maintain their state between blocks. */ diff --git a/FreeRTOS/Demo/Common/Minimal/crhook.c b/FreeRTOS/Demo/Common/Minimal/crhook.c index 0eaba7d59..a68215f50 100644 --- a/FreeRTOS/Demo/Common/Minimal/crhook.c +++ b/FreeRTOS/Demo/Common/Minimal/crhook.c @@ -115,7 +115,7 @@ posted to the 'hook' co-routines. */ /* * The co-routine function itself. */ -static void prvHookCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvHookCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* @@ -217,7 +217,7 @@ signed portBASE_TYPE xIndex, xCoRoutineWoken; } /*-----------------------------------------------------------*/ -static void prvHookCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvHookCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { static unsigned portBASE_TYPE uxReceivedValue[ hookNUM_HOOK_CO_ROUTINES ]; portBASE_TYPE xResult; diff --git a/FreeRTOS/Demo/Common/ethernet/lwIP_130/src/netif/stf91x_ethernetif.c b/FreeRTOS/Demo/Common/ethernet/lwIP_130/src/netif/stf91x_ethernetif.c index 5d1328fa3..ee5dc7bbd 100644 --- a/FreeRTOS/Demo/Common/ethernet/lwIP_130/src/netif/stf91x_ethernetif.c +++ b/FreeRTOS/Demo/Common/ethernet/lwIP_130/src/netif/stf91x_ethernetif.c @@ -157,7 +157,7 @@ static err_t low_level_output(struct netif *netif, struct pbuf *p) { struct pbuf *q; u32_t l = 0; - unsigned portCHAR *pcTxData; + unsigned char *pcTxData; #if ETH_PAD_SIZE pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */ diff --git a/FreeRTOS/Demo/MB91460_Softune/SRC/crflash_modified.c b/FreeRTOS/Demo/MB91460_Softune/SRC/crflash_modified.c index 6970a4376..76cb30e6e 100644 --- a/FreeRTOS/Demo/MB91460_Softune/SRC/crflash_modified.c +++ b/FreeRTOS/Demo/MB91460_Softune/SRC/crflash_modified.c @@ -123,12 +123,12 @@ to PDR09 (SEG1) are used by the prvFlashCoRoutine() and PDR00 (SEG2) are used by /* * The 'fixed delay' co-routine as described at the top of the file. */ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * The 'flash' co-routine as described at the top of the file. */ -static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* The queue used to pass data between the 'fixed delay' co-routines and the 'flash' co-routine. */ @@ -168,7 +168,7 @@ unsigned portBASE_TYPE uxIndex; } /*-----------------------------------------------------------*/ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { /* Even though this is a co-routine the xResult variable does not need to be static as we do not need it to maintain its state between blocks. */ @@ -209,7 +209,7 @@ static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_R } /*-----------------------------------------------------------*/ -static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { /* Even though this is a co-routine the variable do not need to be static as we do not need it to maintain their state between blocks. */ diff --git a/FreeRTOS/Demo/MB91460_Softune/SRC/main.c b/FreeRTOS/Demo/MB91460_Softune/SRC/main.c index 802c9c53b..d2158bb16 100644 --- a/FreeRTOS/Demo/MB91460_Softune/SRC/main.c +++ b/FreeRTOS/Demo/MB91460_Softune/SRC/main.c @@ -130,7 +130,7 @@ #define mainGENERIC_QUEUE_PRIORITY ( tskIDLE_PRIORITY ) /* Baud rate used by the COM test tasks. */ -#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 19200 ) +#define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 19200 ) /* The frequency at which the 'Check' tasks executes. See the comments at the top of the page. When the system is operating error free the 'Check' task @@ -167,7 +167,7 @@ static void prvErrorChecks( void *pvParameters ); * Called by the Check task. Returns pdPASS if all the other tasks are found * to be operating without error - otherwise returns pdFAIL. */ -static portSHORT prvCheckOtherTasksAreStillRunning( void ); +static short prvCheckOtherTasksAreStillRunning( void ); /* * Setup the microcontroller as used by this demo. @@ -187,7 +187,7 @@ static void vSecondRegisterTestTask( void *pvParameters ); /* The variable that is set to true should an error be found in one of the register test tasks. */ -unsigned portLONG ulRegTestError = pdFALSE; +unsigned long ulRegTestError = pdFALSE; /*---------------------------------------------------------------------------*/ @@ -274,7 +274,7 @@ portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY, xLastExecutionTime; } /*-----------------------------------------------------------*/ -static portSHORT prvCheckOtherTasksAreStillRunning( void ) +static short prvCheckOtherTasksAreStillRunning( void ) { portBASE_TYPE lReturn = pdPASS; @@ -405,7 +405,7 @@ static void prvSetupHardware( void ) static void vFirstRegisterTestTask( void *pvParameters ) { -extern volatile unsigned portLONG ulCriticalNesting; +extern volatile unsigned long ulCriticalNesting; /* Fills the registers with known values (different to the values used in vSecondRegisterTestTask()), then checks that the registers still @@ -503,7 +503,7 @@ extern volatile unsigned portLONG ulCriticalNesting; static void vSecondRegisterTestTask( void *pvParameters ) { -extern volatile unsigned portLONG ulCriticalNesting; +extern volatile unsigned long ulCriticalNesting; /* Fills the registers with known values (different to the values used in vFirstRegisterTestTask()), then checks that the registers still diff --git a/FreeRTOS/Demo/MB91460_Softune/SRC/partest/partest.c b/FreeRTOS/Demo/MB91460_Softune/SRC/partest/partest.c index 26ceeb58f..abfe46277 100644 --- a/FreeRTOS/Demo/MB91460_Softune/SRC/partest/partest.c +++ b/FreeRTOS/Demo/MB91460_Softune/SRC/partest/partest.c @@ -70,8 +70,8 @@ #define partstNUM_LEDs 8 -static unsigned portCHAR sState[ partstNUM_LEDs ] = { pdFALSE }; -static unsigned portCHAR sState1[ partstNUM_LEDs ] = { pdFALSE }; +static unsigned char sState[ partstNUM_LEDs ] = { pdFALSE }; +static unsigned char sState1[ partstNUM_LEDs ] = { pdFALSE }; /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/MB91460_Softune/SRC/serial/serial.c b/FreeRTOS/Demo/MB91460_Softune/SRC/serial/serial.c index f49e9e47e..69c1b9df6 100644 --- a/FreeRTOS/Demo/MB91460_Softune/SRC/serial/serial.c +++ b/FreeRTOS/Demo/MB91460_Softune/SRC/serial/serial.c @@ -87,17 +87,17 @@ static xQueueHandle xRxedChars; /* The queue used to hold characters waiting transmission. */ static xQueueHandle xCharsForTx; -static volatile portSHORT sTHREEmpty; +static volatile short sTHREEmpty; /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { portENTER_CRITICAL(); { /* Create the queues used by the com test task. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* Initialize UART asynchronous mode */ BGR02 = configPER_CLOCK_HZ / ulWantedBaud; @@ -120,7 +120,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* Get the next character from the buffer. Return false if no characters are available, or arrive before xBlockTime expires. */ @@ -135,7 +135,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { signed portBASE_TYPE xReturn; @@ -191,7 +191,7 @@ signed portBASE_TYPE xReturn; */ __interrupt void UART2_RxISR (void) { - signed portCHAR cChar; + signed char cChar; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Get the character from the UART and post it on the queue of Rxed @@ -216,7 +216,7 @@ signed portBASE_TYPE xReturn; */ __interrupt void UART2_TxISR (void) { - signed portCHAR cChar; + signed char cChar; signed portBASE_TYPE xTaskWoken = pdFALSE; /* The previous character has been transmitted. See if there are any diff --git a/FreeRTOS/Demo/MB91460_Softune/SRC/utility/taskutility.c b/FreeRTOS/Demo/MB91460_Softune/SRC/utility/taskutility.c index 9844ee40c..833996924 100644 --- a/FreeRTOS/Demo/MB91460_Softune/SRC/utility/taskutility.c +++ b/FreeRTOS/Demo/MB91460_Softune/SRC/utility/taskutility.c @@ -63,7 +63,7 @@ char Getch5( void ) /* waits for and returns incomming char */ void Puts5( const char *Name5 ) /* Puts a String to UART */ { - volatile portSHORT i, len; + volatile short i, len; len = strlen( Name5 ); for( i = 0; i < len; i++ ) /* go through string */ @@ -79,7 +79,7 @@ void Puts5( const char *Name5 ) /* Puts a String to UART */ void Puthex5( unsigned long n, unsigned char digits ) { - unsigned portCHAR digit = 0, div = 0, i; + unsigned char digit = 0, div = 0, i; div = ( 4 * (digits - 1) ); /* init shift divisor */ for( i = 0; i < digits; i++ ) @@ -92,8 +92,8 @@ void Puthex5( unsigned long n, unsigned char digits ) void Putdec5( unsigned long x, int digits ) { - portSHORT i; - portCHAR buf[10], sign = 1; + short i; + char buf[10], sign = 1; if( digits < 0 ) { /* should be print of zero? */ @@ -139,10 +139,10 @@ void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority ) static void vUART5Task( void *pvParameters ) { - static portCHAR buff[ 900 ] = { 0 }; - unsigned portLONG trace_len, j; + static char buff[ 900 ] = { 0 }; + unsigned long trace_len, j; - unsigned portCHAR ch; + unsigned char ch; SSR05_RIE = 1; Puts5( "\n -------------MB91467D FreeRTOS DEMO Task List and Trace Utility----------- \n" ); @@ -210,7 +210,7 @@ static void vUART5Task( void *pvParameters ) __interrupt void UART5_RxISR( void ) { -unsigned portCHAR ch; +unsigned char ch; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; ch = RDR05; diff --git a/FreeRTOS/Demo/MB91460_Softune/SRC/watchdog/watchdog.c b/FreeRTOS/Demo/MB91460_Softune/SRC/watchdog/watchdog.c index 7660b4205..c3df26013 100644 --- a/FreeRTOS/Demo/MB91460_Softune/SRC/watchdog/watchdog.c +++ b/FreeRTOS/Demo/MB91460_Softune/SRC/watchdog/watchdog.c @@ -49,7 +49,7 @@ static void prvWatchdogTask ( void *pvParameters ) * The below function creates hardware watchdog task. *---------------------------------------------------------------------------*/ #if WATCHDOG == WTC_IN_TASK -void vStartWatchdogTask( unsigned portSHORT uxPriority ) +void vStartWatchdogTask( unsigned short uxPriority ) { xTaskCreate( prvWatchdogTask , "KickWTC", portMINIMAL_STACK_SIZE, ( void * ) NULL, uxPriority, ( xTaskHandle * ) NULL ); } diff --git a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c index 6970a4376..76cb30e6e 100644 --- a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c +++ b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c @@ -123,12 +123,12 @@ to PDR09 (SEG1) are used by the prvFlashCoRoutine() and PDR00 (SEG2) are used by /* * The 'fixed delay' co-routine as described at the top of the file. */ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* * The 'flash' co-routine as described at the top of the file. */ -static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /* The queue used to pass data between the 'fixed delay' co-routines and the 'flash' co-routine. */ @@ -168,7 +168,7 @@ unsigned portBASE_TYPE uxIndex; } /*-----------------------------------------------------------*/ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { /* Even though this is a co-routine the xResult variable does not need to be static as we do not need it to maintain its state between blocks. */ @@ -209,7 +209,7 @@ static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_R } /*-----------------------------------------------------------*/ -static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { /* Even though this is a co-routine the variable do not need to be static as we do not need it to maintain their state between blocks. */ diff --git a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c index a26583ba1..0ba976495 100644 --- a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c +++ b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c @@ -70,8 +70,8 @@ #define partstNUM_LEDs 8 -static unsigned portCHAR sState[ partstNUM_LEDs ] = { pdFALSE }; -static unsigned portCHAR sState1[ partstNUM_LEDs ] = { pdFALSE }; +static unsigned char sState[ partstNUM_LEDs ] = { pdFALSE }; +static unsigned char sState1[ partstNUM_LEDs ] = { pdFALSE }; /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c index ca19ff0a7..b54bd69c5 100644 --- a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c +++ b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c @@ -85,19 +85,19 @@ static xQueueHandle xRxedChars; /* The queue used to hold characters waiting transmission. */ static xQueueHandle xCharsForTx; -static volatile portSHORT sTHREEmpty; +static volatile short sTHREEmpty; -static volatile portSHORT queueFail = pdFALSE; +static volatile short queueFail = pdFALSE; /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { /* Initialise the hardware. */ portENTER_CRITICAL(); { /* Create the queues used by the com test task. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed portCHAR) ); - xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed portCHAR) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed char) ); + xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed char) ); if( xRxedChars == 0 ) { @@ -129,7 +129,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* Get the next character from the buffer. Return false if no characters are available, or arrive before xBlockTime expires. */ @@ -144,7 +144,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { signed portBASE_TYPE xReturn; @@ -199,7 +199,7 @@ signed portBASE_TYPE xReturn; */ __interrupt void UART0_RxISR( void ) { -volatile signed portCHAR cChar; +volatile signed char cChar; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Get the character from the UART and post it on the queue of Rxed @@ -223,7 +223,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; */ __interrupt void UART0_TxISR( void ) { -signed portCHAR cChar; +signed char cChar; signed portBASE_TYPE xTaskWoken = pdFALSE; /* The previous character has been transmitted. See if there are any diff --git a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c index c37b8b87e..4b0bb9e73 100644 --- a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c +++ b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c @@ -69,7 +69,7 @@ char Getch0( void ) /* waits for and returns incomming char */ void Puts0( const char *Name1 ) /* Puts a String to UART */ { - volatile portSHORT i, len; + volatile short i, len; len = strlen( Name1 ); for( i = 0; i < len; i++ ) /* go through string */ @@ -85,7 +85,7 @@ void Puts0( const char *Name1 ) /* Puts a String to UART */ void Puthex0( unsigned long n, unsigned char digits ) { - unsigned portCHAR digit = 0, div = 0, i; + unsigned char digit = 0, div = 0, i; div = ( 4 * (digits - 1) ); /* init shift divisor */ for( i = 0; i < digits; i++ ) @@ -98,8 +98,8 @@ void Puthex0( unsigned long n, unsigned char digits ) void Putdec0( unsigned long x, int digits ) { - portSHORT i; - portCHAR buf[10], sign = 1; + short i; + char buf[10], sign = 1; if( digits < 0 ) { /* should be print of zero? */ @@ -144,11 +144,11 @@ void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority ) static void vUART0Task( void *pvParameters ) { - static portCHAR buff[ 800 ] = { 0 }; - unsigned portLONG trace_len; - signed portLONG i, j, l = 0; + static char buff[ 800 ] = { 0 }; + unsigned long trace_len; + signed long i, j, l = 0; - unsigned portCHAR ch; + unsigned char ch; ( void ) pvParameters; SSR0_RIE = 1; @@ -221,7 +221,7 @@ static void vUART0Task( void *pvParameters ) __interrupt void UART0_TraceRxISR( void ) { -unsigned portCHAR ch; +unsigned char ch; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; ch = RDR0; diff --git a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c index 821ad31d7..b4909b985 100644 --- a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c +++ b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c @@ -77,7 +77,7 @@ #define partstTOTAL_NUM_LEDs 16 #define partstNUM_LEDs_PER_DISPLAY 8 -volatile unsigned char *pucDisplayOutput[ 2 ] = { ( unsigned portCHAR * ) 3, ( unsigned portCHAR * ) 5 }; +volatile unsigned char *pucDisplayOutput[ 2 ] = { ( unsigned char * ) 3, ( unsigned char * ) 5 }; void vParTestInitialise( void ) { diff --git a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c index b01118a08..e4cb4ad37 100644 --- a/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c +++ b/FreeRTOS/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c @@ -99,7 +99,7 @@ static void vLEDFlashTask( void *pvParameters ); /* The co-routine that is created 7 times. */ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned short usIndex ); +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned short usIndex ); /* This task is created once, but itself creates 7 co-routines. */ static void vLEDCoRoutineControlTask( void *pvParameters ); @@ -228,7 +228,7 @@ unsigned short usCoroutine; } /*-----------------------------------------------------------*/ -static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned short usIndex ) +static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned short usIndex ) { /* The usIndex parameter of the co-routine function is used as an index into the xFlashRates array to obtain the delay period to use. */ diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/serial.c b/FreeRTOS/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/serial.c index ddc181384..5d440314f 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/serial.c +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/serial.c @@ -95,9 +95,9 @@ static xQueueHandle xCharsForTx; /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { -unsigned portLONG ulBaudRateCount; +unsigned long ulBaudRateCount; /* Initialise the hardware. */ @@ -117,11 +117,11 @@ unsigned portLONG ulBaudRateCount; UCA1CTL1 = UCSSEL0 | UCSSEL1; /* Setup baud rate low byte. */ - UCA1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned long ) 0xff ); + UCA1BR0 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff ); /* Setup baud rate high byte. */ ulBaudRateCount >>= 8UL; - UCA1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned long ) 0xff ); + UCA1BR1 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff ); /* UCLISTEN sets loopback mode! */ UCA1STAT = UCLISTEN; @@ -140,7 +140,7 @@ unsigned portLONG ulBaudRateCount; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* Get the next character from the buffer. Return false if no characters are available, or arrive before xBlockTime expires. */ @@ -155,7 +155,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { signed portBASE_TYPE xReturn; diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/serial.c b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/serial.c index 44980ba0f..aea3f736f 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/serial.c +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/serial.c @@ -95,9 +95,9 @@ static xQueueHandle xCharsForTx; /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { -unsigned portLONG ulBaudRateCount; +unsigned long ulBaudRateCount; /* Initialise the hardware. */ @@ -107,8 +107,8 @@ unsigned portLONG ulBaudRateCount; portENTER_CRITICAL(); { /* Create the queues used by the com test task. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* Reset UART. */ UCA1CTL1 |= UCSWRST; @@ -117,11 +117,11 @@ unsigned portLONG ulBaudRateCount; UCA1CTL1 = UCSSEL0 | UCSSEL1; /* Setup baud rate low byte. */ - UCA1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff ); + UCA1BR0 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff ); /* Setup baud rate high byte. */ ulBaudRateCount >>= 8UL; - UCA1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff ); + UCA1BR1 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff ); /* UCLISTEN sets loopback mode! */ UCA1STAT = UCLISTEN; @@ -140,7 +140,7 @@ unsigned portLONG ulBaudRateCount; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* Get the next character from the buffer. Return false if no characters are available, or arrive before xBlockTime expires. */ @@ -155,7 +155,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { signed portBASE_TYPE xReturn; diff --git a/FreeRTOS/Demo/NEC_78K0R_IAR/main.c b/FreeRTOS/Demo/NEC_78K0R_IAR/main.c index 1eaeea8f4..3fc2dfe66 100644 --- a/FreeRTOS/Demo/NEC_78K0R_IAR/main.c +++ b/FreeRTOS/Demo/NEC_78K0R_IAR/main.c @@ -163,13 +163,13 @@ static short sRegTestStatus = pdPASS; /* 78K0R Option Byte Definition. Watchdog disabled, LVI enabled, OCD interface enabled. */ -__root __far const unsigned portCHAR OptionByte[] @ 0x00C0 = +__root __far const unsigned char OptionByte[] @ 0x00C0 = { WATCHDOG_DISABLED, LVI_ENABLED, RESERVED_FF, OCD_ENABLED }; /* Security byte definition */ -__root __far const unsigned portCHAR SecuIDCode[] @ 0x00C4 = +__root __far const unsigned char SecuIDCode[] @ 0x00C4 = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -283,7 +283,7 @@ portTickType xToggleRate = mainNO_ERROR_TOGGLE_PERIOD, xLastWakeTime; int __low_level_init(void) { -unsigned portCHAR ucResetFlag = RESF; +unsigned char ucResetFlag = RESF; portDISABLE_INTERRUPTS(); @@ -310,7 +310,7 @@ unsigned portCHAR ucResetFlag = RESF; /* Set clock speed. */ CSS = 0; - CKC &= (unsigned portCHAR)~0x07; + CKC &= (unsigned char)~0x07; CKC |= 0x00; } #else diff --git a/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c b/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c index 8659f31de..bcf1a458c 100644 --- a/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c +++ b/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c @@ -68,14 +68,14 @@ /*-----------------------------------------------------------*/ /* Called by the startup code to initialise the run time system. */ -unsigned portCHAR __low_level_init(void); +unsigned char __low_level_init(void); /*-----------------------------------------------------------*/ -unsigned portCHAR __low_level_init(void) +unsigned char __low_level_init(void) { -unsigned portCHAR resetflag = RESF; -unsigned portCHAR psval = 0; +unsigned char resetflag = RESF; +unsigned char psval = 0; unsigned portBASE_TYPE i = 0; /* Setup provided by NEC. */ diff --git a/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c b/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c index 55baee046..c5488fe5e 100644 --- a/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c +++ b/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c @@ -68,14 +68,14 @@ /*-----------------------------------------------------------*/ /* Called by the startup code to initialise the run time system. */ -unsigned portCHAR __low_level_init(void); +unsigned char __low_level_init(void); /*-----------------------------------------------------------*/ -unsigned portCHAR __low_level_init(void) +unsigned char __low_level_init(void) { -unsigned portCHAR resetflag = RESF; -unsigned portCHAR psval = 0; +unsigned char resetflag = RESF; +unsigned char psval = 0; /* Setup provided by NEC. */ diff --git a/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c b/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c index 2f0994f68..d89aa1125 100644 --- a/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c +++ b/FreeRTOS/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c @@ -68,13 +68,13 @@ /*-----------------------------------------------------------*/ /* Called by the startup code to initialise the run time system. */ -unsigned portCHAR __low_level_init( void ); +unsigned char __low_level_init( void ); /*-----------------------------------------------------------*/ -unsigned portCHAR __low_level_init( void ) +unsigned char __low_level_init( void ) { -unsigned portCHAR resetflag = RESF; +unsigned char resetflag = RESF; unsigned portBASE_TYPE i = 0; portDISABLE_INTERRUPTS(); /* disable global interrupts */ diff --git a/FreeRTOS/Demo/NEC_V850ES_IAR/main.c b/FreeRTOS/Demo/NEC_V850ES_IAR/main.c index 3637dc681..abb3622da 100644 --- a/FreeRTOS/Demo/NEC_V850ES_IAR/main.c +++ b/FreeRTOS/Demo/NEC_V850ES_IAR/main.c @@ -148,7 +148,7 @@ extern void vRegTest2( void *pvParameters ); /* A variable that will get set to fail if a RegTest task finds an error. The variable is inspected by the 'Check' task. */ -static volatile portLONG lRegTestStatus = pdPASS; +static volatile long lRegTestStatus = pdPASS; /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/NEC_V850ES_IAR/serial/serial.c b/FreeRTOS/Demo/NEC_V850ES_IAR/serial/serial.c index 17c1d0672..21c659126 100644 --- a/FreeRTOS/Demo/NEC_V850ES_IAR/serial/serial.c +++ b/FreeRTOS/Demo/NEC_V850ES_IAR/serial/serial.c @@ -116,14 +116,14 @@ static volatile unsigned long ulTxInProgress = pdFALSE; /* * See the serial2.h header file. */ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { xComPortHandle xReturn = serHANDLE; -const unsigned portLONG ulFuclk = ( configCPU_CLOCK_HZ / 2 ) / 8UL; +const unsigned long ulFuclk = ( configCPU_CLOCK_HZ / 2 ) / 8UL; /* Create the queues used to hold Rx and Tx characters. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* If the queues were created correctly then setup the serial port hardware. */ @@ -161,7 +161,7 @@ const unsigned portLONG ulFuclk = ( configCPU_CLOCK_HZ / 2 ) / 8UL; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* The port handle is not required as this driver only supports one port. */ ( void ) pxPort; @@ -179,9 +179,9 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength ) +void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength ) { -signed portCHAR *pxNext; +signed char *pxNext; /* A couple of parameters that this port does not use. */ ( void ) usStringLength; @@ -194,7 +194,7 @@ signed portCHAR *pxNext; ( void ) pxPort; /* Send each character in the string, one at a time. */ - pxNext = ( signed portCHAR * ) pcString; + pxNext = ( signed char * ) pcString; while( *pxNext ) { xSerialPutChar( pxPort, *pxNext, serNO_BLOCK ); @@ -203,7 +203,7 @@ signed portCHAR *pxNext; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { portBASE_TYPE xReturn = pdPASS; @@ -267,7 +267,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Rx interrupt handler. This is called from the asm file wrapper. */ void vUARTRxISRHandler( void ) { -portCHAR cChar; +char cChar; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Send the received character to the Rx queue. */ diff --git a/FreeRTOS/Demo/PIC24_MPLAB/lcd.c b/FreeRTOS/Demo/PIC24_MPLAB/lcd.c index 8e3ba08eb..a8658d7ac 100644 --- a/FreeRTOS/Demo/PIC24_MPLAB/lcd.c +++ b/FreeRTOS/Demo/PIC24_MPLAB/lcd.c @@ -87,12 +87,12 @@ static void prvSetupLCD( void ); /* * Move to the first (0) or second (1) row of the LCD. */ -static void prvLCDGotoRow( unsigned portSHORT usRow ); +static void prvLCDGotoRow( unsigned short usRow ); /* * Write a string of text to the LCD. */ -static void prvLCDPutString( portCHAR *pcString ); +static void prvLCDPutString( char *pcString ); /* * Clear the LCD. @@ -137,7 +137,7 @@ xQueueHandle xStartLCDTask( void ) } /*-----------------------------------------------------------*/ -static void prvLCDGotoRow( unsigned portSHORT usRow ) +static void prvLCDGotoRow( unsigned short usRow ) { if( usRow == 0 ) { @@ -154,7 +154,7 @@ static void prvLCDGotoRow( unsigned portSHORT usRow ) } /*-----------------------------------------------------------*/ -static void prvLCDPutString( portCHAR *pcString ) +static void prvLCDPutString( char *pcString ) { /* Write out each character with appropriate delay between each. */ while( *pcString ) @@ -206,7 +206,7 @@ static void prvSetupLCD( void ) static void vLCDTask( void *pvParameters ) { xLCDMessage xMessage; -unsigned portSHORT usRow = 0; +unsigned short usRow = 0; /* Remove compiler warnigns. */ ( void ) pvParameters; diff --git a/FreeRTOS/Demo/PIC24_MPLAB/timertest.c b/FreeRTOS/Demo/PIC24_MPLAB/timertest.c index 5d8916800..6df0b4232 100644 --- a/FreeRTOS/Demo/PIC24_MPLAB/timertest.c +++ b/FreeRTOS/Demo/PIC24_MPLAB/timertest.c @@ -91,11 +91,11 @@ static void prvCalculateAndStoreJitter( void ); /* The maximum time (in processor clocks) between two consecutive timer interrupts so far. */ -unsigned portSHORT usMaxJitter = 0; +unsigned short usMaxJitter = 0; /*-----------------------------------------------------------*/ -void vSetupTimerTest( unsigned portSHORT usFrequencyHz ) +void vSetupTimerTest( unsigned short usFrequencyHz ) { /* T2 is used to generate interrupts. T4 is used to provide an accurate time measurement. */ @@ -105,10 +105,10 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz ) TMR4 = 0; /* Timer 2 is going to interrupt at usFrequencyHz Hz. */ - PR2 = ( unsigned portSHORT ) ( configCPU_CLOCK_HZ / ( unsigned portLONG ) usFrequencyHz ); + PR2 = ( unsigned short ) ( configCPU_CLOCK_HZ / ( unsigned long ) usFrequencyHz ); /* Timer 4 is going to free run from minimum to maximum value. */ - PR4 = ( unsigned portSHORT ) timerMAX_COUNT; + PR4 = ( unsigned short ) timerMAX_COUNT; /* Setup timer 2 interrupt priority to be above the kernel priority so the timer jitter is not effected by the kernel activity. */ @@ -128,8 +128,8 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz ) static void prvCalculateAndStoreJitter( void ) { -static unsigned portSHORT usLastCount = 0, usSettleCount = 0; -unsigned portSHORT usThisCount, usDifference; +static unsigned short usLastCount = 0, usSettleCount = 0; +unsigned short usThisCount, usDifference; /* Capture the timer value as we enter the interrupt. */ usThisCount = TMR4; diff --git a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c index f06ea14a3..4aa9d7bd4 100644 --- a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c +++ b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c @@ -125,11 +125,11 @@ static void vFlopTest2( void *pvParameters ); /* Buffers into which the flop registers will be saved. There is a buffer for both tasks. */ -static volatile unsigned portLONG ulFlopRegisters[ flopNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; +static volatile unsigned long ulFlopRegisters[ flopNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; /* Variables that are incremented by the tasks to indicate that they are still running. */ -static volatile unsigned portLONG ulFlop1CycleCount = 0, ulFlop2CycleCount = 0; +static volatile unsigned long ulFlop1CycleCount = 0, ulFlop2CycleCount = 0; /*-----------------------------------------------------------*/ @@ -219,7 +219,7 @@ portBASE_TYPE xAreFlopRegisterTestsStillRunning( void ) { portBASE_TYPE xReturn = pdPASS; unsigned portBASE_TYPE x, y, z = flopSTART_VALUE; -static unsigned portLONG ulLastFlop1CycleCount = 0, ulLastFlop2CycleCount = 0; +static unsigned long ulLastFlop1CycleCount = 0, ulLastFlop2CycleCount = 0; /* Called from the 'check' task. diff --git a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c index 54e8c3bce..f8b13ce6a 100644 --- a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c +++ b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c @@ -102,13 +102,13 @@ static portTASK_FUNCTION_PROTO( vCompetingMathTask4, pvParameters ); /* These variables are used to check that all the tasks are still running. If a task gets a calculation wrong it will stop incrementing its check variable. */ -static volatile unsigned portSHORT usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 }; +static volatile unsigned short usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 }; /* Buffers into which the flop registers will be saved. There is a buffer for each task created within this file. Zeroing out this array is the normal and safe option as this will cause the task to start with all zeros in its flop context. */ -static unsigned portLONG ulFlopRegisters[ mathNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; +static unsigned long ulFlopRegisters[ mathNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; /*-----------------------------------------------------------*/ @@ -172,9 +172,9 @@ portBASE_TYPE x, y; static portTASK_FUNCTION( vCompetingMathTask1, pvParameters ) { volatile portFLOAT ff1, ff2, ff3, ff4; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; volatile portFLOAT fAnswer; -portSHORT sError = pdFALSE; +short sError = pdFALSE; ff1 = 123.4567F; ff2 = 2345.6789F; @@ -184,7 +184,7 @@ portSHORT sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; /* Keep performing a calculation and checking the result against a constant. */ for(;;) @@ -224,9 +224,9 @@ portSHORT sError = pdFALSE; static portTASK_FUNCTION( vCompetingMathTask2, pvParameters ) { volatile portFLOAT ff1, ff2, ff3, ff4; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; volatile portFLOAT fAnswer; -portSHORT sError = pdFALSE; +short sError = pdFALSE; ff1 = -389.38F; ff2 = 32498.2F; @@ -237,7 +237,7 @@ portSHORT sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; /* Keep performing a calculation and checking the result against a constant. */ for( ;; ) @@ -277,14 +277,14 @@ portSHORT sError = pdFALSE; static portTASK_FUNCTION( vCompetingMathTask3, pvParameters ) { volatile portFLOAT *pfArray, fTotal1, fTotal2, fDifference; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; const size_t xArraySize = 10; size_t xPosition; -portSHORT sError = pdFALSE; +short sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; pfArray = ( portFLOAT * ) pvPortMalloc( xArraySize * sizeof( portFLOAT ) ); @@ -334,14 +334,14 @@ portSHORT sError = pdFALSE; static portTASK_FUNCTION( vCompetingMathTask4, pvParameters ) { volatile portFLOAT *pfArray, fTotal1, fTotal2, fDifference; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; const size_t xArraySize = 10; size_t xPosition; -portSHORT sError = pdFALSE; +short sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; pfArray = ( portFLOAT * ) pvPortMalloc( xArraySize * sizeof( portFLOAT ) ); @@ -393,7 +393,7 @@ portBASE_TYPE xAreMathsTaskStillRunning( void ) { /* Keep a history of the check variables so we know if they have been incremented since the last call. */ -static unsigned portSHORT usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 }; +static unsigned short usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 }; portBASE_TYPE xReturn = pdTRUE, xTask; /* Check the maths tasks are still running by ensuring their check variables diff --git a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c index 0b523edd2..1729304f6 100644 --- a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c +++ b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c @@ -167,7 +167,7 @@ discover an unexpected value. */ static volatile unsigned portBASE_TYPE xRegTestStatus = pdPASS; /* Counters used to ensure the regtest tasks are still running. */ -static volatile unsigned portLONG ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL; +static volatile unsigned long ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL; /*-----------------------------------------------------------*/ @@ -226,7 +226,7 @@ int main( void ) static portBASE_TYPE prvCheckOtherTasksAreStillRunning( void ) { portBASE_TYPE lReturn = pdPASS; -static unsigned portLONG ulLastRegTest1Counter= 0UL, ulLastRegTest2Counter = 0UL; +static unsigned long ulLastRegTest1Counter= 0UL, ulLastRegTest2Counter = 0UL; /* The demo tasks maintain a count that increments every cycle of the task provided that the task has never encountered an error. This function @@ -691,12 +691,12 @@ static void prvRegTestTask2( void *pvParameters ) /* This hook function will get called if there is a suspected stack overflow. An overflow can cause the task name to be corrupted, in which case the task handle needs to be used to determine the offending task. */ -void vApplicationStackOverflowHook( xTaskHandle xTask, signed portCHAR *pcTaskName ); -void vApplicationStackOverflowHook( xTaskHandle xTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle xTask, signed char *pcTaskName ); +void vApplicationStackOverflowHook( xTaskHandle xTask, signed char *pcTaskName ) { /* To prevent the optimiser removing the variables. */ volatile xTaskHandle xTaskIn = xTask; -volatile signed portCHAR *pcTaskNameIn = pcTaskName; +volatile signed char *pcTaskNameIn = pcTaskName; /* Remove compiler warnings. */ ( void ) xTaskIn; diff --git a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c index a3cb8cab4..b23fb21bf 100644 --- a/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c +++ b/FreeRTOS/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c @@ -100,7 +100,7 @@ static void vSerialISR( XUartLite *pxUART ); /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { /* NOTE: The baud rate used by this driver is determined by the hardware parameterization of the UART Lite peripheral, and the baud value passed to @@ -108,8 +108,8 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned ( void ) ulWantedBaud; /* Create the queues used to hold Rx and Tx characters. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* Only initialise the UART if the queues were created correctly. */ if( ( xRxedChars != NULL ) && ( xCharsForTx != NULL ) ) @@ -133,7 +133,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* The port handle is not required as this driver only supports one UART. */ ( void ) pxPort; @@ -151,7 +151,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { portBASE_TYPE xReturn = pdTRUE; @@ -202,9 +202,9 @@ void vSerialClose( xComPortHandle xPort ) static void vSerialISR( XUartLite *pxUART ) { -unsigned portLONG ulISRStatus; +unsigned long ulISRStatus; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE, lDidSomething; -portCHAR cChar; +char cChar; /* Just to remove compiler warning. */ ( void ) pxUART; @@ -220,7 +220,7 @@ portCHAR cChar; /* A character is available - place it in the queue of received characters. This might wake a task that was blocked waiting for data. */ - cChar = ( portCHAR ) XIo_In32( XPAR_RS232_UART_BASEADDR + XUL_RX_FIFO_OFFSET ); + cChar = ( char ) XIo_In32( XPAR_RS232_UART_BASEADDR + XUL_RX_FIFO_OFFSET ); xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken ); lDidSomething = pdTRUE; } diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c index f06ea14a3..4aa9d7bd4 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c @@ -125,11 +125,11 @@ static void vFlopTest2( void *pvParameters ); /* Buffers into which the flop registers will be saved. There is a buffer for both tasks. */ -static volatile unsigned portLONG ulFlopRegisters[ flopNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; +static volatile unsigned long ulFlopRegisters[ flopNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; /* Variables that are incremented by the tasks to indicate that they are still running. */ -static volatile unsigned portLONG ulFlop1CycleCount = 0, ulFlop2CycleCount = 0; +static volatile unsigned long ulFlop1CycleCount = 0, ulFlop2CycleCount = 0; /*-----------------------------------------------------------*/ @@ -219,7 +219,7 @@ portBASE_TYPE xAreFlopRegisterTestsStillRunning( void ) { portBASE_TYPE xReturn = pdPASS; unsigned portBASE_TYPE x, y, z = flopSTART_VALUE; -static unsigned portLONG ulLastFlop1CycleCount = 0, ulLastFlop2CycleCount = 0; +static unsigned long ulLastFlop1CycleCount = 0, ulLastFlop2CycleCount = 0; /* Called from the 'check' task. diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c index 54e8c3bce..f8b13ce6a 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c @@ -102,13 +102,13 @@ static portTASK_FUNCTION_PROTO( vCompetingMathTask4, pvParameters ); /* These variables are used to check that all the tasks are still running. If a task gets a calculation wrong it will stop incrementing its check variable. */ -static volatile unsigned portSHORT usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 }; +static volatile unsigned short usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 }; /* Buffers into which the flop registers will be saved. There is a buffer for each task created within this file. Zeroing out this array is the normal and safe option as this will cause the task to start with all zeros in its flop context. */ -static unsigned portLONG ulFlopRegisters[ mathNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; +static unsigned long ulFlopRegisters[ mathNUMBER_OF_TASKS ][ portNO_FLOP_REGISTERS_TO_SAVE ]; /*-----------------------------------------------------------*/ @@ -172,9 +172,9 @@ portBASE_TYPE x, y; static portTASK_FUNCTION( vCompetingMathTask1, pvParameters ) { volatile portFLOAT ff1, ff2, ff3, ff4; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; volatile portFLOAT fAnswer; -portSHORT sError = pdFALSE; +short sError = pdFALSE; ff1 = 123.4567F; ff2 = 2345.6789F; @@ -184,7 +184,7 @@ portSHORT sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; /* Keep performing a calculation and checking the result against a constant. */ for(;;) @@ -224,9 +224,9 @@ portSHORT sError = pdFALSE; static portTASK_FUNCTION( vCompetingMathTask2, pvParameters ) { volatile portFLOAT ff1, ff2, ff3, ff4; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; volatile portFLOAT fAnswer; -portSHORT sError = pdFALSE; +short sError = pdFALSE; ff1 = -389.38F; ff2 = 32498.2F; @@ -237,7 +237,7 @@ portSHORT sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; /* Keep performing a calculation and checking the result against a constant. */ for( ;; ) @@ -277,14 +277,14 @@ portSHORT sError = pdFALSE; static portTASK_FUNCTION( vCompetingMathTask3, pvParameters ) { volatile portFLOAT *pfArray, fTotal1, fTotal2, fDifference; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; const size_t xArraySize = 10; size_t xPosition; -portSHORT sError = pdFALSE; +short sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; pfArray = ( portFLOAT * ) pvPortMalloc( xArraySize * sizeof( portFLOAT ) ); @@ -334,14 +334,14 @@ portSHORT sError = pdFALSE; static portTASK_FUNCTION( vCompetingMathTask4, pvParameters ) { volatile portFLOAT *pfArray, fTotal1, fTotal2, fDifference; -volatile unsigned portSHORT *pusTaskCheckVariable; +volatile unsigned short *pusTaskCheckVariable; const size_t xArraySize = 10; size_t xPosition; -portSHORT sError = pdFALSE; +short sError = pdFALSE; /* The variable this task increments to show it is still running is passed in as the parameter. */ - pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters; + pusTaskCheckVariable = ( unsigned short * ) pvParameters; pfArray = ( portFLOAT * ) pvPortMalloc( xArraySize * sizeof( portFLOAT ) ); @@ -393,7 +393,7 @@ portBASE_TYPE xAreMathsTaskStillRunning( void ) { /* Keep a history of the check variables so we know if they have been incremented since the last call. */ -static unsigned portSHORT usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 }; +static unsigned short usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 }; portBASE_TYPE xReturn = pdTRUE, xTask; /* Check the maths tasks are still running by ensuring their check variables diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c index f65f99487..661c42578 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c @@ -167,7 +167,7 @@ discover an unexpected value. */ static volatile unsigned portBASE_TYPE xRegTestStatus = pdPASS; /* Counters used to ensure the regtest tasks are still running. */ -static volatile unsigned portLONG ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL; +static volatile unsigned long ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL; /*-----------------------------------------------------------*/ @@ -232,7 +232,7 @@ int main( void ) static portBASE_TYPE prvCheckOtherTasksAreStillRunning( void ) { portBASE_TYPE lReturn = pdPASS; -static unsigned portLONG ulLastRegTest1Counter= 0UL, ulLastRegTest2Counter = 0UL; +static unsigned long ulLastRegTest1Counter= 0UL, ulLastRegTest2Counter = 0UL; /* The demo tasks maintain a count that increments every cycle of the task provided that the task has never encountered an error. This function @@ -697,12 +697,12 @@ static void prvRegTestTask2( void *pvParameters ) /* This hook function will get called if there is a suspected stack overflow. An overflow can cause the task name to be corrupted, in which case the task handle needs to be used to determine the offending task. */ -void vApplicationStackOverflowHook( xTaskHandle xTask, signed portCHAR *pcTaskName ); -void vApplicationStackOverflowHook( xTaskHandle xTask, signed portCHAR *pcTaskName ) +void vApplicationStackOverflowHook( xTaskHandle xTask, signed char *pcTaskName ); +void vApplicationStackOverflowHook( xTaskHandle xTask, signed char *pcTaskName ) { /* To prevent the optimiser removing the variables. */ volatile xTaskHandle xTaskIn = xTask; -volatile signed portCHAR *pcTaskNameIn = pcTaskName; +volatile signed char *pcTaskNameIn = pcTaskName; /* Remove compiler warnings. */ ( void ) xTaskIn; diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c index a3cb8cab4..b23fb21bf 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c @@ -100,7 +100,7 @@ static void vSerialISR( XUartLite *pxUART ); /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { /* NOTE: The baud rate used by this driver is determined by the hardware parameterization of the UART Lite peripheral, and the baud value passed to @@ -108,8 +108,8 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned ( void ) ulWantedBaud; /* Create the queues used to hold Rx and Tx characters. */ - xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); + xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); + xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) ); /* Only initialise the UART if the queues were created correctly. */ if( ( xRxedChars != NULL ) && ( xCharsForTx != NULL ) ) @@ -133,7 +133,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* The port handle is not required as this driver only supports one UART. */ ( void ) pxPort; @@ -151,7 +151,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) { portBASE_TYPE xReturn = pdTRUE; @@ -202,9 +202,9 @@ void vSerialClose( xComPortHandle xPort ) static void vSerialISR( XUartLite *pxUART ) { -unsigned portLONG ulISRStatus; +unsigned long ulISRStatus; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE, lDidSomething; -portCHAR cChar; +char cChar; /* Just to remove compiler warning. */ ( void ) pxUART; @@ -220,7 +220,7 @@ portCHAR cChar; /* A character is available - place it in the queue of received characters. This might wake a task that was blocked waiting for data. */ - cChar = ( portCHAR ) XIo_In32( XPAR_RS232_UART_BASEADDR + XUL_RX_FIFO_OFFSET ); + cChar = ( char ) XIo_In32( XPAR_RS232_UART_BASEADDR + XUL_RX_FIFO_OFFSET ); xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken ); lDidSomething = pdTRUE; } diff --git a/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/include/croutine.h b/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/include/croutine.h index 361bd1ea1..4e5514e68 100644 --- a/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/include/croutine.h +++ b/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/include/croutine.h @@ -88,10 +88,10 @@ extern "C" { /* Used to hide the implementation of the co-routine control block. The control block structure however has to be included in the header due to the macro implementation of the co-routine functionality. */ -typedef void * xCoRoutineHandle; +typedef void * CoRoutineHandle_t; /* Defines the prototype to which co-routine functions must conform. */ -typedef void (*crCOROUTINE_CODE)( xCoRoutineHandle, unsigned portBASE_TYPE ); +typedef void (*crCOROUTINE_CODE)( CoRoutineHandle_t, unsigned portBASE_TYPE ); typedef struct corCoRoutineControlBlock { @@ -101,7 +101,7 @@ typedef struct corCoRoutineControlBlock unsigned portBASE_TYPE uxPriority; /*< The priority of the co-routine in relation to other co-routines. */ unsigned portBASE_TYPE uxIndex; /*< Used to distinguish between co-routines when multiple co-routines use the same co-routine function. */ unsigned short uxState; /*< Used internally by the co-routine implementation. */ -} corCRCB; /* Co-routine control block. Note must be identical in size down to uxPriority with tskTCB. */ +} CRCB_t; /* Co-routine control block. Note must be identical in size down to uxPriority with tskTCB. */ /** * croutine. h @@ -132,7 +132,7 @@ typedef struct corCoRoutineControlBlock * Example usage: 
  // Co-routine to be created.
- void vFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ void vFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  // Variables in co-routines must be declared static if they must maintain value across a blocking call.
  // This may not be necessary for const variables.
@@ -222,14 +222,14 @@ void vCoRoutineSchedule( void );
 /**
  * croutine. h
  * 
- crSTART( xCoRoutineHandle xHandle );

+ crSTART( CoRoutineHandle_t xHandle );
* * This macro MUST always be called at the start of a co-routine function. * * Example usage: 
  // Co-routine to be created.
- void vACoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ void vACoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  // Variables in co-routines must be declared static if they must maintain value across a blocking call.
  static long ulAVariable;
@@ -248,7 +248,7 @@ void vCoRoutineSchedule( void );
  * \defgroup crSTART crSTART
  * \ingroup Tasks
  */
-#define crSTART( pxCRCB ) switch( ( ( corCRCB * )( pxCRCB ) )->uxState ) { case 0:
+#define crSTART( pxCRCB ) switch( ( ( CRCB_t * )( pxCRCB ) )->uxState ) { case 0:
 
 /**
  * croutine. h
@@ -260,7 +260,7 @@ void vCoRoutineSchedule( void );
  * Example usage:
    
  // Co-routine to be created.
- void vACoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ void vACoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  // Variables in co-routines must be declared static if they must maintain value across a blocking call.
  static long ulAVariable;
@@ -285,13 +285,13 @@ void vCoRoutineSchedule( void );
  * These macros are intended for internal use by the co-routine implementation
  * only.  The macros should not be used directly by application writers.
  */
-#define crSET_STATE0( xHandle ) ( ( corCRCB * )( xHandle ) )->uxState = (__LINE__ * 2); return; case (__LINE__ * 2):
-#define crSET_STATE1( xHandle ) ( ( corCRCB * )( xHandle ) )->uxState = ((__LINE__ * 2)+1); return; case ((__LINE__ * 2)+1):
+#define crSET_STATE0( xHandle ) ( ( CRCB_t * )( xHandle ) )->uxState = (__LINE__ * 2); return; case (__LINE__ * 2):
+#define crSET_STATE1( xHandle ) ( ( CRCB_t * )( xHandle ) )->uxState = ((__LINE__ * 2)+1); return; case ((__LINE__ * 2)+1):
 
 /**
  * croutine. h
  *
- crDELAY( xCoRoutineHandle xHandle, portTickType xTicksToDelay );

+ crDELAY( CoRoutineHandle_t xHandle, portTickType xTicksToDelay );

  *
  * Delay a co-routine for a fixed period of time.
  *
@@ -310,7 +310,7 @@ void vCoRoutineSchedule( void );
  * Example usage:
    
  // Co-routine to be created.
- void vACoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ void vACoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  // Variables in co-routines must be declared static if they must maintain value across a blocking call.
  // This may not be necessary for const variables.
@@ -344,7 +344,7 @@ void vCoRoutineSchedule( void );
 /**
  * 
  crQUEUE_SEND(
-                  xCoRoutineHandle xHandle,
+                  CoRoutineHandle_t xHandle,
                   xQueueHandle pxQueue,
                   void *pvItemToQueue,
                   portTickType xTicksToWait,
@@ -392,7 +392,7 @@ void vCoRoutineSchedule( void );
    
  // Co-routine function that blocks for a fixed period then posts a number onto
  // a queue.
- static void prvCoRoutineFlashTask( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ static void prvCoRoutineFlashTask( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  // Variables in co-routines must be declared static if they must maintain value across a blocking call.
  static portBASE_TYPE xNumberToPost = 0;
@@ -443,7 +443,7 @@ void vCoRoutineSchedule( void );
  * croutine. h
  * 
   crQUEUE_RECEIVE(
-                     xCoRoutineHandle xHandle,
+                     CoRoutineHandle_t xHandle,
                      xQueueHandle pxQueue,
                      void *pvBuffer,
                      portTickType xTicksToWait,
@@ -490,7 +490,7 @@ void vCoRoutineSchedule( void );
  
  // A co-routine receives the number of an LED to flash from a queue.  It
  // blocks on the queue until the number is received.
- static void prvCoRoutineFlashWorkTask( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ static void prvCoRoutineFlashWorkTask( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  // Variables in co-routines must be declared static if they must maintain value across a blocking call.
  static portBASE_TYPE xResult;
@@ -575,7 +575,7 @@ void vCoRoutineSchedule( void );
  * Example usage:
  
  // A co-routine that blocks on a queue waiting for characters to be received.
- static void vReceivingCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ static void vReceivingCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  char cRxedChar;
  portBASE_TYPE xResult;
@@ -673,7 +673,7 @@ void vCoRoutineSchedule( void );
  
  // A co-routine that posts a character to a queue then blocks for a fixed
  // period.  The character is incremented each time.
- static void vSendingCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
+ static void vSendingCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
  {
  // cChar holds its value while this co-routine is blocked and must therefore
  // be declared static.
diff --git a/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/portable/GCC/RL78/portmacro.h b/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/portable/GCC/RL78/portmacro.h
index de757999f..6c6c0b340 100644
--- a/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/portable/GCC/RL78/portmacro.h
+++ b/FreeRTOS/Demo/RL78_E2Studio_GCC/src/FreeRTOS_Source/portable/GCC/RL78/portmacro.h
@@ -122,7 +122,7 @@ extern "C" {
 /*-----------------------------------------------------------*/
 
 /* Critical section control macros. */
-#define portNO_CRITICAL_SECTION_NESTING		( ( unsigned portSHORT ) 0 )
+#define portNO_CRITICAL_SECTION_NESTING		( ( unsigned short ) 0 )
 
 #define portENTER_CRITICAL()													\
 {																				\
diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c
index cf754d07b..b8875d3bb 100644
--- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c
+++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c
@@ -337,7 +337,7 @@ static portBASE_TYPE xChangedTimerPeriodAlready = pdFALSE, xErrorStatus = pdPASS
 
 int __low_level_init(void)
 {
-unsigned portCHAR ucResetFlag = RESF;
+unsigned char ucResetFlag = RESF;
 
 	portDISABLE_INTERRUPTS();
 
diff --git a/FreeRTOS/Demo/dsPIC_MPLAB/lcd.c b/FreeRTOS/Demo/dsPIC_MPLAB/lcd.c
index 504a4e2aa..6aefd4b03 100644
--- a/FreeRTOS/Demo/dsPIC_MPLAB/lcd.c
+++ b/FreeRTOS/Demo/dsPIC_MPLAB/lcd.c
@@ -87,12 +87,12 @@ static void prvSetupLCD( void );
 /*
  * Move to the first (0) or second (1) row of the LCD.
  */
-static void prvLCDGotoRow( unsigned portSHORT usRow );
+static void prvLCDGotoRow( unsigned short usRow );
 
 /*
  * Write a string of text to the LCD.
  */
-static void prvLCDPutString( portCHAR *pcString );
+static void prvLCDPutString( char *pcString );
 
 /*
  * Clear the LCD.
@@ -142,8 +142,8 @@ static void prvLCDClear( void );
 /* The queue used to send messages to the LCD task. */
 xQueueHandle xLCDQueue;
 
-static void prvLCDCommand( portCHAR cCommand );
-static void prvLCDData( portCHAR cChar );
+static void prvLCDCommand( char cCommand );
+static void prvLCDData( char cChar );
 
 /*-----------------------------------------------------------*/
 
@@ -161,7 +161,7 @@ xQueueHandle xStartLCDTask( void )
 }
 /*-----------------------------------------------------------*/
 
-static void prvLCDGotoRow( unsigned portSHORT usRow )
+static void prvLCDGotoRow( unsigned short usRow )
 {
 	if( usRow == 0 )
 	{
@@ -174,7 +174,7 @@ static void prvLCDGotoRow( unsigned portSHORT usRow )
 }
 /*-----------------------------------------------------------*/
 
-static void prvLCDCommand( portCHAR cCommand )
+static void prvLCDCommand( char cCommand )
 {
 	/* Prepare RD0 - RD7. */
 	lcdDATA &= 0xFF00;
@@ -195,7 +195,7 @@ static void prvLCDCommand( portCHAR cCommand )
 }
 /*-----------------------------------------------------------*/
 
-static void prvLCDData( portCHAR cChar )
+static void prvLCDData( char cChar )
 {
 	/* ensure lcdRW is 0. */
 	lcdRW = 0;
@@ -223,7 +223,7 @@ static void prvLCDData( portCHAR cChar )
 }
 /*-----------------------------------------------------------*/
 
-static void prvLCDPutString( portCHAR *pcString )
+static void prvLCDPutString( char *pcString )
 {
 	/* Write out each character with appropriate delay between each. */
 	while( *pcString )
@@ -328,7 +328,7 @@ static void prvSetupLCD( void )
 static void vLCDTask( void *pvParameters )
 {
 xLCDMessage xMessage;
-unsigned portSHORT usRow = 0;
+unsigned short usRow = 0;
 
 	/* Initialise the hardware.  This uses delays so must not be called prior
 	to the scheduler being started. */
diff --git a/FreeRTOS/Demo/dsPIC_MPLAB/timertest.c b/FreeRTOS/Demo/dsPIC_MPLAB/timertest.c
index 5d8916800..6df0b4232 100644
--- a/FreeRTOS/Demo/dsPIC_MPLAB/timertest.c
+++ b/FreeRTOS/Demo/dsPIC_MPLAB/timertest.c
@@ -91,11 +91,11 @@ static void prvCalculateAndStoreJitter( void );
 
 /* The maximum time (in processor clocks) between two consecutive timer
 interrupts so far. */
-unsigned portSHORT usMaxJitter = 0;
+unsigned short usMaxJitter = 0;
 
 /*-----------------------------------------------------------*/
 
-void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
+void vSetupTimerTest( unsigned short usFrequencyHz )
 {
 	/* T2 is used to generate interrupts.  T4 is used to provide an accurate
 	time measurement. */
@@ -105,10 +105,10 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
 	TMR4 = 0;
 
 	/* Timer 2 is going to interrupt at usFrequencyHz Hz. */
-	PR2 = ( unsigned portSHORT ) ( configCPU_CLOCK_HZ / ( unsigned portLONG ) usFrequencyHz );
+	PR2 = ( unsigned short ) ( configCPU_CLOCK_HZ / ( unsigned long ) usFrequencyHz );
 
 	/* Timer 4 is going to free run from minimum to maximum value. */
-	PR4 = ( unsigned portSHORT ) timerMAX_COUNT;
+	PR4 = ( unsigned short ) timerMAX_COUNT;
 
 	/* Setup timer 2 interrupt priority to be above the kernel priority so 
 	the timer jitter is not effected by the kernel activity. */
@@ -128,8 +128,8 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
 
 static void prvCalculateAndStoreJitter( void )
 {
-static unsigned portSHORT usLastCount = 0, usSettleCount = 0;
-unsigned portSHORT usThisCount, usDifference;
+static unsigned short usLastCount = 0, usSettleCount = 0;
+unsigned short usThisCount, usDifference;
 
 	/* Capture the timer value as we enter the interrupt. */
 	usThisCount = TMR4;
diff --git a/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/BasicSMTP/BasicSMTP.c b/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/BasicSMTP/BasicSMTP.c
index 3dca3d37f..44c55354b 100644
--- a/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/BasicSMTP/BasicSMTP.c
+++ b/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/BasicSMTP/BasicSMTP.c
@@ -92,7 +92,7 @@
 
 //! Server address
 #error configure SMTP server address
-portCHAR cServer[] = "192.168.0.1";
+char cServer[] = "192.168.0.1";
 
 //! Fill here the mailfrom with your mail address
 #error configure SMTP mail sender
@@ -110,7 +110,7 @@ char cMailcontent[] ="Subject: *** SPAM ***\r\nFROM: \"Your Name here\" \
 "
 
-portCHAR cDynamicPage[ webMAX_PAGE_SIZE ];
-portCHAR cPageHits[ 11 ];
+char cDynamicPage[ webMAX_PAGE_SIZE ];
+char cPageHits[ 11 ];
 
 
 /*! Function to process the current connection */
@@ -154,9 +154,9 @@ struct netconn *pxHTTPListener, *pxNewConnection;
 static void prvweb_ParseHTMLRequest( struct netconn *pxNetCon )
 {
 struct netbuf *pxRxBuffer;
-portCHAR *pcRxString;
-unsigned portSHORT usLength;
-static unsigned portLONG ulPageHits = 0;
+char *pcRxString;
+unsigned short usLength;
+static unsigned long ulPageHits = 0;
 
 	/* We expect to immediately get data. */
 	pxRxBuffer = netconn_recv( pxNetCon );
diff --git a/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/ethernet.c b/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/ethernet.c
index e14014c69..881e05ff1 100644
--- a/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/ethernet.c
+++ b/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/ethernet.c
@@ -170,7 +170,7 @@ static void prvEthernetConfigureInterface(void * param)
 {
 struct ip_addr xIpAddr, xNetMask, xGateway;
 extern err_t ethernetif_init( struct netif *netif );
-portCHAR MacAddress[6];
+char MacAddress[6];
 
    /* Default MAC addr. */
    MacAddress[0] = ETHERNET_CONF_ETHADDR0;
diff --git a/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/lwip-port/AT32UC3A/sys_arch.c b/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/lwip-port/AT32UC3A/sys_arch.c
index ae1979caa..865eed1bb 100644
--- a/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/lwip-port/AT32UC3A/sys_arch.c
+++ b/FreeRTOS/Demo/lwIP_AVR32_UC3/NETWORK/lwip-port/AT32UC3A/sys_arch.c
@@ -62,7 +62,7 @@
 
 /* Message queue constants. */
 #define archMESG_QUEUE_LENGTH ( 6 )
-#define archPOST_BLOCK_TIME_MS  ( ( unsigned portLONG ) 10000 )
+#define archPOST_BLOCK_TIME_MS  ( ( unsigned long ) 10000 )
 
 struct timeoutlist
 {
diff --git a/FreeRTOS/Demo/lwIP_AVR32_UC3/PARTEST/ParTest.c b/FreeRTOS/Demo/lwIP_AVR32_UC3/PARTEST/ParTest.c
index a2f1d1d3b..b8a26f6f7 100644
--- a/FreeRTOS/Demo/lwIP_AVR32_UC3/PARTEST/ParTest.c
+++ b/FreeRTOS/Demo/lwIP_AVR32_UC3/PARTEST/ParTest.c
@@ -50,10 +50,10 @@
  * Simple parallel port IO routines.
  *-----------------------------------------------------------*/
 
-#define partstALL_OUTPUTS_OFF     ( ( unsigned portCHAR ) 0x00 )
-#define partstMAX_OUTPUT_LED      ( ( unsigned portCHAR ) 8 )
+#define partstALL_OUTPUTS_OFF     ( ( unsigned char ) 0x00 )
+#define partstMAX_OUTPUT_LED      ( ( unsigned char ) 8 )
 
-static volatile unsigned portCHAR ucCurrentOutputValue = partstALL_OUTPUTS_OFF; /*lint !e956 File scope parameters okay here. */
+static volatile unsigned char ucCurrentOutputValue = partstALL_OUTPUTS_OFF; /*lint !e956 File scope parameters okay here. */
 
 /*-----------------------------------------------------------*/
 
@@ -65,14 +65,14 @@ void vParTestInitialise( void )
 
 void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
 {
-unsigned portCHAR ucBit;
+unsigned char ucBit;
 
 	if( uxLED >= partstMAX_OUTPUT_LED )
 	{
 		return;
 	}
 
-	ucBit = ( ( unsigned portCHAR ) 1 ) << uxLED;
+	ucBit = ( ( unsigned char ) 1 ) << uxLED;
 
 	vTaskSuspendAll();
 	{
@@ -93,14 +93,14 @@ unsigned portCHAR ucBit;
 
 void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
 {
-	unsigned portCHAR ucBit;
+	unsigned char ucBit;
 
 	if( uxLED >= partstMAX_OUTPUT_LED )
 	{
 		return;
 	}
 
-	ucBit = ( ( unsigned portCHAR ) 1 ) << uxLED;
+	ucBit = ( ( unsigned char ) 1 ) << uxLED;
 
 	vTaskSuspendAll();
 	{
diff --git a/FreeRTOS/Demo/lwIP_AVR32_UC3/SERIAL/serial.c b/FreeRTOS/Demo/lwIP_AVR32_UC3/SERIAL/serial.c
index 2bb15455c..d8e09580b 100644
--- a/FreeRTOS/Demo/lwIP_AVR32_UC3/SERIAL/serial.c
+++ b/FreeRTOS/Demo/lwIP_AVR32_UC3/SERIAL/serial.c
@@ -87,9 +87,9 @@ __attribute__((__noinline__))
 static portBASE_TYPE prvUSART0_ISR_NonNakedBehaviour( void )
 {
   /* Now we can declare the local variables. */
-  signed portCHAR     cChar;
+  signed char     cChar;
   portBASE_TYPE     xHigherPriorityTaskWoken = pdFALSE;
-  unsigned portLONG     ulStatus;
+  unsigned long     ulStatus;
   volatile avr32_usart_t  *usart0 = &AVR32_USART0;
   portBASE_TYPE retstatus;
 
@@ -163,7 +163,7 @@ static void vUSART0_ISR( void )
 /*
  * Init the serial port for the Minimal implementation.
  */
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
 {
   static const gpio_map_t USART0_GPIO_MAP =
   {
@@ -181,7 +181,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned
   /* Configure USART0. */
   if( ( xRxedChars != serINVALID_QUEUE ) &&
       ( xCharsForTx != serINVALID_QUEUE ) &&
-      ( ulWantedBaud != ( unsigned portLONG ) 0 ) )
+      ( ulWantedBaud != ( unsigned long ) 0 ) )
   {
     portENTER_CRITICAL();
     {
@@ -278,7 +278,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned
 }
 /*-----------------------------------------------------------*/
 
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )
 {
   /* The port handle is not required as this driver only supports UART0. */
   ( void ) pxPort;
@@ -296,9 +296,9 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR
 }
 /*-----------------------------------------------------------*/
 
-void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength )
+void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength )
 {
-signed portCHAR *pxNext;
+signed char *pxNext;
 
   /* NOTE: This implementation does not handle the queue being full as no
   block time is used! */
@@ -307,7 +307,7 @@ signed portCHAR *pxNext;
   ( void ) pxPort;
 
   /* Send each character in the string, one at a time. */
-  pxNext = ( signed portCHAR * ) pcString;
+  pxNext = ( signed char * ) pcString;
   while( *pxNext )
   {
     xSerialPutChar( pxPort, *pxNext, serNO_BLOCK );
@@ -316,7 +316,7 @@ signed portCHAR *pxNext;
 }
 /*-----------------------------------------------------------*/
 
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )
 {
 volatile avr32_usart_t  *usart0 = &AVR32_USART0;
 
@@ -350,8 +350,8 @@ void vSerialClose( xComPortHandle xPort )
 static void vprvSerialCreateQueues(  unsigned portBASE_TYPE uxQueueLength, xQueueHandle *pxRxedChars, xQueueHandle *pxCharsForTx )
 {
   /* Create the queues used to hold Rx and Tx characters. */
-  xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
-  xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
+  xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );
+  xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) );
 
   /* Pass back a reference to the queues so the serial API file can
   post/receive characters. */
diff --git a/FreeRTOS/Demo/lwIP_AVR32_UC3/main.c b/FreeRTOS/Demo/lwIP_AVR32_UC3/main.c
index 342235509..fe391687e 100644
--- a/FreeRTOS/Demo/lwIP_AVR32_UC3/main.c
+++ b/FreeRTOS/Demo/lwIP_AVR32_UC3/main.c
@@ -62,8 +62,8 @@
 #define mainETH_TASK_PRIORITY     ( tskIDLE_PRIORITY + 1 )
 
 /* Baud rate used by the serial port tasks. */
-#define mainCOM_BAUD_RATE      ( ( unsigned portLONG ) 57600 )
-#define mainCOM_BUFFER_LEN     ( ( unsigned portLONG ) 70 )
+#define mainCOM_BAUD_RATE      ( ( unsigned long ) 57600 )
+#define mainCOM_BUFFER_LEN     ( ( unsigned long ) 70 )
 
 /* An address in the internal Flash used to count resets.  This is used to check that
 the demo application is not unexpectedly resetting. */
diff --git a/FreeRTOS/Demo/msp430_IAR/ParTest/ParTest.c b/FreeRTOS/Demo/msp430_IAR/ParTest/ParTest.c
index 0a83f7cb1..1467249ad 100644
--- a/FreeRTOS/Demo/msp430_IAR/ParTest/ParTest.c
+++ b/FreeRTOS/Demo/msp430_IAR/ParTest/ParTest.c
@@ -91,28 +91,28 @@
 
 /* Constants required to access the "LED's".  The LED segments are turned on
 and off to generate '*' characters. */
-#define partstNUM_LEDS			( ( unsigned portCHAR ) 6 )
-#define partstSEGMENTS_ON		( ( unsigned portCHAR ) 0x0f )
-#define partstSEGMENTS_OFF		( ( unsigned portCHAR ) 0x00 )
+#define partstNUM_LEDS			( ( unsigned char ) 6 )
+#define partstSEGMENTS_ON		( ( unsigned char ) 0x0f )
+#define partstSEGMENTS_OFF		( ( unsigned char ) 0x00 )
 
 /* The LED number of the real on board LED, rather than a simulated LED. */
 #define partstON_BOARD_LED		( ( unsigned portBASE_TYPE ) 10 )
-#define mainON_BOARD_LED_BIT	( ( unsigned portCHAR ) 0x01 )
+#define mainON_BOARD_LED_BIT	( ( unsigned char ) 0x01 )
 
 /* The LCD segments used to generate the '*' characters for LED's 0 to 5. */
-unsigned portCHAR * const ucRHSSegments[ partstNUM_LEDS ] = {	( unsigned portCHAR * )0xa4, 
-																( unsigned portCHAR * )0xa2, 
-																( unsigned portCHAR * )0xa0, 
-																( unsigned portCHAR * )0x9e,
-																( unsigned portCHAR * )0x9c,
-																( unsigned portCHAR * )0x9a };
-
-unsigned portCHAR * const ucLHSSegments[ partstNUM_LEDS ] = {	( unsigned portCHAR * )0xa3, 
-																( unsigned portCHAR * )0xa1, 
-																( unsigned portCHAR * )0x9f, 
-																( unsigned portCHAR * )0x9d,
-																( unsigned portCHAR * )0x9b,
-																( unsigned portCHAR * )0x99 };
+unsigned char * const ucRHSSegments[ partstNUM_LEDS ] = {	( unsigned char * )0xa4, 
+																( unsigned char * )0xa2, 
+																( unsigned char * )0xa0, 
+																( unsigned char * )0x9e,
+																( unsigned char * )0x9c,
+																( unsigned char * )0x9a };
+
+unsigned char * const ucLHSSegments[ partstNUM_LEDS ] = {	( unsigned char * )0xa3, 
+																( unsigned char * )0xa1, 
+																( unsigned char * )0x9f, 
+																( unsigned char * )0x9d,
+																( unsigned char * )0x9b,
+																( unsigned char * )0x99 };
 
 /*
  * Toggle the single genuine built in LED.
@@ -224,7 +224,7 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
 
 static void prvToggleOnBoardLED( void )
 {
-static unsigned portSHORT sState = pdFALSE;
+static unsigned short sState = pdFALSE;
 
 	/* Toggle the state of the single genuine on board LED. */
 	if( sState )	
diff --git a/FreeRTOS/Demo/msp430_IAR/main.c b/FreeRTOS/Demo/msp430_IAR/main.c
index 6998a06d5..d803cbab0 100644
--- a/FreeRTOS/Demo/msp430_IAR/main.c
+++ b/FreeRTOS/Demo/msp430_IAR/main.c
@@ -104,8 +104,8 @@
 #include "PollQ.h"
 
 /* Constants required for hardware setup. */
-#define mainALL_BITS_OUTPUT		( ( unsigned portCHAR ) 0xff )
-#define mainMAX_FREQUENCY		( ( unsigned portCHAR ) 121 )
+#define mainALL_BITS_OUTPUT		( ( unsigned char ) 0xff )
+#define mainMAX_FREQUENCY		( ( unsigned char ) 121 )
 
 /* Constants that define the LED's used by the various tasks. [in this case
 the '*' characters on the LCD represent LED's] */
@@ -119,7 +119,7 @@ the '*' characters on the LCD represent LED's] */
 #define mainLED_TASK_PRIORITY			( tskIDLE_PRIORITY + 1 )
 
 /* Baud rate used by the COM test tasks. */
-#define mainCOM_TEST_BAUD_RATE			( ( unsigned portLONG ) 19200 )
+#define mainCOM_TEST_BAUD_RATE			( ( unsigned long ) 19200 )
 
 /* The frequency at which the 'Check' tasks executes.  See the comments at the
 top of the page.  When the system is operating error free the 'Check' task
@@ -130,10 +130,10 @@ LCD represent LED's]*/
 #define mainERROR_CHECK_DELAY			( ( portTickType ) 500 / portTICK_RATE_MS  )
 
 /* The constants used in the calculation. */
-#define intgCONST1				( ( portLONG ) 123 )
-#define intgCONST2				( ( portLONG ) 234567 )
-#define intgCONST3				( ( portLONG ) -3 )
-#define intgCONST4				( ( portLONG ) 7 )
+#define intgCONST1				( ( long ) 123 )
+#define intgCONST2				( ( long ) 234567 )
+#define intgCONST3				( ( long ) -3 )
+#define intgCONST4				( ( long ) 7 )
 #define intgEXPECTED_ANSWER		( ( ( intgCONST1 + intgCONST2 ) * intgCONST3 ) / intgCONST4 )
 
 /*
@@ -146,7 +146,7 @@ static void vErrorChecks( void *pvParameters );
  * Called by the Check task.  Returns pdPASS if all the other tasks are found
  * to be operating without error - otherwise returns pdFAIL.
  */
-static portSHORT prvCheckOtherTasksAreStillRunning( void );
+static short prvCheckOtherTasksAreStillRunning( void );
 
 /*
  * Perform the hardware setup required by the ES449 in order to run the demo
@@ -156,7 +156,7 @@ static void prvSetupHardware( void );
 
 
 portBASE_TYPE xLocalError = pdFALSE;
-volatile unsigned portLONG ulIdleLoops = 0UL;
+volatile unsigned long ulIdleLoops = 0UL;
 
 /*-----------------------------------------------------------*/
 
@@ -215,10 +215,10 @@ portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY;
 }
 /*-----------------------------------------------------------*/
 
-static portSHORT prvCheckOtherTasksAreStillRunning( void )
+static short prvCheckOtherTasksAreStillRunning( void )
 {
-static portSHORT sNoErrorFound = pdTRUE;
-static unsigned portLONG ulLastIdleLoopCount = 0UL;
+static short sNoErrorFound = pdTRUE;
+static unsigned long ulLastIdleLoopCount = 0UL;
 
 	/* The demo tasks maintain a count that increments every cycle of the task
 	provided that the task has never encountered an error.  This function
@@ -291,7 +291,7 @@ void vApplicationIdleHook( void )
 {
 /* These variables are all effectively set to constants so they are volatile to
 ensure the compiler does not just get rid of them. */
-volatile portLONG lValue;
+volatile long lValue;
 
 	/* Keep performing a calculation and checking the result against a constant. */
 	for( ;; )
diff --git a/FreeRTOS/Demo/msp430_IAR/serial/serial.c b/FreeRTOS/Demo/msp430_IAR/serial/serial.c
index 7767043ce..e2bb4566a 100644
--- a/FreeRTOS/Demo/msp430_IAR/serial/serial.c
+++ b/FreeRTOS/Demo/msp430_IAR/serial/serial.c
@@ -81,7 +81,7 @@
 #include "serial.h"
 
 /* Constants required to setup the hardware. */
-#define serTX_AND_RX			( ( unsigned portCHAR ) 0x03 )
+#define serTX_AND_RX			( ( unsigned char ) 0x03 )
 
 /* Misc. constants. */
 #define serNO_BLOCK				( ( portTickType ) 0 )
@@ -95,13 +95,13 @@ static xQueueHandle xRxedChars;
 /* The queue used to hold characters waiting transmission. */
 static xQueueHandle xCharsForTx;
 
-static volatile portSHORT sTHREEmpty;
+static volatile short sTHREEmpty;
 
 /*-----------------------------------------------------------*/
 
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
 {
-unsigned portLONG ulBaudRateCount;
+unsigned long ulBaudRateCount;
 
 	/* Initialise the hardware. */
 
@@ -111,8 +111,8 @@ unsigned portLONG ulBaudRateCount;
 	portENTER_CRITICAL();
 	{
 		/* Create the queues used by the com test task. */
-		xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
-		xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
+		xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );
+		xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );
 
 		/* Reset UART. */
 		UCTL1 |= SWRST;
@@ -126,11 +126,11 @@ unsigned portLONG ulBaudRateCount;
 		U1TCTL |= SSEL1;
 
 		/* Setup baud rate low byte. */
-		U1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );
+		U1BR0 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );
 
 		/* Setup baud rate high byte. */
 		ulBaudRateCount >>= 8UL;
-		U1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );
+		U1BR1 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );
 
 		/* Enable ports. */
 		ME2 |= UTXE1 + URXE1;
@@ -153,7 +153,7 @@ unsigned portLONG ulBaudRateCount;
 }
 /*-----------------------------------------------------------*/
 
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )
 {
 	/* Get the next character from the buffer.  Return false if no characters
 	are available, or arrive before xBlockTime expires. */
@@ -168,7 +168,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR
 }
 /*-----------------------------------------------------------*/
 
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )
 {
 signed portBASE_TYPE xReturn;
 
@@ -224,7 +224,7 @@ signed portBASE_TYPE xReturn;
 	#pragma vector=UART1RX_VECTOR
 	__interrupt void vRxISR( void )
 	{
-	signed portCHAR cChar;
+	signed char cChar;
 	portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	
 		/* Get the character from the UART and post it on the queue of Rxed
@@ -252,7 +252,7 @@ signed portBASE_TYPE xReturn;
 	#pragma vector=UART1TX_VECTOR
 	__interrupt void vTxISR( void )
 	{
-	signed portCHAR cChar;
+	signed char cChar;
 	portBASE_TYPE xTaskWoken = pdFALSE;
 	
 		/* The previous character has been transmitted.  See if there are any
@@ -280,7 +280,7 @@ signed portBASE_TYPE xReturn;
     interrupt entry point. */
 	void vRxISR( void )
 	{
-	signed portCHAR cChar;
+	signed char cChar;
 	portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	
 		/* Get the character from the UART and post it on the queue of Rxed
@@ -300,7 +300,7 @@ signed portBASE_TYPE xReturn;
     interrupt entry point. */
 	void vTxISR( void )
 	{
-	signed portCHAR cChar;
+	signed char cChar;
 	portBASE_TYPE xTaskWoken = pdFALSE;
 	
 		/* The previous character has been transmitted.  See if there are any
-- 
2.39.5