From: richardbarry Date: Sat, 26 Mar 2011 12:19:18 +0000 (+0000) Subject: Change the priorities used by the RX/RDK/IAR demo application to ensure they can... X-Git-Tag: V7.0.0~22 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c1f76a9feb29752ac4879f2f440f40cd70515371;p=freertos Change the priorities used by the RX/RDK/IAR demo application to ensure they can be used when configASSERT() is defined. Previously the priorities meant assert would have been called because one of the priorities used was above ( configMAX_PRIORITIES - 1 ). git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1327 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h b/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h index eeb409d50..65f35d487 100644 --- a/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h +++ b/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h @@ -94,12 +94,12 @@ #define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) -/* +/* The interrupt priority used by the kernel itself for the tick interrupt and -the pended interrupt is set by configKERNEL_INTERRUPT_PRIORITY. This would -normally be the lowest priority (1 in this case). The maximum interrupt +the pended interrupt is set by configKERNEL_INTERRUPT_PRIORITY. This would +normally be the lowest priority (1 in this case). The maximum interrupt priority from which FreeRTOS API calls can be made is set by -configMAX_SYSCALL_INTERRUPT_PRIORITY. Interrupts that use a priority above this +configMAX_SYSCALL_INTERRUPT_PRIORITY. Interrupts that use a priority above this will not be effected by anything the kernel is doing. Interrupts at or below this priority can use FreeRTOS API functions - but *only* those that end in "FromISR". Both these constants are defined in 'PriorityDefinitions.h' so they @@ -126,15 +126,18 @@ to exclude the API function. */ #define INCLUDE_uxTaskGetStackHighWaterMark 1 #define INCLUDE_xTaskGetSchedulerState 1 +#define configASSERT( x ) if( ( x ) == pdFALSE ) { taskDISABLE_INTERRUPTS(); for( ;; ); } + extern volatile unsigned long ulHighFrequencyTickCount; #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() portNOP() /* Run time stats use the same timer as the high frequency timer test. */ #define portGET_RUN_TIME_COUNTER_VALUE() ulHighFrequencyTickCount /* Override some of the priorities set in the common demo tasks. This is -required to ensure flase positive timing errors are not reported. */ -#define bktPRIMARY_PRIORITY ( configMAX_PRIORITIES - 2 ) -#define bktSECONDARY_PRIORITY ( configMAX_PRIORITIES - 3 ) +required to ensure false positive timing errors are not reported. */ +#define bktPRIMARY_PRIORITY ( configMAX_PRIORITIES - 3 ) +#define bktSECONDARY_PRIORITY ( configMAX_PRIORITIES - 4 ) +#define intqHIGHER_PRIORITY ( configMAX_PRIORITIES - 3 ) /*-----------------------------------------------------------