Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 03:45:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

STM32 LTDC: Move ltdc.h from include/nuttx/video to arch/arm/include/stm32; Trivial updates after general review

Browse Source
This commit is contained in:
Gregory Nutt
2014-12-19 14:52:17 -06:00
parent 31a0e8ac5e
commit fa5dffbc18
6 changed files with 94 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/video/ltdc.h → arch/arm/include/stm32/ltdc.h
+4 -4
View File
@@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* include/nuttx/video/ltdc.h * arch/arm/src/include/stm32/ltdc.h
* *
* Copyright (C) 2014 Marco Krahl. All rights reserved. * Copyright (C) 2014 Marco Krahl. All rights reserved.
* Author: Marco Krahl <ocram.lhark@gmail.com> * Author: Marco Krahl <ocram.lhark@gmail.com>
@@ -33,8 +33,8 @@
* *
******************************************************************************/ ******************************************************************************/
#ifndef _INCLUDE_NUTTX_VIDEO_LTDC_H #ifndef __ARCH_ARM_INCLUDE_STM32_LTDC_H
#define _INCLUDE_NUTTX_VIDEO_LTDC_H #define __ARCH_ARM_INCLUDE_STM32_LTDC_H
/******************************************************************************* /*******************************************************************************
* Included Files * Included Files
@@ -560,4 +560,4 @@ struct ltdc_layer_s
******************************************************************************/ ******************************************************************************/
FAR struct ltdc_layer_s *up_ltdcgetlayer(int lid); FAR struct ltdc_layer_s *up_ltdcgetlayer(int lid);
#endif /* CONFIG_STM32_LTDC */ #endif /* CONFIG_STM32_LTDC */
#endif /* _INCLUDE_NUTTX_VIDEO_LTDC_H */ #endif /* __ARCH_ARM_INCLUDE_STM32_LTDC_H */
arch/arm/src/stm32/stm32_dma2d.c
+9 -12
View File
@@ -48,9 +48,9 @@
#include <debug.h> #include <debug.h>
#include <nuttx/video/fb.h> #include <nuttx/video/fb.h>
#include <nuttx/video/ltdc.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <arch/chip/ltdc.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_arch.h" #include "up_arch.h"
@@ -109,16 +109,15 @@
****************************************************************************/ ****************************************************************************/
int stm32_dma2dblit(FAR struct stm32_ltdc_s *dest, int stm32_dma2dblit(FAR struct stm32_ltdc_s *dest,
FAR struct stm32_ltdc_s *fore, FAR struct stm32_ltdc_s *fore,
fb_coord_t forexpos, fb_coord_t foreypos, fb_coord_t forexpos, fb_coord_t foreypos,
FAR struct stm32_ltdc_s *back, FAR struct stm32_ltdc_s *back,
FAR const struct ltdc_area_s *backarea) FAR const struct ltdc_area_s *backarea)
{ {
gdbg("Not implemented"); gdbg("Not implemented");
return -ENOSYS; return -ENOSYS;
} }
/**************************************************************************** /****************************************************************************
* *
* Name: stm32_dma2dblend * Name: stm32_dma2dblend
@@ -144,16 +143,15 @@ int stm32_dma2dblit(FAR struct stm32_ltdc_s *dest,
****************************************************************************/ ****************************************************************************/
int stm32_dma2dblend(FAR struct stm32_ltdc_s *dest, int stm32_dma2dblend(FAR struct stm32_ltdc_s *dest,
FAR struct stm32_ltdc_s *fore, FAR struct stm32_ltdc_s *fore,
fb_coord_t forexpos, fb_coord_t foreypos, fb_coord_t forexpos, fb_coord_t foreypos,
FAR struct stm32_ltdc_s *back, FAR struct stm32_ltdc_s *back,
FAR const struct ltdc_area_s *backarea) FAR const struct ltdc_area_s *backarea)
{ {
gdbg("Not implemented"); gdbg("Not implemented");
return -ENOSYS; return -ENOSYS;
} }
/****************************************************************************** /******************************************************************************
* Name: up_dma2dinitialize * Name: up_dma2dinitialize
* *
@@ -182,4 +180,3 @@ int up_dma2dinitialize(void)
void up_dma2duninitialize(void) void up_dma2duninitialize(void)
{ {
} }
arch/arm/src/stm32/stm32_dma2d.h
+1 -1
View File
@@ -42,7 +42,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/video/fb.h> #include <nuttx/video/fb.h>
#include <nuttx/video/ltdc.h> #include <arch/chip/ltdc.h>
#include "stm32_ltdc.h" #include "stm32_ltdc.h"
#ifdef CONFIG_STM32_DMA2D #ifdef CONFIG_STM32_DMA2D
arch/arm/src/stm32/stm32_ltdc.c
+72 -102
View File
File diff suppressed because it is too large Load Diff
arch/arm/src/stm32/stm32_ltdc.h
+6 -3
View File
@@ -42,13 +42,17 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <stdbool.h> #include <stdbool.h>
#include <semaphore.h> #include <semaphore.h>
#include <nuttx/video/fb.h> #include <nuttx/video/fb.h>
#include <nuttx/video/ltdc.h>
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include <arch/chip/ltdc.h>
#ifdef CONFIG_STM32_LTDC #ifdef CONFIG_STM32_LTDC
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
@@ -98,8 +102,7 @@ struct stm32_ltdc_s
/************************************************************************************ /************************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ************************************************************************************/
/* /* The STM32 LTDC driver uses the common framebuffer interfaces declared in
* The STM32 LTDC driver uses the common framebuffer interfaces declared in
* include/nuttx/video/fb.h. * include/nuttx/video/fb.h.
*/ */
configs/stm32f429i-disco/src/stm32_lcd.c
+2 -1
View File
@@ -45,7 +45,8 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/lcd/ili9341.h> #include <nuttx/lcd/ili9341.h>
#include <nuttx/video/fb.h> #include <nuttx/video/fb.h>
#include <nuttx/video/ltdc.h>
#include <arch/chip/ltdc.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_arch.h" #include "up_arch.h"