sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stm32: fix faulty access to non existing layer. This disables operation that requires double layer support, when configured for single layer only.

Browse Source 
Signed-off-by: Marco Krahl <ocram.lhark@gmail.com>
This commit is contained in:
Gregory Nutt 2014-12-29 09:45:30 -06:00
parent 23ac4caf5a
commit 171c017a0c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/stm32/stm32_ltdc.c
View File

@ -2906,8 +2906,10 @@ static int stm32_getarea(FAR struct ltdc_layer_s *layer,
static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode) static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode)
{ {
FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
#ifdef CONFIG_STM32_LTDC_L2
FAR struct stm32_layer_s *active = &LAYER(g_lactive); FAR struct stm32_layer_s *active = &LAYER(g_lactive);
FAR struct stm32_layer_s *inactive = &LAYER(!g_lactive); FAR struct stm32_layer_s *inactive = &LAYER(!g_lactive);
#endif
gvdbg("layer = %p, mode = %08x\n", layer, mode); gvdbg("layer = %p, mode = %08x\n", layer, mode);
@ -2932,6 +2934,11 @@ static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode)
stm32_ltdc_lupdate(priv); stm32_ltdc_lupdate(priv);
#ifdef CONFIG_STM32_LTDC_L2
/* The following operation only useful if layer 2 is supported.
* Otherwise ignore it.
*/
if (mode & LTDC_UPDATE_SIM) if (mode & LTDC_UPDATE_SIM)
{ {
/* Also update the flip layer */ /* Also update the flip layer */
@ -2989,6 +2996,7 @@ static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode)
g_lactive = inactive->state.lid; g_lactive = inactive->state.lid;
} }
#endif
/* Make the changes visible */ /* Make the changes visible */