diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-02-27 17:44:21 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-02-27 17:44:21 +1000 |
commit | f265924396167729e8d9fb36a0383263f36c1270 (patch) | |
tree | 28843eb24b18999cf0217ecb0fe935f133901066 /drivers/gdisp/STM32LTDC | |
parent | 14786e97b618b8bc2a0ff1c732d45288fe550e33 (diff) | |
download | uGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.gz uGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.bz2 uGFX-f265924396167729e8d9fb36a0383263f36c1270.zip |
First set of V3 macro changes
Diffstat (limited to 'drivers/gdisp/STM32LTDC')
-rw-r--r-- | drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h | 2 | ||||
-rw-r--r-- | drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c | 8 | ||||
-rw-r--r-- | drivers/gdisp/STM32LTDC/gdisp_lld_config.h | 12 | ||||
-rw-r--r-- | drivers/gdisp/STM32LTDC/readme.txt | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h index 8164c166..5635b27c 100644 --- a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h +++ b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h @@ -8,7 +8,7 @@ #ifndef _GDISP_LLD_BOARD_H #define _GDISP_LLD_BOARD_H -#define ALLOW_2ND_LAYER TRUE +#define ALLOW_2ND_LAYER GFXON static const ltdcConfig driverCfg = { 480, 272, // Width, Height (pixels) diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c index 4e232999..4bc231d9 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c @@ -24,13 +24,13 @@ #endif
#ifndef LTDC_USE_DMA2D
- #define LTDC_USE_DMA2D FALSE
+ #define LTDC_USE_DMA2D GFXOFF
#endif
#ifndef LTDC_NO_CLOCK_INIT
- #define LTDC_NO_CLOCK_INIT FALSE
+ #define LTDC_NO_CLOCK_INIT GFXOFF
#endif
#ifndef LTDC_DMA_CACHE_FLUSH
- #define LTDC_DMA_CACHE_FLUSH FALSE
+ #define LTDC_DMA_CACHE_FLUSH GFXOFF
#endif
#include "stm32_ltdc.h"
@@ -40,7 +40,7 @@ #if defined(STM32F7) || defined(STM32F746xx)
#undef LTDC_DMA_CACHE_FLUSH
- #define LTDC_DMA_CACHE_FLUSH TRUE
+ #define LTDC_DMA_CACHE_FLUSH GFXON
#endif
#endif
diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_config.h b/drivers/gdisp/STM32LTDC/gdisp_lld_config.h index e5a66bb0..7777a1bc 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_config.h +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define LTDC_USE_DMA2D TRUE -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define LTDC_USE_DMA2D GFXON +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON // Both these pixel formats are supported - pick one. // RGB565 obviously is faster and uses less RAM but with lower color resolution than RGB888 @@ -38,12 +38,12 @@ #if LTDC_USE_DMA2D // DMA2D supports accelerated fills - #define GDISP_HARDWARE_FILLS TRUE + #define GDISP_HARDWARE_FILLS GFXON // Accelerated bitfills are also possible but only for GDISP_ROTATE_0 // and if no color translation is required (for now) #if !GDISP_NEED_CONTROL && !defined(GDISP_PIXELFORMAT) - #define GDISP_HARDWARE_BITFILLS TRUE + #define GDISP_HARDWARE_BITFILLS GFXON #endif #endif /* GDISP_USE_DMA2D */ diff --git a/drivers/gdisp/STM32LTDC/readme.txt b/drivers/gdisp/STM32LTDC/readme.txt index 269d3cfb..dcc17d39 100644 --- a/drivers/gdisp/STM32LTDC/readme.txt +++ b/drivers/gdisp/STM32LTDC/readme.txt @@ -1,7 +1,7 @@ To use this driver: 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE + a) #define GFX_USE_GDISP GFXON 2. To your makefile add the following lines: include $(GFXLIB)/gfx.mk |