diff options
| author | hathach <[email protected]> | 2014-03-14 16:31:33 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-14 16:31:33 +0700 |
| commit | 2cac860e1a5ec0687908ec1d83544d433e6d1684 (patch) | |
| tree | 8f35d6e91214c693889ab536ea02dff3ce345d0a | |
| parent | 4f1ae1cd1d651fdd7fd3e02081b05a7528e96ba7 (diff) | |
fix some warnings
| -rw-r--r-- | demos/host/host_freertos/host_freertos.ewp | 2 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvopt | 14 | ||||
| -rw-r--r-- | demos/host/src/main.c | 2 | ||||
| -rw-r--r-- | vendor/freertos/FreeRTOSConfig_cm4f.h | 2 | ||||
| -rw-r--r-- | vendor/freertos/freertos/Source/include/mpu_wrappers.h | 18 | ||||
| -rw-r--r-- | vendor/freertos/freertos/Source/include/task.h | 26 | ||||
| -rw-r--r-- | vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/portmacro.h | 26 |
7 files changed, 45 insertions, 45 deletions
diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp index f451f16fe..a2c0fc674 100644 --- a/demos/host/host_freertos/host_freertos.ewp +++ b/demos/host/host_freertos/host_freertos.ewp @@ -220,7 +220,7 @@ </option>
<option>
<name>CCDiagError</name>
- <state></state>
+ <state>Pa050</state>
</option>
<option>
<name>CCObjPrefix</name>
diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt index 34e32cd88..f3298174a 100644 --- a/demos/host/host_freertos/host_freertos.uvopt +++ b/demos/host/host_freertos/host_freertos.uvopt @@ -370,7 +370,7 @@ <OPTFL> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> - <IsCurrentTarget>0</IsCurrentTarget> + <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> <CpuCode>8</CpuCode> <Books> @@ -555,7 +555,7 @@ <OPTFL> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> - <IsCurrentTarget>1</IsCurrentTarget> + <IsCurrentTarget>0</IsCurrentTarget> </OPTFL> <CpuCode>8</CpuCode> <Books> @@ -704,10 +704,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>9</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>7</TopLine> - <CurrentLine>11</CurrentLine> + <TopLine>1</TopLine> + <CurrentLine>1</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> <FilenameWithoutPath>main.c</FilenameWithoutPath> @@ -1050,7 +1050,7 @@ <Focus>0</Focus> <ColumnNumber>31</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>219</TopLine> + <TopLine>220</TopLine> <CurrentLine>229</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\class\hid_host.c</PathWithFileName> @@ -1170,7 +1170,7 @@ <Focus>0</Focus> <ColumnNumber>5</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>43</TopLine> + <TopLine>44</TopLine> <CurrentLine>54</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName> diff --git a/demos/host/src/main.c b/demos/host/src/main.c index 8fd7f7fbb..492fcad9f 100644 --- a/demos/host/src/main.c +++ b/demos/host/src/main.c @@ -121,7 +121,7 @@ int main(void) tusb_init();
//------------- application task init -------------//
- (void) osal_task_create( OSAL_TASK_REF(led_blinking_task) );
+ if( osal_task_create( OSAL_TASK_REF(led_blinking_task) ) != TUSB_ERROR_NONE ) while(1){}
keyboard_app_init();
mouse_app_init();
diff --git a/vendor/freertos/FreeRTOSConfig_cm4f.h b/vendor/freertos/FreeRTOSConfig_cm4f.h index 4718dd7c6..8a79104db 100644 --- a/vendor/freertos/FreeRTOSConfig_cm4f.h +++ b/vendor/freertos/FreeRTOSConfig_cm4f.h @@ -145,7 +145,7 @@ to all Cortex-M ports, and do not rely on any particular library functions. */ /* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!! See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ #define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) ) - + /* Normal assert() semantics without relying on the provision of an assert.h header file. */ #define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); hal_debugger_breakpoint(); } diff --git a/vendor/freertos/freertos/Source/include/mpu_wrappers.h b/vendor/freertos/freertos/Source/include/mpu_wrappers.h index 6d3623e23..5ea46d95c 100644 --- a/vendor/freertos/freertos/Source/include/mpu_wrappers.h +++ b/vendor/freertos/freertos/Source/include/mpu_wrappers.h @@ -1,7 +1,7 @@ /* FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd. - FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT + FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. *************************************************************************** @@ -42,7 +42,7 @@ FreeRTOS WEB site. 1 tab == 4 spaces! - + *************************************************************************** * * * Having a problem? Start by reading the FAQ "My application does * @@ -52,17 +52,17 @@ * * *************************************************************************** - - http://www.FreeRTOS.org - Documentation, training, latest versions, license - and contact details. - + + http://www.FreeRTOS.org - Documentation, training, latest versions, license + and contact details. + http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, including FreeRTOS+Trace - an indispensable productivity tool. - Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell - the code with commercial support, indemnification, and middleware, under + Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell + the code with commercial support, indemnification, and middleware, under the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also - provide a safety engineered and independently SIL3 certified version under + provide a safety engineered and independently SIL3 certified version under the SafeRTOS brand: http://www.SafeRTOS.com. */ diff --git a/vendor/freertos/freertos/Source/include/task.h b/vendor/freertos/freertos/Source/include/task.h index 637a8ca82..ac55813b6 100644 --- a/vendor/freertos/freertos/Source/include/task.h +++ b/vendor/freertos/freertos/Source/include/task.h @@ -41,7 +41,7 @@ 1 tab == 4 spaces! - + *************************************************************************** * * * Having a problem? Start by reading the FAQ "My application does * @@ -51,17 +51,17 @@ * * *************************************************************************** - - http://www.FreeRTOS.org - Documentation, training, latest information, + + http://www.FreeRTOS.org - Documentation, training, latest information, license and contact details. - + http://www.FreeRTOS.org/plus - Selection of FreeRTOS ecosystem products, including FreeRTOS+Trace - an indispensable productivity tool. - Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell - the code with commercial support, indemnification, and middleware, under + Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell + the code with commercial support, indemnification, and middleware, under the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also - provide a safety engineered and independently SIL3 certified version under + provide a safety engineered and independently SIL3 certified version under the SafeRTOS brand: http://www.SafeRTOS.com. */ @@ -332,7 +332,7 @@ static const xTaskParameters xCheckTaskParameters = // the task, with appropriate access permissions. Different processors have // different memory alignment requirements - refer to the FreeRTOS documentation // for full information. - { + { // Base address Length Parameters { cReadWriteArray, 32, portMPU_REGION_READ_WRITE }, { cReadOnlyArray, 32, portMPU_REGION_READ_ONLY }, @@ -383,7 +383,7 @@ xTaskHandle xHandle; // ucOneKByte array. The other two of the maximum 3 definable regions are // unused so set to zero. static const xMemoryRegion xAltRegions[ portNUM_CONFIGURABLE_REGIONS ] = -{ +{ // Base address Length Parameters { ucOneKByte, 1024, portMPU_REGION_READ_WRITE }, { 0, 0, 0 }, @@ -399,7 +399,7 @@ void vATask( void *pvParameters ) // for this purpose. NULL is used as the task handle to indicate that this // function should modify the MPU regions of the calling task. vTaskAllocateMPURegions( NULL, xAltRegions ); - + // Now the task can continue its function, but from this point on can only // access its stack and the ucOneKByte array (unless any other statically // defined or shared regions have been declared elsewhere). @@ -618,7 +618,7 @@ unsigned portBASE_TYPE uxTaskPriorityGet( xTaskHandle pxTask ) PRIVILEGED_FUNCTI * INCLUDE_eTaskStateGet must be defined as 1 for this function to be available. * See the configuration section for more information. * - * Obtain the state of any task. States are encoded by the eTaskState + * Obtain the state of any task. States are encoded by the eTaskState * enumerated type. * * @param pxTask Handle of the task to be queried. @@ -1174,7 +1174,7 @@ constant. */ portBASE_TYPE xTaskCallApplicationTaskHook( xTaskHandle xTask, void *pvParameter ) PRIVILEGED_FUNCTION; /** - * xTaskGetIdleTaskHandle() is only available if + * xTaskGetIdleTaskHandle() is only available if * INCLUDE_xTaskGetIdleTaskHandle is set to 1 in FreeRTOSConfig.h. * * Simply returns the handle of the idle task. It is not valid to call @@ -1314,7 +1314,7 @@ signed portBASE_TYPE xTaskGenericCreate( pdTASK_CODE pxTaskCode, const signed ch */ unsigned portBASE_TYPE uxTaskGetTaskNumber( xTaskHandle xTask ); -/* +/* * Set the uxTCBNumber of the task referenced by the xTask parameter to * ucHandle. */ diff --git a/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/portmacro.h b/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/portmacro.h index 76f8c1773..0d243d4d4 100644 --- a/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/portmacro.h +++ b/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/portmacro.h @@ -1,7 +1,7 @@ /* FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd. - FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT + FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. *************************************************************************** @@ -42,7 +42,7 @@ FreeRTOS WEB site. 1 tab == 4 spaces! - + *************************************************************************** * * * Having a problem? Start by reading the FAQ "My application does * @@ -52,17 +52,17 @@ * * *************************************************************************** - - http://www.FreeRTOS.org - Documentation, training, latest versions, license - and contact details. - + + http://www.FreeRTOS.org - Documentation, training, latest versions, license + and contact details. + http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, including FreeRTOS+Trace - an indispensable productivity tool. - Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell - the code with commercial support, indemnification, and middleware, under + Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell + the code with commercial support, indemnification, and middleware, under the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also - provide a safety engineered and independently SIL3 certified version under + provide a safety engineered and independently SIL3 certified version under the SafeRTOS brand: http://www.SafeRTOS.com. */ @@ -100,13 +100,13 @@ extern "C" { typedef unsigned portLONG portTickType; #define portMAX_DELAY ( portTickType ) 0xffffffff #endif -/*-----------------------------------------------------------*/ +/*-----------------------------------------------------------*/ /* Architecture specifics. */ #define portSTACK_GROWTH ( -1 ) -#define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ ) +#define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ ) #define portBYTE_ALIGNMENT 8 -/*-----------------------------------------------------------*/ +/*-----------------------------------------------------------*/ /* Scheduler utilities. */ extern void vPortYieldFromISR( void ); @@ -148,7 +148,7 @@ extern void vPortClearInterruptMask( unsigned long ulNewMask ); #define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) vPortClearInterruptMask( x ) /*-----------------------------------------------------------*/ -/* There are an uneven number of items on the initial stack, so +/* There are an uneven number of items on the initial stack, so portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */ #define portALIGNMENT_ASSERT_pxCurrentTCB ( void ) /*-----------------------------------------------------------*/ |
