Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch/arm/src/stm32/stm32_dma2d.c: Appease nxstyle

Browse Source 
The following errors are intentionally left.
(Hardware constants like DMA2D_xGPFCCR_CCM.)

arch/arm/src/stm32/stm32_dma2d.c:484:12: error: Mixed case identifier found
arch/arm/src/stm32/stm32_dma2d.c:692:13: error: Mixed case identifier found
arch/arm/src/stm32/stm32_dma2d.c:701:18: error: Mixed case identifier found
arch/arm/src/stm32/stm32_dma2d.c:706:18: error: Mixed case identifier found
arch/arm/src/stm32/stm32_dma2d.c:711:18: error: Mixed case identifier found
arch/arm/src/stm32/stm32_dma2d.c:725:14: error: Mixed case identifier found
arch/arm/src/stm32/stm32_dma2d.c:732:18: error: Mixed case identifier found
This commit is contained in:
YAMAMOTO Takashi
2020-11-24 08:46:05 +09:00
committed by Xiang Xiao
parent 4f6c99541b
commit d289fd92af
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/stm32_dma2d.c
+38 -29
View File
@@ -206,11 +206,14 @@ static int stm32_dma2d_start(void);
#ifdef CONFIG_STM32_FB_CMAP #ifdef CONFIG_STM32_FB_CMAP
static int stm32_dma2d_loadclut(uintptr_t reg); static int stm32_dma2d_loadclut(uintptr_t reg);
#endif #endif
static uint32_t stm32_dma2d_memaddress(FAR struct stm32_dma2d_overlay_s *oinfo, static uint32_t stm32_dma2d_memaddress(
uint32_t xpos, uint32_t ypos); FAR struct stm32_dma2d_overlay_s *oinfo,
static uint32_t stm32_dma2d_lineoffset(FAR struct stm32_dma2d_overlay_s *oinfo, uint32_t xpos, uint32_t ypos);
FAR const struct fb_area_s *area); static uint32_t stm32_dma2d_lineoffset(
static void stm32_dma2d_lfifo(FAR struct stm32_dma2d_overlay_s *oinfo, int lid, FAR struct stm32_dma2d_overlay_s *oinfo,
FAR const struct fb_area_s *area);
static void stm32_dma2d_lfifo(FAR struct stm32_dma2d_overlay_s *oinfo,
int lid,
uint32_t xpos, uint32_t ypos, uint32_t xpos, uint32_t ypos,
FAR const struct fb_area_s *area); FAR const struct fb_area_s *area);
static void stm32_dma2d_lcolor(int lid, uint32_t argb); static void stm32_dma2d_lcolor(int lid, uint32_t argb);
@@ -255,7 +258,7 @@ static uint32_t g_clut[STM32_DMA2D_NCLUT *
# else # else
3 3
# endif # endif
/ 4 ]; / 4];
#endif /* CONFIG_STM32_FB_CMAP */ #endif /* CONFIG_STM32_FB_CMAP */
/* The DMA2D semaphore that enforces mutually exclusive access */ /* The DMA2D semaphore that enforces mutually exclusive access */
@@ -535,8 +538,9 @@ static int stm32_dma2d_start(void)
* *
****************************************************************************/ ****************************************************************************/
static uint32_t stm32_dma2d_memaddress(FAR struct stm32_dma2d_overlay_s *oinfo, static uint32_t stm32_dma2d_memaddress(
uint32_t xpos, uint32_t ypos) FAR struct stm32_dma2d_overlay_s *oinfo,
uint32_t xpos, uint32_t ypos)
{ {
uint32_t offset; uint32_t offset;
FAR struct fb_overlayinfo_s *poverlay = oinfo->oinfo; FAR struct fb_overlayinfo_s *poverlay = oinfo->oinfo;
@@ -561,8 +565,9 @@ static uint32_t stm32_dma2d_memaddress(FAR struct stm32_dma2d_overlay_s *oinfo,
* *
****************************************************************************/ ****************************************************************************/
static uint32_t stm32_dma2d_lineoffset(FAR struct stm32_dma2d_overlay_s *oinfo, static uint32_t stm32_dma2d_lineoffset(
FAR const struct fb_area_s *area) FAR struct stm32_dma2d_overlay_s *oinfo,
FAR const struct fb_area_s *area)
{ {
uint32_t loffset; uint32_t loffset;
@@ -594,7 +599,8 @@ static void stm32_dma2d_lfifo(FAR struct stm32_dma2d_overlay_s *oinfo,
lcdinfo("oinfo=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n", lcdinfo("oinfo=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n",
oinfo, lid, xpos, ypos, area); oinfo, lid, xpos, ypos, area);
putreg32(stm32_dma2d_memaddress(oinfo, xpos, ypos), stm32_mar_layer_t[lid]); putreg32(stm32_dma2d_memaddress(oinfo, xpos, ypos),
stm32_mar_layer_t[lid]);
putreg32(stm32_dma2d_lineoffset(oinfo, area), stm32_or_layer_t[lid]); putreg32(stm32_dma2d_lineoffset(oinfo, area), stm32_or_layer_t[lid]);
} }
@@ -678,8 +684,8 @@ static void stm32_dma2d_lpfc(int lid, uint32_t blendmode, uint8_t alpha,
{ {
uint32_t pfccrreg; uint32_t pfccrreg;
lcdinfo("lid=%d, blendmode=%08x, alpha=%02x, fmt=%d\n", lid, blendmode, alpha, lcdinfo("lid=%d, blendmode=%08x, alpha=%02x, fmt=%d\n",
fmt); lid, blendmode, alpha, fmt);
/* Set color format */ /* Set color format */
@@ -724,7 +730,6 @@ static void stm32_dma2d_lpfc(int lid, uint32_t blendmode, uint8_t alpha,
/* Set alpha value */ /* Set alpha value */
pfccrreg |= DMA2D_xGPFCCR_ALPHA(alpha); pfccrreg |= DMA2D_xGPFCCR_ALPHA(alpha);
} }
putreg32(pfccrreg, stm32_pfccr_layer_t[lid]); putreg32(pfccrreg, stm32_pfccr_layer_t[lid]);
@@ -807,12 +812,13 @@ static int stm32_dma2d_setclut(FAR const struct fb_cmap_s *cmap)
* Input Parameters: * Input Parameters:
* oinfo - Overlay to fill * oinfo - Overlay to fill
* area - Reference to the valid area structure select the area * area - Reference to the valid area structure select the area
* argb - Color to fill the selected area. Color must be argb8888 formatted. * argb - Color to fill the selected area. Color must be argb8888
* formatted.
* *
* Returned Value: * Returned Value:
* OK - On success * OK - On success
* -EINVAL - If one of the parameter invalid or if the size of the selected * -EINVAL - If one of the parameter invalid or if the size of the
* area outside the visible area of the layer. * selected area outside the visible area of the layer.
* -ECANCELED - Operation cancelled, something goes wrong. * -ECANCELED - Operation cancelled, something goes wrong.
* *
****************************************************************************/ ****************************************************************************/
@@ -890,8 +896,9 @@ static int stm32_dma2d_fillcolor(FAR struct stm32_dma2d_overlay_s *oinfo,
* *
* Returned Value: * Returned Value:
* OK - On success * OK - On success
* -EINVAL - If one of the parameter invalid or if the size of the selected * -EINVAL - If one of the parameter invalid or if the size of the
* source area outside the visible area of the destination layer. * selected source area outside the visible area of the
* destination layer.
* (The visible area usually represents the display size) * (The visible area usually represents the display size)
* -ECANCELED - Operation cancelled, something goes wrong. * -ECANCELED - Operation cancelled, something goes wrong.
* *
@@ -969,9 +976,9 @@ static int stm32_dma2d_blit(FAR struct stm32_dma2d_overlay_s *doverlay,
* Description: * Description:
* Blends the selected area from a background layer with selected position * Blends the selected area from a background layer with selected position
* of the foreground layer. Copies the result to the selected position of * of the foreground layer. Copies the result to the selected position of
* the destination layer. Note! The content of the foreground and background * the destination layer. Note! The content of the foreground and
* layer keeps unchanged as long destination layer is unequal to the * background layer keeps unchanged as long destination layer is unequal to
* foreground and background layer. * the foreground and background layer.
* *
* Input Parameters: * Input Parameters:
* doverlay - Destination overlay * doverlay - Destination overlay
@@ -981,13 +988,14 @@ static int stm32_dma2d_blit(FAR struct stm32_dma2d_overlay_s *doverlay,
* forexpos - x-Offset foreground overlay * forexpos - x-Offset foreground overlay
* foreypos - y-Offset foreground overlay * foreypos - y-Offset foreground overlay
* boverlay - Background overlay * boverlay - Background overlay
* barea - x-Offset, y-Offset, x-resolution and y-resolution of background * barea - x-Offset, y-Offset, x-resolution and y-resolution of
* overlay * background overlay
* *
* Returned Value: * Returned Value:
* OK - On success * OK - On success
* -EINVAL - If one of the parameter invalid or if the size of the selected * -EINVAL - If one of the parameter invalid or if the size of the
* source area outside the visible area of the destination layer. * selected source area outside the visible area of the
* destination layer.
* (The visible area usually represents the display size) * (The visible area usually represents the display size)
* -ECANCELED - Operation cancelled, something goes wrong. * -ECANCELED - Operation cancelled, something goes wrong.
* *
@@ -1098,8 +1106,8 @@ int stm32_dma2dinitialize(void)
* arch/arm/src/stm32/stm32f40xxx_rcc.c * arch/arm/src/stm32/stm32f40xxx_rcc.c
*/ */
/* Initialize the DMA2D semaphore that enforces mutually exclusive access /* Initialize the DMA2D semaphore that enforces mutually exclusive
* to the driver * access to the driver
*/ */
nxsem_init(&g_lock, 0, 1); nxsem_init(&g_lock, 0, 1);
@@ -1125,7 +1133,8 @@ int stm32_dma2dinitialize(void)
#endif #endif
stm32_dma2d_control(DMA2D_CR_TCIE | DMA2D_CR_CTCIE | DMA2D_CR_TEIE | stm32_dma2d_control(DMA2D_CR_TCIE | DMA2D_CR_CTCIE | DMA2D_CR_TEIE |
DMA2D_CR_CAEIE | DMA2D_CR_CTCIE | DMA2D_CR_CEIE, 0); DMA2D_CR_CAEIE | DMA2D_CR_CTCIE | DMA2D_CR_CEIE,
0);
/* Attach DMA2D interrupt vector */ /* Attach DMA2D interrupt vector */