From: richardbarry Date: Thu, 1 May 2008 09:06:26 +0000 (+0000) Subject: Remove inline keyword. X-Git-Tag: V5.0.2~67 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9d3246fa9b1720b7bbd0b120609264f8d12dff57;p=freertos Remove inline keyword. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@330 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h b/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h index 61cb1f9f0..6049c24ad 100644 --- a/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h +++ b/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h @@ -104,7 +104,7 @@ #define portOUTPUT_BYTE( xAddr, ucValue ) outp( xAddr, ucValue ) #define portINPUT_WORD( xAddr ) inpw( xAddr ) #define portOUTPUT_WORD( xAddr, usValue ) outpw( xAddr, usValue ) -#define inline + /*-----------------------------------------------------------*/ /* Task function macros as described on the FreeRTOS.org WEB site. */ diff --git a/Source/portable/BCC/16BitDOS/PC/prtmacro.h b/Source/portable/BCC/16BitDOS/PC/prtmacro.h index bd34bb625..4838cdb9f 100644 --- a/Source/portable/BCC/16BitDOS/PC/prtmacro.h +++ b/Source/portable/BCC/16BitDOS/PC/prtmacro.h @@ -103,7 +103,7 @@ /* Compiler specifics. */ #define portINPUT_BYTE( xAddr ) inp( xAddr ) #define portOUTPUT_BYTE( xAddr, ucValue ) outp( xAddr, ucValue ) -#define inline + /*-----------------------------------------------------------*/ /* Task function macros as described on the FreeRTOS.org WEB site. */ diff --git a/Source/portable/CodeWarrior/HCS12/portmacro.h b/Source/portable/CodeWarrior/HCS12/portmacro.h index b9145a4fc..4fa6f1876 100644 --- a/Source/portable/CodeWarrior/HCS12/portmacro.h +++ b/Source/portable/CodeWarrior/HCS12/portmacro.h @@ -216,7 +216,5 @@ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) -#define inline - #endif /* PORTMACRO_H */ diff --git a/Source/portable/GCC/ARM_CM3/portmacro.h b/Source/portable/GCC/ARM_CM3/portmacro.h index 2c00ae76e..7ebceb55e 100644 --- a/Source/portable/GCC/ARM_CM3/portmacro.h +++ b/Source/portable/GCC/ARM_CM3/portmacro.h @@ -138,7 +138,6 @@ extern void vPortExitCritical( void ); #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) -#define inline #define portNOP() #ifdef __cplusplus diff --git a/Source/portable/GCC/STR75x/portmacro.h b/Source/portable/GCC/STR75x/portmacro.h index 2ca1b2af0..5454c47b8 100644 --- a/Source/portable/GCC/STR75x/portmacro.h +++ b/Source/portable/GCC/STR75x/portmacro.h @@ -146,9 +146,6 @@ extern void vTaskSwitchContext( void ); \ } /*-----------------------------------------------------------*/ -/* Compiler specifics */ -#define inline - /* Task function macros as described on the FreeRTOS.org WEB site. */ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters ) diff --git a/Source/portable/IAR/ARM_CM3/portmacro.h b/Source/portable/IAR/ARM_CM3/portmacro.h index 60e7afb76..0c8c1fcf6 100644 --- a/Source/portable/IAR/ARM_CM3/portmacro.h +++ b/Source/portable/IAR/ARM_CM3/portmacro.h @@ -123,7 +123,6 @@ extern void vPortClearInterruptMask( void ); #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) -#define inline #define portNOP() #ifdef __cplusplus diff --git a/Source/portable/IAR/ATMega323/portmacro.h b/Source/portable/IAR/ATMega323/portmacro.h index 183ed023a..5303c053e 100644 --- a/Source/portable/IAR/ATMega323/portmacro.h +++ b/Source/portable/IAR/ATMega323/portmacro.h @@ -116,10 +116,6 @@ void vPortYield( void ); #endif /*-----------------------------------------------------------*/ -/* Compiler specifics. */ -#define inline -/*-----------------------------------------------------------*/ - /* Task function macros as described on the FreeRTOS.org WEB site. */ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) diff --git a/Source/portable/IAR/AVR32_UC3/portmacro.h b/Source/portable/IAR/AVR32_UC3/portmacro.h index 6278de4db..86213c9ff 100644 --- a/Source/portable/IAR/AVR32_UC3/portmacro.h +++ b/Source/portable/IAR/AVR32_UC3/portmacro.h @@ -664,8 +664,6 @@ extern void *pvPortRealloc( void *pv, size_t xSize ); #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) -#define inline - #ifdef __cplusplus } #endif diff --git a/Source/portable/IAR/AtmelSAM7S64/portmacro.h b/Source/portable/IAR/AtmelSAM7S64/portmacro.h index cad76f9e6..219c98fd5 100644 --- a/Source/portable/IAR/AtmelSAM7S64/portmacro.h +++ b/Source/portable/IAR/AtmelSAM7S64/portmacro.h @@ -115,9 +115,6 @@ extern void vTaskSwitchContext( void ); \ } /*-----------------------------------------------------------*/ -/* Compiler specifics. */ -#define inline -/*-----------------------------------------------------------*/ /* Task function macros as described on the FreeRTOS.org WEB site. */ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) diff --git a/Source/portable/IAR/LPC2000/portmacro.h b/Source/portable/IAR/LPC2000/portmacro.h index 00595b3ba..aca711d93 100644 --- a/Source/portable/IAR/LPC2000/portmacro.h +++ b/Source/portable/IAR/LPC2000/portmacro.h @@ -117,10 +117,6 @@ extern void vTaskSwitchContext( void ); \ } /*-----------------------------------------------------------*/ -/* Compiler specifics. */ -#define inline -/*-----------------------------------------------------------*/ - /* Task function macros as described on the FreeRTOS.org WEB site. */ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters ) diff --git a/Source/portable/IAR/STR71x/portmacro.h b/Source/portable/IAR/STR71x/portmacro.h index c8f338831..c00a789f7 100644 --- a/Source/portable/IAR/STR71x/portmacro.h +++ b/Source/portable/IAR/STR71x/portmacro.h @@ -125,9 +125,6 @@ extern void vTaskSwitchContext( void ); \ /*-----------------------------------------------------------*/ -/* Compiler specifics */ -#define inline - /* Task function macros as described on the FreeRTOS.org WEB site. */ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters ) diff --git a/Source/portable/IAR/STR75x/portmacro.h b/Source/portable/IAR/STR75x/portmacro.h index 0fe35be0c..78015d7dc 100644 --- a/Source/portable/IAR/STR75x/portmacro.h +++ b/Source/portable/IAR/STR75x/portmacro.h @@ -115,8 +115,6 @@ extern void vTaskSwitchContext( void ); \ } /*-----------------------------------------------------------*/ -/* Compiler specifics */ -#define inline /* Task function macros as described on the FreeRTOS.org WEB site. */ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) diff --git a/Source/portable/IAR/STR91x/portmacro.h b/Source/portable/IAR/STR91x/portmacro.h index e4963dd16..a849102a3 100644 --- a/Source/portable/IAR/STR91x/portmacro.h +++ b/Source/portable/IAR/STR91x/portmacro.h @@ -117,8 +117,6 @@ extern void vTaskSwitchContext( void ); \ } /*-----------------------------------------------------------*/ -/* Compiler specifics */ -#define inline /* Task function macros as described on the FreeRTOS.org WEB site. */ #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) diff --git a/Source/portable/Keil/ARM7/portmacro.h b/Source/portable/Keil/ARM7/portmacro.h index d998c9c23..fb0ac0808 100644 --- a/Source/portable/Keil/ARM7/portmacro.h +++ b/Source/portable/Keil/ARM7/portmacro.h @@ -231,8 +231,6 @@ extern void vPortExitCritical( void ); #define portEXIT_CRITICAL() vPortExitCritical(); /*-----------------------------------------------------------*/ -/* Compiler specifics. */ -#define inline #define register #define portNOP() __asm{ NOP } /*-----------------------------------------------------------*/ diff --git a/Source/portable/MPLAB/PIC18F/portmacro.h b/Source/portable/MPLAB/PIC18F/portmacro.h index 981e3c8d0..95ace9425 100644 --- a/Source/portable/MPLAB/PIC18F/portmacro.h +++ b/Source/portable/MPLAB/PIC18F/portmacro.h @@ -116,8 +116,6 @@ extern void vPortYield( void ); #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) /*-----------------------------------------------------------*/ -/* Compiler specifics. */ -#define inline #define portNOP() _asm \ NOP \ diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h b/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h index f42f3d446..51d677525 100644 --- a/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h +++ b/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h @@ -113,8 +113,6 @@ extern void vPortYield( void ); #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) /*-----------------------------------------------------------*/ -/* Compiler specifics. */ -#define inline #define portNOP() asm volatile ( "NOP" ) diff --git a/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h b/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h index 4d3d2b02f..f7bf81bb7 100644 --- a/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h +++ b/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h @@ -108,7 +108,6 @@ extern "C" { #define portOUTPUT_BYTE( xAddr, ucValue ) outp( xAddr, ucValue ) #define portINPUT_WORD( xAddr ) inpw( xAddr ) #define portOUTPUT_WORD( xAddr, usValue ) outpw( xAddr, usValue ) -#define inline /*-----------------------------------------------------------*/ /* Task function macros as described on the FreeRTOS.org WEB site. */ diff --git a/Source/portable/Paradigm/Tern_EE/small/portmacro.h b/Source/portable/Paradigm/Tern_EE/small/portmacro.h index 487131205..81b1d3037 100644 --- a/Source/portable/Paradigm/Tern_EE/small/portmacro.h +++ b/Source/portable/Paradigm/Tern_EE/small/portmacro.h @@ -110,7 +110,6 @@ typedef void ( __interrupt __far *pxISR )(); #define portOUTPUT_BYTE( xAddr, ucValue ) outp( xAddr, ucValue ) #define portINPUT_WORD( xAddr ) inpw( xAddr ) #define portOUTPUT_WORD( xAddr, usValue ) outpw( xAddr, usValue ) -#define inline /*-----------------------------------------------------------*/ /* Task function macros as described on the FreeRTOS.org WEB site. */ diff --git a/Source/portable/RVDS/ARM_CM3/portmacro.h b/Source/portable/RVDS/ARM_CM3/portmacro.h index d568183c4..065bcc21d 100644 --- a/Source/portable/RVDS/ARM_CM3/portmacro.h +++ b/Source/portable/RVDS/ARM_CM3/portmacro.h @@ -116,7 +116,6 @@ extern void vPortExitCritical( void ); #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) -#define inline #define portNOP() #ifdef __cplusplus diff --git a/Source/portable/Rowley/MSP430F449/Port1/portmacro.h b/Source/portable/Rowley/MSP430F449/Port1/portmacro.h index fad6d48a8..b7064991f 100644 --- a/Source/portable/Rowley/MSP430F449/Port1/portmacro.h +++ b/Source/portable/Rowley/MSP430F449/Port1/portmacro.h @@ -137,8 +137,6 @@ extern void vPortYield( void ); #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) __toplevel -/* Compiler specifics. */ -#define inline /* Just used by the demo application to indicate which form of interrupt service routine should be used. See the online port documentation for more diff --git a/Source/portable/Rowley/MSP430F449/Port2/portmacro.h b/Source/portable/Rowley/MSP430F449/Port2/portmacro.h index c241b1f2a..c48078179 100644 --- a/Source/portable/Rowley/MSP430F449/Port2/portmacro.h +++ b/Source/portable/Rowley/MSP430F449/Port2/portmacro.h @@ -148,7 +148,6 @@ extern void vPortYield( void ); #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) __toplevel /* Compiler specifics. */ -#define inline #define portNOP() diff --git a/Source/portable/Rowley/MSP430F449/portmacro.h b/Source/portable/Rowley/MSP430F449/portmacro.h index 6f2f8af5b..c2a41cf70 100644 --- a/Source/portable/Rowley/MSP430F449/portmacro.h +++ b/Source/portable/Rowley/MSP430F449/portmacro.h @@ -138,8 +138,6 @@ extern void vPortYield( void ); #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters ) __toplevel -/* Compiler specifics. */ -#define inline /* Just used by the demo application to indicate which form of interrupt service routine should be used. See the online port documentation for more diff --git a/Source/portable/SDCC/Cygnal/portmacro.h b/Source/portable/SDCC/Cygnal/portmacro.h index 905042aba..904df7999 100644 --- a/Source/portable/SDCC/Cygnal/portmacro.h +++ b/Source/portable/SDCC/Cygnal/portmacro.h @@ -118,8 +118,6 @@ void vPortYield( void ) _naked; #define portYIELD() vPortYield(); /*-----------------------------------------------------------*/ -/* Compiler specifics. */ -#define inline #define portNOP() _asm \ nop \ _endasm; diff --git a/Source/portable/Softune/MB91460/portmacro.h b/Source/portable/Softune/MB91460/portmacro.h index ed4abcdc3..14b5c67b3 100644 --- a/Source/portable/Softune/MB91460/portmacro.h +++ b/Source/portable/Softune/MB91460/portmacro.h @@ -121,8 +121,6 @@ #define portMINIMAL_STACK_SIZE configMINIMAL_STACK_SIZE -/* Remove the inline statement from within the kernel code. */ -#define inline #endif /* PORTMACRO_H */ diff --git a/Source/portable/Softune/MB96340/portmacro.h b/Source/portable/Softune/MB96340/portmacro.h index 3a5c31f34..ad65aae6c 100644 --- a/Source/portable/Softune/MB96340/portmacro.h +++ b/Source/portable/Softune/MB96340/portmacro.h @@ -131,8 +131,6 @@ FreeRTOSConfig.h to set the configMEMMODEL value. */ #define portMINIMAL_STACK_SIZE configMINIMAL_STACK_SIZE -/* Remove the inline declaration from within the kernel code. */ -#define inline #endif /* PORTMACRO_H */ diff --git a/Source/portable/WizC/PIC18/portmacro.h b/Source/portable/WizC/PIC18/portmacro.h index 1c4e04977..7ea6669be 100644 --- a/Source/portable/WizC/PIC18/portmacro.h +++ b/Source/portable/WizC/PIC18/portmacro.h @@ -432,7 +432,7 @@ extern void vPortYield( void ); #define portTASK_FUNCTION_PROTO portTASK_FUNCTION /*-----------------------------------------------------------*/ -#define inline + #define volatile #define register diff --git a/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h b/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h index ca6f55c3b..dafd182d5 100644 --- a/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h +++ b/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h @@ -113,7 +113,6 @@ void portENABLE_INTERRUPTS( void ); #define portOUTPUT_BYTE( xAddr, ucValue ) outp( xAddr, ucValue ) #define portINPUT_WORD( xAddr ) inpw( xAddr ) #define portOUTPUT_WORD( xAddr, usValue ) outpw( xAddr, usValue ) -#define inline /*-----------------------------------------------------------*/ /* Task function macros as described on the FreeRTOS.org WEB site. */ diff --git a/Source/portable/oWatcom/16BitDOS/PC/portmacro.h b/Source/portable/oWatcom/16BitDOS/PC/portmacro.h index b9fdf4f6c..2614254d1 100644 --- a/Source/portable/oWatcom/16BitDOS/PC/portmacro.h +++ b/Source/portable/oWatcom/16BitDOS/PC/portmacro.h @@ -109,7 +109,6 @@ void portENABLE_INTERRUPTS( void ); /* Compiler specifics. */ #define portINPUT_BYTE( xAddr ) inp( xAddr ) #define portOUTPUT_BYTE( xAddr, ucValue ) outp( xAddr, ucValue ) -#define inline #define portNOP() __asm{ nop } /*-----------------------------------------------------------*/