From f9c848e9851713d7a33962b9b4768c0a0d1751f1 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 11:19:43 +1000 Subject: Change color_t to gColor --- drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c | 4 ++-- drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c | 2 +- drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c | 2 +- drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c | 2 +- drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c | 2 +- drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c | 2 +- drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c | 2 +- drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c | 2 +- drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c | 2 +- drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c | 2 +- drivers/gdisp/KS0108/gdisp_lld_KS0108.c | 2 +- drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c | 2 +- drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c | 8 ++++---- drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c | 2 +- drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c | 2 +- drivers/gdisp/QImage/gdisp_lld_driver.c | 2 +- drivers/gdisp/QImage/gdisp_lld_qimage.cpp | 4 ++-- drivers/gdisp/QImage/gdisp_lld_qimage.h | 2 +- drivers/gdisp/R61505U/gdisp_lld_R61505U.c | 2 +- drivers/gdisp/RA6963/gdisp_lld_RA6963.c | 2 +- drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c | 2 +- drivers/gdisp/SSD1289/board_SSD1289_template.h | 4 ++-- drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c | 2 +- drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c | 2 +- drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c | 2 +- drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c | 2 +- drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c | 2 +- drivers/gdisp/SSD2119/board_SSD2119_template.h | 4 ++-- drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c | 2 +- drivers/gdisp/ST7565/gdisp_lld_ST7565.c | 2 +- drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c | 2 +- drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c | 2 +- drivers/gdisp/TestStub/gdisp_lld_TestStub.c | 2 +- drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c | 2 +- drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c | 2 +- drivers/multiple/SDL/gdisp_lld_SDL.c | 2 +- drivers/multiple/Win32/gdisp_lld_Win32.c | 4 ++-- drivers/multiple/X/gdisp_lld_X.c | 2 +- drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c | 4 ++-- drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp | 4 ++-- 40 files changed, 50 insertions(+), 50 deletions(-) (limited to 'drivers') diff --git a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c index 2c03ed59..003c0954 100644 --- a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c +++ b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c @@ -124,7 +124,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay* g) PIXEL_ADDR(g, pos)[0] = gdispColor2Native(g->p.color); } -LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) +LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay* g) { unsigned pos; LLDCOLOR_TYPE color; @@ -255,7 +255,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) // Fill the line buffer with the solid color for (i = 0; i < bytes_per_pixel * g->p.cx; i += 4) { - *((color_t*)(line + i)) = g->p.color; + *((gColor*)(line + i)) = g->p.color; } // Calculate the address of the first pixel of the rectangle (top left corner) diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c index a745ab86..1f86affb 100644 --- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c +++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c @@ -581,7 +581,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { * =============================== */ #if GDISP_HARDWARE_CLEARS - static void subclear(GDisplay *g, color_t color) { + static void subclear(GDisplay *g, gColor color) { unsigned x, y; uint8_t byte; diff --git a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c index d3aeadfe..f894a071 100644 --- a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c +++ b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c @@ -99,7 +99,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { #endif } -LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { +LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { unsigned pos; uint8_t *p; diff --git a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c index 7de1490a..acc0a137 100644 --- a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c +++ b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c @@ -222,7 +222,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c index 6582693d..e787c1c6 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c +++ b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c @@ -216,7 +216,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c index 87c47114..6e768fbd 100644 --- a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c +++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c @@ -256,7 +256,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c index 1d645443..e5fdf7e8 100644 --- a/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c +++ b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c @@ -260,7 +260,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c index e340dc18..79fcd6a4 100644 --- a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c +++ b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c @@ -289,7 +289,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c index 2201cdbc..1a0a042a 100644 --- a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c +++ b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c @@ -220,7 +220,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c b/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c index c83695d2..9291898e 100644 --- a/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c +++ b/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c @@ -220,7 +220,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/KS0108/gdisp_lld_KS0108.c b/drivers/gdisp/KS0108/gdisp_lld_KS0108.c index 40712485..e11d0881 100644 --- a/drivers/gdisp/KS0108/gdisp_lld_KS0108.c +++ b/drivers/gdisp/KS0108/gdisp_lld_KS0108.c @@ -188,7 +188,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c index 65ea6d8b..ab29fb45 100644 --- a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c +++ b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c @@ -210,7 +210,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c index 496a3d91..e594eb8d 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c @@ -436,8 +436,8 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { while (tuples--) { /* Get a pixel */ switch(pnum++ & 1) { - case 0: c1 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break; - case 1: c1 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); p += 3; break; + case 0: c1 = (((gColor)p[0]) << 4)|(((gColor)p[1])>>4); break; + case 1: c1 = (((gColor)p[1]&0x0F) << 8)|((gColor)p[1]); p += 3; break; } /* Check for line or buffer wrapping */ @@ -454,8 +454,8 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { /* Get the next pixel */ switch(pnum++ & 1) { - case 0: c2 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break; - case 1: c2 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); p += 3; break; + case 0: c2 = (((gColor)p[0]) << 4)|(((gColor)p[1])>>4); break; + case 1: c2 = (((gColor)p[1]&0x0F) << 8)|((gColor)p[1]); p += 3; break; } /* Check for line or buffer wrapping */ diff --git a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c index 7f4f2050..cdf7bbe0 100644 --- a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c +++ b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c @@ -155,7 +155,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { gCoord x, y; switch(g->g.Orientation) { diff --git a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c index 0812057f..ee388dcc 100644 --- a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c +++ b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c @@ -165,7 +165,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { gCoord x, y; switch(g->g.Orientation) { diff --git a/drivers/gdisp/QImage/gdisp_lld_driver.c b/drivers/gdisp/QImage/gdisp_lld_driver.c index a93d1761..02128bd4 100644 --- a/drivers/gdisp/QImage/gdisp_lld_driver.c +++ b/drivers/gdisp/QImage/gdisp_lld_driver.c @@ -55,7 +55,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) #endif #if GDISP_HARDWARE_PIXELREAD - color_t gdisp_lld_get_pixel_color(GDisplay *g) + gColor gdisp_lld_get_pixel_color(GDisplay *g) { return qimage_getPixel(g); } diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp index 2d2876f0..f43ba850 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp @@ -27,12 +27,12 @@ void qimage_setPixel(GDisplay* g) qimage->setPixel(g->p.x, g->p.y, rgbVal); } -color_t qimage_getPixel(GDisplay* g) +gColor qimage_getPixel(GDisplay* g) { const QImage* qimage = static_cast(g->priv); if (!qimage) { return 0; } - return static_cast(qimage->pixel(g->p.x, g->p.y)); + return static_cast(qimage->pixel(g->p.x, g->p.y)); } diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.h b/drivers/gdisp/QImage/gdisp_lld_qimage.h index b8b0d9c9..5e6aea1f 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.h +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.h @@ -9,7 +9,7 @@ extern "C" { gBool qimage_init(GDisplay* g, gCoord width, gCoord height); void qimage_setPixel(GDisplay* g); -color_t qimage_getPixel(GDisplay* g); +gColor qimage_getPixel(GDisplay* g); #ifdef __cplusplus } diff --git a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c index 8b48eee2..36cae0a8 100644 --- a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c +++ b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c @@ -230,7 +230,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c index 42298656..c3ddf13b 100755 --- a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c +++ b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c @@ -274,7 +274,7 @@ LLDSPEC void gdisp_lld_read_start(GDisplay *g) { dummy_read(g); } -LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { +LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c index 526426b2..347862e6 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c +++ b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c @@ -234,7 +234,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/SSD1289/board_SSD1289_template.h b/drivers/gdisp/SSD1289/board_SSD1289_template.h index 5d9442e9..d255f420 100644 --- a/drivers/gdisp/SSD1289/board_SSD1289_template.h +++ b/drivers/gdisp/SSD1289/board_SSD1289_template.h @@ -65,13 +65,13 @@ static GFXINLINE uint16_t read_data(GDisplay *g) { #if defined(GDISP_USE_DMA) && GDISP_USE_DMA - static GFXINLINE void dma_with_noinc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_noinc(GDisplay *g, gColor *buffer, int area) { (void) g; (void) buffer; (void) area; } - static GFXINLINE void dma_with_inc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_inc(GDisplay *g, gColor *buffer, int area) { (void) g; (void) buffer; (void) area; diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c index 7a9c4e27..807803a4 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c +++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c @@ -223,7 +223,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c index c91e77a3..c26566ff 100644 --- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c +++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c @@ -266,7 +266,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { gCoord x, y; switch(g->g.Orientation) { diff --git a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c index 9b50f753..caaf01d8 100644 --- a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c +++ b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c @@ -219,7 +219,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { gCoord x, y; LLDCOLOR_TYPE c; diff --git a/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c b/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c index 871aa218..6513ba55 100644 --- a/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c +++ b/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c @@ -170,7 +170,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { setreadmode(g); //dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c index cec6f1df..0fa8c775 100644 --- a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c +++ b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c @@ -434,7 +434,7 @@ LLDSPEC void gdisp_lld_draw_pixel (GDisplay *g) #endif #if GDISP_HARDWARE_PIXELREAD -LLDSPEC color_t gdisp_lld_get_pixel_color (GDisplay *g) +LLDSPEC gColor gdisp_lld_get_pixel_color (GDisplay *g) { gCoord x, y; diff --git a/drivers/gdisp/SSD2119/board_SSD2119_template.h b/drivers/gdisp/SSD2119/board_SSD2119_template.h index 5d9442e9..d255f420 100644 --- a/drivers/gdisp/SSD2119/board_SSD2119_template.h +++ b/drivers/gdisp/SSD2119/board_SSD2119_template.h @@ -65,13 +65,13 @@ static GFXINLINE uint16_t read_data(GDisplay *g) { #if defined(GDISP_USE_DMA) && GDISP_USE_DMA - static GFXINLINE void dma_with_noinc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_noinc(GDisplay *g, gColor *buffer, int area) { (void) g; (void) buffer; (void) area; } - static GFXINLINE void dma_with_inc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_inc(GDisplay *g, gColor *buffer, int area) { (void) g; (void) buffer; (void) area; diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c index c44a262f..7384ef32 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c +++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c @@ -259,7 +259,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g) { setreadmode(g); dummy_read(g); } - LLDSPEC color_t gdisp_lld_read_color(GDisplay* g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay* g) { uint16_t data; data = read_data(g); diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c index d347c22b..e13cdc35 100644 --- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c +++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c @@ -196,7 +196,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { gCoord x, y; switch(g->g.Orientation) { diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c index 763c4c29..960da428 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c @@ -332,7 +332,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay* g) { #endif } -LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) { +LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay* g) { unsigned pos; LLDCOLOR_TYPE color; diff --git a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c index 5d605cd4..60649321 100644 --- a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c +++ b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c @@ -171,7 +171,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { gCoord x, y; switch(g->g.Orientation) { diff --git a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c index f87b273b..54927ba0 100644 --- a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c +++ b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c @@ -47,7 +47,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - color_t gdisp_lld_get_pixel_color(GDisplay *g) { + gColor gdisp_lld_get_pixel_color(GDisplay *g) { (void) g; return 0; } diff --git a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c index 9da593d6..b3ce6dcc 100644 --- a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c +++ b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c @@ -176,7 +176,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { gCoord x, y; switch(g->g.Orientation) { diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c index 121787e1..ca0153e7 100644 --- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c +++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c @@ -84,7 +84,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { PIXEL_ADDR(g, pos)[0] = gdispColor2Native(g->p.color); } -LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { +LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { unsigned pos; LLDCOLOR_TYPE color; diff --git a/drivers/multiple/SDL/gdisp_lld_SDL.c b/drivers/multiple/SDL/gdisp_lld_SDL.c index 54830d7f..28dc4f68 100644 --- a/drivers/multiple/SDL/gdisp_lld_SDL.c +++ b/drivers/multiple/SDL/gdisp_lld_SDL.c @@ -425,7 +425,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { if (context) return gdispNative2Color(context->framebuf[(g->p.y*GDISP_SCREEN_WIDTH)+g->p.x]); return 0; diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index 36776d49..4b9a1883 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -1043,7 +1043,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { g->flags |= GDISP_FLG_WSTREAM; g->flags &= ~GDISP_FLG_WRAPPED; } - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) { winPriv * priv; COLORREF color; @@ -1372,7 +1372,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { winPriv * priv; COLORREF color; diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index 875b9621..35271a16 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -452,7 +452,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { xPriv * priv = (xPriv *)g->priv; XColor color; XImage *img; diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index ea235668..28a9a778 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -574,10 +574,10 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { netPriv * priv; uint16_t buf[3]; - color_t data; + gColor data; #if GDISP_DONT_WAIT_FOR_NET_DISPLAY if (!(g->flags & GDISP_FLG_CONNECTED)) diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp index 42c1df35..4fd26a2f 100644 --- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp +++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp @@ -457,10 +457,10 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { netPriv * priv; uint16_t buf[3]; - color_t data; + gColor data; #if GDISP_DONT_WAIT_FOR_NET_DISPLAY if (!(g->flags & GDISP_FLG_CONNECTED)) -- cgit v1.2.3