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

STM32F7: Fix for coding standard violations that came in with cd3ca1140e

Browse Source
This commit is contained in:
Gregory Nutt 2017-07-31 18:35:37 -06:00
parent 959f2042a4
commit 5f4fdb42be
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/src/stm32f7/stm32_ltdc.c
View File

@ -111,6 +111,7 @@
#define STM32_LTDC_AWCR_AAW LTDC_AWCR_AAW(STM32_LTDC_LxWHPCR_WHSPPOS)
/* LTDC_TWCR register */
#define STM32_LTDC_TOTALHEIGHT (BOARD_LTDC_VSYNC + \
BOARD_LTDC_VBP + \
STM32_LTDC_HEIGHT + BOARD_LTDC_VFP - 1)
@ -120,12 +121,14 @@
STM32_LTDC_WIDTH + BOARD_LTDC_HFP - 1)
/* Global GCR register: Synchronisation Polarity */
#define STM32_LTDC_GCR_PCPOL BOARD_LTDC_GCR_PCPOL
#define STM32_LTDC_GCR_DEPOL BOARD_LTDC_GCR_DEPOL
#define STM32_LTDC_GCR_VSPOL BOARD_LTDC_GCR_VSPOL
#define STM32_LTDC_GCR_HSPOL BOARD_LTDC_GCR_HSPOL
/* LIPCR register */
#define STM32_LTDC_LIPCR_LIPOS LTDC_LIPCR_LIPOS(STM32_LTDC_TOTALHEIGHT)
/* Configuration ************************************************************/
@ -957,19 +960,24 @@ static void stm32_ltdc_periphconfig(void)
#if defined(CONFIG_STM32F7_LTDC_USE_DSI)
/* work in progress; maybe move to lcdinfo when everything is OK. */
lcdwarn("LTDC: Expecting preconfigured DSI; not configuring pins for LCD interface\n");
#else
/* Configure GPIO's */
stm32_ltdc_gpioconfig();
#endif
/* APB2 LTDC clock is expected to be externally preconfigured */
reginfo("configured RCC_APB2ENR=%08x\n", getreg32(STM32_RCC_APB2ENR));
/* SAI PLL is expected to be externally preconfigured to provide the LCD_CLK */
reginfo("configured RCC_PLLSAI=%08x\n", getreg32(STM32_RCC_PLLSAICFGR));
/* Dedicated clocks are expected to be externally preconfigured */
reginfo("configured RCC_DCKCFGR1=%08x\n", getreg32(STM32_RCC_DCKCFGR1));
reginfo("configured RCC_DCKCFGR2=%08x\n", getreg32(STM32_RCC_DCKCFGR2));
@ -1002,10 +1010,11 @@ static void stm32_ltdc_periphconfig(void)
reginfo("configured LTDC_TWCR=%08x\n", getreg32(STM32_LTDC_TWCR));
/* Configure signal polarities */
regval = getreg32(STM32_LTDC_GCR);
regval &= ~(LTDC_GCR_PCPOL | LTDC_GCR_DEPOL | LTDC_GCR_VSPOL | LTDC_GCR_HSPOL);
regval |= (STM32_LTDC_GCR_PCPOL | STM32_LTDC_GCR_DEPOL
| STM32_LTDC_GCR_VSPOL | STM32_LTDC_GCR_HSPOL);
regval |= (STM32_LTDC_GCR_PCPOL | STM32_LTDC_GCR_DEPOL |
STM32_LTDC_GCR_VSPOL | STM32_LTDC_GCR_HSPOL);
reginfo("set LTDC_GCR=%08x\n", regval);
putreg32(regval, STM32_LTDC_GCR);
reginfo("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
@ -3428,16 +3437,15 @@ FAR struct ltdc_layer_s *stm32_ltdcgetlayer(int lid)
}
#endif /* CONFIG_STM32F7_LTDC_INTERFACE */
/****************************************************************************
* Name: stm32_ltdcreset
*
* Description:
* Reset LTDC via APB2RSTR
*
*
****************************************************************************/
void stm32_ltdcreset(void)
void stm32_ltdcreset(void)
{
*((uint32_t *)(STM32_RCC_APB2RSTR)) |= RCC_APB2RSTR_LTDCRST;
*((uint32_t *)(STM32_RCC_APB2RSTR)) &= ~RCC_APB2RSTR_LTDCRST;

24
arch/arm/src/stm32f7/stm32_ltdc.h
View File

@ -53,10 +53,6 @@
#ifdef CONFIG_STM32F7_LTDC
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/************************************************************************************
* Public Types
************************************************************************************/
@ -92,7 +88,7 @@ struct stm32_ltdc_s
/* Operation */
sem_t *lock; /* Ensure mutually exclusive access */
sem_t *lock; /* Ensure mutually exclusive access */
};
/************************************************************************************
@ -102,21 +98,22 @@ struct stm32_ltdc_s
/************************************************************************************
* Public Functions
************************************************************************************/
/* The STM32 LTDC driver uses the common framebuffer interfaces declared in
* include/nuttx/video/fb.h.
*/
/****************************************************************************
/************************************************************************************
* Name: stm32_ltdcreset
*
* Description:
* Reset LTDC via APB2RSTR
*
*
****************************************************************************/
void stm32_ltdcreset(void);
************************************************************************************/
/****************************************************************************
void stm32_ltdcreset(void);
/************************************************************************************
* Name: stm32_ltdcinitialize
*
* Description:
@ -125,10 +122,11 @@ void stm32_ltdcreset(void);
* Return:
* OK
*
****************************************************************************/
int stm32_ltdcinitialize(void);
************************************************************************************/
int stm32_ltdcinitialize(void);
FAR struct fb_vtable_s *stm32_ltdcgetvplane(int vplane);
void stm32_ltdcuninitialize(void);
void stm32_ltdcuninitialize(void);
/************************************************************************************
* Name: stm32_ltdcgetlayer

2
arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/stm32f7/stm32f76xxx77xx_rcc.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
* David Sidrane <david_s5@nscdg.com>
*