From 2ab2d77fcba42467b62f2be732cb8dc00510fe19 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 10:54:19 +1000 Subject: Change coord_t to gCoord --- .../AlteraFramereader/gdisp_lld_alteraframereader.c | 6 +++--- drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c | 6 +++--- drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c | 2 +- drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c | 8 ++++---- drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c | 8 ++++---- drivers/gdisp/QImage/gdisp_lld_qimage.cpp | 2 +- drivers/gdisp/QImage/gdisp_lld_qimage.h | 2 +- drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c | 2 +- drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c | 10 +++++----- drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c | 4 ++-- drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c | 12 ++++++------ drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c | 2 +- drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c | 2 +- drivers/gdisp/ST7565/gdisp_lld_ST7565.c | 4 ++-- drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c | 20 ++++++++++---------- drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c | 8 ++++---- drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c | 8 ++++---- drivers/gdisp/UC1610/gdisp_lld_UC1610.c | 12 ++++++------ drivers/gdisp/UC8173/gdisp_lld_UC8173.c | 4 ++-- drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c | 2 +- drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c | 6 +++--- 21 files changed, 65 insertions(+), 65 deletions(-) (limited to 'drivers/gdisp') diff --git a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c index 1fb34378..2c03ed59 100644 --- a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c +++ b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c @@ -29,7 +29,7 @@ typedef struct fbPriv { void* pixels; // The pixel buffer - coord_t linelen; // The number of bytes per display line + gCoord linelen; // The number of bytes per display line void* frame0; void* frame1; } fbPriv; @@ -177,7 +177,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -187,7 +187,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; diff --git a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c index 61f7b500..d3aeadfe 100644 --- a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c +++ b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c @@ -15,7 +15,7 @@ typedef struct fbInfo { void * pixels; // The pixel buffer - coord_t linelen; // The number of bytes per display line + gCoord linelen; // The number of bytes per display line } fbInfo; #include "board_fb24bpp.h" @@ -155,7 +155,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -165,7 +165,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c index 86f4a94f..2a9d2488 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c @@ -342,7 +342,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_BITFILLS LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { - coord_t lg, x, y; + gCoord lg, x, y; uint16_t c1, c2; unsigned tuples; const pixel_t *buffer; diff --git a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c index 568860e0..7f4f2050 100644 --- a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c +++ b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c @@ -117,7 +117,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; #if GDISP_NEED_CONTROL switch(g->g.Orientation) { @@ -156,7 +156,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: @@ -209,7 +209,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -219,7 +219,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; diff --git a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c index e7e621cc..0812057f 100644 --- a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c +++ b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c @@ -127,7 +127,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; #if GDISP_NEED_CONTROL switch(g->g.Orientation) { @@ -166,7 +166,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: @@ -219,7 +219,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -229,7 +229,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp index ba7cf44d..2d2876f0 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp @@ -3,7 +3,7 @@ #include "../../../src/gdisp/gdisp_driver.h" #include "gdisp_lld_qimage.h" -gBool qimage_init(GDisplay* g, coord_t width, coord_t height) +gBool qimage_init(GDisplay* g, gCoord width, gCoord height) { QImage* qimage = new QImage(width, height, QImage::Format_RGB888); if (!qimage) { diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.h b/drivers/gdisp/QImage/gdisp_lld_qimage.h index 512fdf53..b8b0d9c9 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.h +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.h @@ -7,7 +7,7 @@ extern "C" { #endif -gBool qimage_init(GDisplay* g, coord_t width, coord_t height); +gBool qimage_init(GDisplay* g, gCoord width, gCoord height); void qimage_setPixel(GDisplay* g); color_t qimage_getPixel(GDisplay* g); diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c index c4e0a941..b8ee55cb 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c +++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c @@ -259,7 +259,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { pixel_t *buffer; - coord_t ycnt; + gCoord ycnt; buffer = (pixel_t *)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2; diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c index 9658cc26..c91e77a3 100644 --- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c +++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c @@ -169,9 +169,9 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_FILLS LLDSPEC void gdisp_lld_fill_area(GDisplay *g) { - coord_t sy, ey; - coord_t sx, ex; - coord_t col; + gCoord sy, ey; + gCoord sx, ex; + gCoord col; unsigned spage, zpages; uint8_t * base; uint8_t mask; @@ -236,7 +236,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: @@ -267,7 +267,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: diff --git a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c index 6793b461..9b50f753 100644 --- a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c +++ b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c @@ -189,7 +189,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; uint8_t *ram; switch(g->g.Orientation) { @@ -220,7 +220,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; + gCoord x, y; LLDCOLOR_TYPE c; switch(g->g.Orientation) { diff --git a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c index 412ba042..cec6f1df 100644 --- a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c +++ b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c @@ -341,8 +341,8 @@ LLDSPEC void gdisp_lld_clear (GDisplay *g) #if GDISP_HARDWARE_FILLS LLDSPEC void gdisp_lld_fill_area (GDisplay *g) { - coord_t scol, ecol, sx, ex; - coord_t y, col, x; + gCoord scol, ecol, sx, ex; + gCoord y, col, x; uint16_t area = (uint16_t) g->p.cx * g->p.cy; uint8_t temp; @@ -400,7 +400,7 @@ LLDSPEC void gdisp_lld_fill_area (GDisplay *g) #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel (GDisplay *g) { - coord_t x, y; + gCoord x, y; switch (g->g.Orientation) { @@ -436,7 +436,7 @@ LLDSPEC void gdisp_lld_draw_pixel (GDisplay *g) #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color (GDisplay *g) { - coord_t x, y; + gCoord x, y; switch (g->g.Orientation) { @@ -554,8 +554,8 @@ LLDSPEC void gdisp_lld_control (GDisplay *g) #if GDISP_HARDWARE_BITFILLS LLDSPEC void gdisp_lld_blit_area (GDisplay *g) { - coord_t scol, ecol, sx; - coord_t y, col; + gCoord scol, ecol, sx; + gCoord y, col; uint16_t area; uint8_t temp, temp2, i; diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c index f5d9fd63..1bf3a45d 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c +++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c @@ -17,7 +17,7 @@ #define CALC_FPR(w,h,hb,hf,hp,vb,vf,vp,fps) ((fps * CALC_PERIOD(w,hb,hf,hp) * CALC_PERIOD(h,vb,vf,vp) * 1048576)/100000000) typedef struct LCD_Parameters { - coord_t width, height; // Panel width and height + gCoord width, height; // Panel width and height uint16_t hbporch; // Horizontal Back Porch uint16_t hfporch; // Horizontal Front Porch uint16_t hpulse; // Horizontal Pulse diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c index 75bea819..0631b0c0 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c +++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c @@ -295,7 +295,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g) { LLDSPEC void gdisp_lld_blit_area(GDisplay* g) { pixel_t* buffer; - coord_t ycnt; + gCoord ycnt; buffer = (pixel_t*)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2; diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c index 2639e268..d347c22b 100644 --- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c +++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c @@ -166,7 +166,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: @@ -197,7 +197,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c index 57253b0d..763c4c29 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c @@ -48,13 +48,13 @@ typedef struct ltdcLayerConfig { // Frame LLDCOLOR_TYPE* frame; // Frame buffer address - coord_t width, height; // Frame size in pixels - coord_t pitch; // Line pitch, in bytes + gCoord width, height; // Frame size in pixels + gCoord pitch; // Line pitch, in bytes uint16_t fmt; // Pixel format in LTDC format // Window - coord_t x, y; // Start pixel position of the virtual layer - coord_t cx, cy; // Size of the virtual layer + gCoord x, y; // Start pixel position of the virtual layer + gCoord cx, cy; // Size of the virtual layer uint32_t defcolor; // Default color, ARGB8888 uint32_t keycolor; // Color key, RGB888 @@ -66,10 +66,10 @@ typedef struct ltdcLayerConfig { } ltdcLayerConfig; typedef struct ltdcConfig { - coord_t width, height; // Screen size - coord_t hsync, vsync; // Horizontal and Vertical sync pixels - coord_t hbackporch, vbackporch; // Horizontal and Vertical back porch pixels - coord_t hfrontporch, vfrontporch; // Horizontal and Vertical front porch pixels + gCoord width, height; // Screen size + gCoord hsync, vsync; // Horizontal and Vertical sync pixels + gCoord hbackporch, vbackporch; // Horizontal and Vertical back porch pixels + gCoord hfrontporch, vfrontporch; // Horizontal and Vertical front porch pixels uint32_t syncflags; // Sync flags uint32_t bgcolor; // Clear screen color RGB888 @@ -382,7 +382,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -392,7 +392,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) { case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; diff --git a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c index be5bf3c7..5d605cd4 100644 --- a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c +++ b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c @@ -133,7 +133,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; #if GDISP_NEED_CONTROL switch(g->g.Orientation) { @@ -172,7 +172,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: @@ -229,7 +229,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -239,7 +239,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; diff --git a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c index 479e49e9..9da593d6 100644 --- a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c +++ b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c @@ -138,7 +138,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; #if GDISP_NEED_CONTROL switch(g->g.Orientation) { @@ -177,7 +177,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_PIXELREAD LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: @@ -234,7 +234,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -244,7 +244,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; diff --git a/drivers/gdisp/UC1610/gdisp_lld_UC1610.c b/drivers/gdisp/UC1610/gdisp_lld_UC1610.c index b0d4660b..bd11dce0 100644 --- a/drivers/gdisp/UC1610/gdisp_lld_UC1610.c +++ b/drivers/gdisp/UC1610/gdisp_lld_UC1610.c @@ -45,10 +45,10 @@ #define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER << 0) typedef struct UC1610_Window { - coord_t x1; - coord_t y1; - coord_t x2; - coord_t y2; + gCoord x1; + gCoord y1; + gCoord x2; + gCoord y2; } UC1610_Window; /*===========================================================================*/ @@ -133,7 +133,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; uint8_t *c; // handle orientation @@ -170,7 +170,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_FLUSH LLDSPEC void gdisp_lld_flush(GDisplay* g) { - coord_t x1, y1, x2, y2, cx; + gCoord x1, y1, x2, y2, cx; uint8_t *c; // Don't flush unless we really need to diff --git a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c index ec135f1a..724c6f36 100644 --- a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c +++ b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c @@ -309,7 +309,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g) #if GDISP_HARDWARE_FLUSH LLDSPEC void gdisp_lld_flush(GDisplay* g) { - coord_t cy, cx, dx, dy; + gCoord cy, cx, dx, dy; LLDCOLOR_TYPE *fb; UC8173_Private *priv; @@ -390,7 +390,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g) #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay* g) { - coord_t x, y; + gCoord x, y; UC8173_Private *priv; priv = (UC8173_Private *)g->priv; diff --git a/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c b/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c index ab700b0a..009e52f2 100644 --- a/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c +++ b/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c @@ -163,7 +163,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_DRAWPIXEL LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; + gCoord x, y; switch(g->g.Orientation) { default: diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c index 40f476b4..121787e1 100644 --- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c +++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c @@ -15,7 +15,7 @@ typedef struct fbInfo { void * pixels; // The pixel buffer - coord_t linelen; // The number of bytes per display line + gCoord linelen; // The number of bytes per display line } fbInfo; #include "board_framebuffer.h" @@ -135,7 +135,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; @@ -145,7 +145,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { case GDISP_ROTATE_90: case GDISP_ROTATE_270: if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { - coord_t tmp; + gCoord tmp; tmp = g->g.Width; g->g.Width = g->g.Height; -- cgit v1.2.3