diff options
Diffstat (limited to 'src/gdisp/gdisp_driver.h')
| -rw-r--r-- | src/gdisp/gdisp_driver.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gdisp/gdisp_driver.h b/src/gdisp/gdisp_driver.h index 863d4c0c..11af847d 100644 --- a/src/gdisp/gdisp_driver.h +++ b/src/gdisp/gdisp_driver.h @@ -284,7 +284,7 @@ /* Verify information for packed pixels and define a non-packed pixel macro */ #if !GDISP_PACKED_PIXELS - #define gdispPackPixels(buf,cx,x,y,c) { ((color_t *)(buf))[(y)*(cx)+(x)] = (c); } + #define gdispPackPixels(buf,cx,x,y,c) { ((gColor *)(buf))[(y)*(cx)+(x)] = (c); } #elif !GDISP_HARDWARE_BITFILLS #error "GDISP: packed pixel formats are only supported for hardware accelerated drivers." #elif GDISP_PIXELFORMAT != GDISP_PIXELFORMAT_RGB888 \ @@ -308,7 +308,7 @@ * * @api */ - void gdispPackPixels(const gPixel *buf, gCoord cx, gCoord x, gCoord y, color_t color); + void gdispPackPixels(const gPixel *buf, gCoord cx, gCoord x, gCoord y, gColor color); #endif //------------------------------------------------------------------------------------------------------------ @@ -353,7 +353,7 @@ struct GDisplay { gCoord cx, cy; gCoord x1, y1; gCoord x2, y2; - color_t color; + gColor color; void *ptr; } p; @@ -363,8 +363,8 @@ struct GDisplay { // Text rendering parameters struct { font_t font; - color_t color; - color_t bgcolor; + gColor color; + gColor bgcolor; gCoord clipx0, clipy0; gCoord clipx1, clipy1; #if GDISP_NEED_TEXT_WORDWRAP @@ -375,7 +375,7 @@ struct GDisplay { #endif #if GDISP_LINEBUF_SIZE != 0 && ((GDISP_NEED_SCROLL && !GDISP_HARDWARE_SCROLL) || (!GDISP_HARDWARE_STREAM_WRITE && GDISP_HARDWARE_BITFILLS)) // A pixel line buffer - color_t linebuf[GDISP_LINEBUF_SIZE]; + gColor linebuf[GDISP_LINEBUF_SIZE]; #endif }; @@ -390,13 +390,13 @@ typedef struct GDISPVMT { void (*writecolor)(GDisplay *g); // Uses p.color void (*writestop)(GDisplay *g); // Uses no parameters void (*readstart)(GDisplay *g); // Uses p.x,p.y p.cx,p.cy - color_t (*readcolor)(GDisplay *g); // Uses no parameters + gColor (*readcolor)(GDisplay *g); // Uses no parameters void (*readstop)(GDisplay *g); // Uses no parameters void (*pixel)(GDisplay *g); // Uses p.x,p.y p.color void (*clear)(GDisplay *g); // Uses p.color void (*fill)(GDisplay *g); // Uses p.x,p.y p.cx,p.cy p.color void (*blit)(GDisplay *g); // Uses p.x,p.y p.cx,p.cy p.x1,p.y1 (=srcx,srcy) p.x2 (=srccx), p.ptr (=buffer) - color_t (*get)(GDisplay *g); // Uses p.x,p.y + gColor (*get)(GDisplay *g); // Uses p.x,p.y void (*vscroll)(GDisplay *g); // Uses p.x,p.y p.cx,p.cy, p.y1 (=lines) p.color void (*control)(GDisplay *g); // Uses p.x (=what) p.ptr (=value) void *(*query)(GDisplay *g); // Uses p.x (=what); @@ -526,7 +526,7 @@ typedef struct GDISPVMT { * * @note The parameter variables must not be altered by the driver. */ - LLDSPEC color_t gdisp_lld_read_color(GDisplay *g); + LLDSPEC gColor gdisp_lld_read_color(GDisplay *g); /** * @brief End the current streaming operation @@ -609,7 +609,7 @@ typedef struct GDISPVMT { * * @note The parameter variables must not be altered by the driver. */ - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g); + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g); #endif #if (GDISP_HARDWARE_SCROLL && GDISP_NEED_SCROLL) || defined(__DOXYGEN__) |