github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(pxp): update RTOS macro for SDK 2.10

Browse Source 
replace FSL_RTOS_FREE_RTOS by SDK_OS_FREE_RTOS in order to be aligned
with MCU SDK 2.10.
See MCUX-41577.

Signed-off-by: Seb Fagard <sebastien.fagard@nxp.com>
This commit is contained in:
Seb Fagard
2021-03-16 16:42:01 +01:00
committed by Gabor Kiss-Vamosi
parent e74e6c27af
commit bff9546c26
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Kconfig
View File

@@ -166,7 +166,7 @@ menu "LVGL configuration"
1: Add default bare metal and FreeRTOS interrupt handling 1: Add default bare metal and FreeRTOS interrupt handling
routines for PXP (lv_gpu_nxp_pxp_osa.c) and call routines for PXP (lv_gpu_nxp_pxp_osa.c) and call
lv_gpu_nxp_pxp_init() automatically during lv_init(). lv_gpu_nxp_pxp_init() automatically during lv_init().
Note that symbol FSL_RTOS_FREE_RTOS has to be defined in order Note that symbol SDK_OS_FREE_RTOS has to be defined in order
to use FreeRTOS OSA, otherwise bare-metal implementation is to use FreeRTOS OSA, otherwise bare-metal implementation is
selected. selected.
0: lv_gpu_nxp_pxp_init() has to be called manually before 0: lv_gpu_nxp_pxp_init() has to be called manually before

2
lv_conf_template.h
View File

@@ -122,7 +122,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
#define LV_USE_GPU_NXP_PXP 0 #define LV_USE_GPU_NXP_PXP 0
#if LV_USE_GPU_NXP_PXP #if LV_USE_GPU_NXP_PXP
/*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c) /*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c)
* and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol FSL_RTOS_FREE_RTOS * and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS
* has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected. * has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected.
*0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init() *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init()
*/ */

16
src/gpu/lv_gpu_nxp_pxp_osa.c
View File

@@ -39,7 +39,7 @@
#include "lv_gpu_nxp_pxp.h" #include "lv_gpu_nxp_pxp.h"
#include "fsl_pxp.h" #include "fsl_pxp.h"
#if defined(FSL_RTOS_FREE_RTOS) #if defined(SDK_OS_FREE_RTOS)
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "semphr.h" #include "semphr.h"
#endif #endif
@@ -63,7 +63,7 @@ static void _lv_gpu_nxp_pxp_run(void);
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
#if defined(FSL_RTOS_FREE_RTOS) #if defined(SDK_OS_FREE_RTOS)
static SemaphoreHandle_t s_pxpIdle; static SemaphoreHandle_t s_pxpIdle;
#else #else
static volatile bool s_pxpIdle; static volatile bool s_pxpIdle;
@@ -82,13 +82,13 @@ static void _lv_gpu_nxp_pxp_run(void);
*/ */
void PXP_IRQHandler(void) void PXP_IRQHandler(void)
{ {
#if defined(FSL_RTOS_FREE_RTOS) #if defined(SDK_OS_FREE_RTOS)
BaseType_t taskAwake = pdFALSE; BaseType_t taskAwake = pdFALSE;
#endif #endif
if(kPXP_CompleteFlag & PXP_GetStatusFlags(LV_GPU_NXP_PXP_ID)) { if(kPXP_CompleteFlag & PXP_GetStatusFlags(LV_GPU_NXP_PXP_ID)) {
PXP_ClearStatusFlags(LV_GPU_NXP_PXP_ID, kPXP_CompleteFlag); PXP_ClearStatusFlags(LV_GPU_NXP_PXP_ID, kPXP_CompleteFlag);
#if defined(FSL_RTOS_FREE_RTOS) #if defined(SDK_OS_FREE_RTOS)
xSemaphoreGiveFromISR(s_pxpIdle, &taskAwake); xSemaphoreGiveFromISR(s_pxpIdle, &taskAwake);
portYIELD_FROM_ISR(taskAwake); portYIELD_FROM_ISR(taskAwake);
#else #else
@@ -107,7 +107,7 @@ void PXP_IRQHandler(void)
*/ */
static lv_res_t _lv_gpu_nxp_pxp_interrupt_init(void) static lv_res_t _lv_gpu_nxp_pxp_interrupt_init(void)
{ {
#if defined(FSL_RTOS_FREE_RTOS) #if defined(SDK_OS_FREE_RTOS)
s_pxpIdle = xSemaphoreCreateBinary(); s_pxpIdle = xSemaphoreCreateBinary();
if(s_pxpIdle == NULL) { if(s_pxpIdle == NULL) {
return LV_RES_INV; return LV_RES_INV;
@@ -129,7 +129,7 @@ static lv_res_t _lv_gpu_nxp_pxp_interrupt_init(void)
static void _lv_gpu_nxp_pxp_interrupt_deinit(void) static void _lv_gpu_nxp_pxp_interrupt_deinit(void)
{ {
NVIC_DisableIRQ(LV_GPU_NXP_PXP_IRQ_ID); NVIC_DisableIRQ(LV_GPU_NXP_PXP_IRQ_ID);
#if defined(FSL_RTOS_FREE_RTOS) #if defined(SDK_OS_FREE_RTOS)
vSemaphoreDelete(s_pxpIdle); vSemaphoreDelete(s_pxpIdle);
#endif #endif
} }
@@ -139,14 +139,14 @@ static void _lv_gpu_nxp_pxp_interrupt_deinit(void)
*/ */
static void _lv_gpu_nxp_pxp_run(void) static void _lv_gpu_nxp_pxp_run(void)
{ {
#if !defined(FSL_RTOS_FREE_RTOS) #if !defined(SDK_OS_FREE_RTOS)
s_pxpIdle = false; s_pxpIdle = false;
#endif #endif
PXP_EnableInterrupts(LV_GPU_NXP_PXP_ID, kPXP_CompleteInterruptEnable); PXP_EnableInterrupts(LV_GPU_NXP_PXP_ID, kPXP_CompleteInterruptEnable);
PXP_Start(LV_GPU_NXP_PXP_ID); PXP_Start(LV_GPU_NXP_PXP_ID);
#if defined(FSL_RTOS_FREE_RTOS) #if defined(SDK_OS_FREE_RTOS)
if(xSemaphoreTake(s_pxpIdle, portMAX_DELAY) != pdTRUE) { if(xSemaphoreTake(s_pxpIdle, portMAX_DELAY) != pdTRUE) {
LV_LOG_ERROR("xSemaphoreTake error. Task halted."); LV_LOG_ERROR("xSemaphoreTake error. Task halted.");
for(; ;) ; for(; ;) ;

2
src/lv_conf_internal.h
View File

@@ -307,7 +307,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
#endif #endif
#if LV_USE_GPU_NXP_PXP #if LV_USE_GPU_NXP_PXP
/*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c) /*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c)
* and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol FSL_RTOS_FREE_RTOS * and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS
* has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected. * has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected.
*0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init() *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init()
*/ */